From 6e85fa1b33801ac42301a0df6424407522faf68f Mon Sep 17 00:00:00 2001 From: pb Date: Tue, 8 Jul 2014 09:15:01 +0000 Subject: [PATCH] Yet another part adopting sci modules to setLabel attribute. git-svn-id: https://svn.libreccm.org/ccm/trunk@2742 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/ui/ItemSearchFolderBrowser.java | 2 +- .../cms/ui/folder/FolderBrowser.java | 2 +- .../cms/ui/folder/FolderManipulator.java | 38 +++++++-------- .../arsdigita/toolbox/GlobalisationUtil.java | 14 +++--- .../SciPublicationsPersonsInitializer.java | 4 +- .../ui/SciPublicationsPersonsPersonForm.java | 17 ++++--- .../ui/SciPublicationsPersonsPersonTable.java | 13 +++-- .../ui/SciPublicationsPersonsStep.java | 2 +- .../ui/PublicationTypeAssetAddForm.java | 22 ++++++--- .../ui/SciPublicationsMovieDirectorForm.java | 4 +- .../ui/SciPublicationsMovieDirectorSheet.java | 10 ++-- .../ui/SciPublicationsMovieDirectorStep.java | 2 +- ...ublicationsMovieProductionCompanyForm.java | 4 +- ...blicationsMovieProductionCompanySheet.java | 10 ++-- ...ublicationsMovieProductionCompanyStep.java | 2 +- .../SciPublicationsMoviePropertiesStep.java | 4 +- ...PublicationsPlayProductionTheaterForm.java | 4 +- ...ublicationsPlayProductionTheaterSheet.java | 10 ++-- ...PublicationsPlayProductionTheaterStep.java | 2 +- .../ui/SciPublicationsPlayPropertiesStep.java | 5 +- .../ui/SciPublicationsPlayPropertyForm.java | 4 +- ...eInCollectedVolumeCollectedVolumeForm.java | 11 +++-- ...InCollectedVolumeCollectedVolumeSheet.java | 16 +++---- ...eInCollectedVolumeCollectedVolumeStep.java | 7 ++- ...rticleInCollectedVolumePropertiesStep.java | 1 + .../ArticleInCollectedVolumePropertyForm.java | 20 ++++---- .../ui/ArticleInJournalExtraXmlGenerator.java | 2 + .../ui/ArticleInJournalJournalForm.java | 4 +- .../ui/ArticleInJournalJournalSheet.java | 8 ++-- .../ui/ArticleInJournalJournalStep.java | 4 +- .../ui/ArticleInJournalPropertiesStep.java | 24 +++++----- .../ui/ArticleInJournalPropertyForm.java | 26 +++++----- .../ui/CollectedVolumeArticleAddForm.java | 9 ++-- .../ui/CollectedVolumeArticlesStep.java | 4 +- .../ui/CollectedVolumeArticlesTable.java | 27 +++++------ .../ui/CollectedVolumeExtraXmlGenerator.java | 1 + .../ui/CollectedVolumePropertiesStep.java | 20 ++++---- .../ui/CollectedVolumePropertyForm.java | 9 ++-- .../contenttypes/ui/ExpertiseOrdererForm.java | 6 +-- .../ui/ExpertiseOrdererSheet.java | 14 +++--- .../contenttypes/ui/ExpertiseOrdererStep.java | 4 +- .../ui/ExpertiseOrganizationForm.java | 7 +-- .../ui/ExpertiseOrganizationSheet.java | 14 +++--- .../ui/ExpertiseOrganizationStep.java | 4 +- .../ui/ExpertisePropertyForm.java | 13 ++--- ...cOrganizationalUnitPublicationAddForm.java | 4 +- ...ricOrganizationalUnitPublicationsStep.java | 4 +- ...icOrganizationalUnitPublicationsTable.java | 21 ++++----- .../ui/GreyLiteraturePropertyForm.java | 13 ++--- .../ui/InProceedingsProceedingsForm.java | 8 ++-- .../ui/InProceedingsProceedingsSheet.java | 20 ++++---- .../ui/InProceedingsProceedingsStep.java | 4 +- .../ui/InProceedingsPropertiesStep.java | 22 ++++----- .../ui/InProceedingsPropertyForm.java | 10 ++-- .../ui/InternetArticleOrganizationForm.java | 4 +- .../ui/InternetArticleOrganizationSheet.java | 23 ++++----- .../ui/InternetArticleOrganizationStep.java | 8 ++-- .../ui/InternetArticlePropertiesStep.java | 18 ++++--- .../ui/InternetArticlePropertyForm.java | 45 +++++++++--------- .../ui/JournalArticleAddForm.java | 5 +- .../contenttypes/ui/JournalArticlesStep.java | 7 +-- .../contenttypes/ui/JournalArticlesTable.java | 47 +++++++++---------- .../ui/JournalPropertiesStep.java | 25 +++++----- .../contenttypes/ui/JournalPropertyForm.java | 20 ++++---- .../ui/MonographPropertiesStep.java | 41 ++++++++-------- .../ui/MonographPropertyForm.java | 6 +-- .../ui/OrganizationPublicationsTable.java | 34 +++++++++----- .../ui/PersonPublicationsStep.java | 13 +++-- .../ui/PersonPublicationsTable.java | 9 ++-- .../ui/ProceedingsOrganizerForm.java | 5 +- .../ui/ProceedingsOrganizerSheet.java | 23 ++++----- .../ui/ProceedingsOrganizerStep.java | 7 +-- .../ui/ProceedingsPapersAddForm.java | 4 +- .../ui/ProceedingsPapersStep.java | 8 ++-- .../ui/ProceedingsPapersTable.java | 45 ++++++++---------- .../ui/ProceedingsPropertiesStep.java | 17 ++++--- .../ui/ProceedingsPropertyForm.java | 19 ++++---- .../ui/PublicationAuthorAddForm.java | 11 +++-- .../ui/PublicationAuthorsPropertyStep.java | 4 +- .../ui/PublicationAuthorsTable.java | 27 +++++------ .../ui/PublicationPropertiesStep.java | 18 ++++--- 81 files changed, 517 insertions(+), 512 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java index 0f650c811..be8c0542c 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ItemSearchFolderBrowser.java @@ -486,7 +486,7 @@ public class ItemSearchFolderBrowser extends Table { final GlobalisationUtil util = new GlobalisationUtil( "com.arsdigita.cms." + "ui.folder.CMSFolderResources"); - return util.globalise(key); + return util.globalize(key); } } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java index 4a8a963f1..edc52a3ca 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderBrowser.java @@ -894,7 +894,7 @@ public class FolderBrowser extends Table { //return FolderManipulator.globalize(key); final GlobalisationUtil util = new GlobalisationUtil( "com.arsdigita.cms.ui.folder.CMSFolderResources"); - return util.globalise(key); + return util.globalize(key); } diff --git a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java index 1ba26d5df..594a542c7 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/folder/FolderManipulator.java @@ -516,7 +516,7 @@ public class FolderManipulator extends SimpleContainer implements final FormData data = event.getFormData(); if (getSources(state).length <= 0) { - data.addError(globalizationUtil.globalise("cms.ui.folder.must_select_item")); + data.addError(globalizationUtil.globalize("cms.ui.folder.must_select_item")); } } @@ -540,21 +540,21 @@ public class FolderManipulator extends SimpleContainer implements final Folder target = targetSelector.getTarget(state); final FormData data = event.getFormData(); if (target == null) { - data.addError(globalizationUtil.globalise( + data.addError(globalizationUtil.globalize( "cms.ui.folder.need_select_target_folder")); //If the target is null, we can skip the rest of the checks return; } if (target.equals(sourceFolderModel.getSelectedObject(state))) { - data.addError(globalizationUtil.globalise("cms.ui.folder.not_within_same_folder")); + data.addError(globalizationUtil.globalize("cms.ui.folder.not_within_same_folder")); } // check create item permission final User user = Web.getWebContext().getUser(); final SecurityManager securityManager = CMS.getSecurityManager(state); if (!securityManager.canAccess(user, SecurityManager.NEW_ITEM, target)) { - data.addError(globalizationUtil.globalise("cms.ui.folder.no_permission_for_item")); + data.addError(globalizationUtil.globalize("cms.ui.folder.no_permission_for_item")); } for (BigDecimal source : getSources(state)) { @@ -600,7 +600,7 @@ public class FolderManipulator extends SimpleContainer implements } private void addErrorMessage(final FormData data, final String message, final String itemName) { - data.addError(globalizationUtil.globalise(message, new Object[]{itemName})); + data.addError(globalizationUtil.globalize(message, new Object[]{itemName})); } // @Override @@ -672,11 +672,11 @@ public class FolderManipulator extends SimpleContainer implements final int numberOfItems = getSources(state).length; final Folder folder = (Folder) sourceFolderModel.getSelectedObject(state); if (isMove(state)) { - label.setLabel(globalizationUtil.globalise( + label.setLabel(globalizationUtil.globalize( "cms.ui.folder.move", new Object[]{numberOfItems, folder.getPathNoJsp()})); } else if (isCopy(state)) { - label.setLabel(globalizationUtil.globalise( + label.setLabel(globalizationUtil.globalize( "cms.ui.folder.copy", new Object[]{numberOfItems, folder.getPathNoJsp()})); } @@ -747,12 +747,12 @@ public class FolderManipulator extends SimpleContainer implements // final Folder folder = (Folder) sourceFolderModel.getSelectedObject(state); // // if (isPublish(state)) { -// target.setLabel(globalizationUtil.globalise( +// target.setLabel(globalizationUtil.globalize( // "cms.ui.folder.publish", // new Object[]{numberOfItems, // folder.getPathNoJsp()})); // } else if (isUnPublish(state)) { -// target.setLabel(globalizationUtil.globalise( +// target.setLabel(globalizationUtil.globalize( // "cms.ui.folder.publish", // new Object[]{numberOfItems, // folder.getPathNoJsp()})); @@ -813,25 +813,25 @@ public class FolderManipulator extends SimpleContainer implements final Container container = new SimpleContainer(); group.addAction(container); - container.add(new Label(globalizationUtil.globalise("cms.ui.folder.edit_selection"))); + container.add(new Label(globalizationUtil.globalize("cms.ui.folder.edit_selection"))); actionSelect = new SingleSelect(actionParam); actionSelect.addOption(new Option(COPY, - new Label(globalizationUtil.globalise( + new Label(globalizationUtil.globalize( "cms.ui.folder.copy.action")))); actionSelect.addOption(new Option(MOVE, - new Label(globalizationUtil.globalise( + new Label(globalizationUtil.globalize( "cms.ui.folder.move.action")))); //Publishing in the folder browser only works if threaded publishing is active // if (CMSConfig.getInstanceOf().getThreadedPublishing()) { // actionSelect.addOption(new Option(PUBLISH, -// new Label(globalizationUtil.globalise( +// new Label(globalizationUtil.globalize( // "cms.ui.folder.publish.action")))); // actionSelect.addOption(new Option(UNPUBLISH, -// new Label(globalizationUtil.globalise( +// new Label(globalizationUtil.globalize( // "cms.ui.folder.unpublish.action")))); // } container.add(actionSelect); - submit = new Submit("Go", globalizationUtil.globalise("cms.ui.folder.go")); + submit = new Submit("Go", globalizationUtil.globalize("cms.ui.folder.go")); container.add(submit); // Add a new first column to the table @@ -903,7 +903,7 @@ public class FolderManipulator extends SimpleContainer implements panel = new BoxPanel(BoxPanel.HORIZONTAL); final ActionLink allLink = new ActionLink( - globalizationUtil.globalise("cms.ui.folder.filter.all")); + globalizationUtil.globalize("cms.ui.folder.filter.all")); allLink.addActionListener(new ActionListener() { @Override @@ -928,11 +928,11 @@ public class FolderManipulator extends SimpleContainer implements // }); // panel.add(link); // } - panel.add(new Label(globalizationUtil.globalise("cms.ui.folder.filter"))); + panel.add(new Label(globalizationUtil.globalize("cms.ui.folder.filter"))); filterField = new TextField(filterParam); panel.add(filterField); panel.add(new Submit("filterFolderSubmit", - globalizationUtil.globalise("cms.ui.folder.filter_do"))); + globalizationUtil.globalize("cms.ui.folder.filter_do"))); add(panel); @@ -981,7 +981,7 @@ public class FolderManipulator extends SimpleContainer implements * * @param key The resource key. May not null. * - * @return The globalised message + * @return The globalized message */ // public static GlobalizedMessage globalize(final String key) { // return new GlobalizedMessage(key, RESOURCE_BUNDLE); diff --git a/ccm-core/src/com/arsdigita/toolbox/GlobalisationUtil.java b/ccm-core/src/com/arsdigita/toolbox/GlobalisationUtil.java index fabfa3a20..9b4e2f9e1 100644 --- a/ccm-core/src/com/arsdigita/toolbox/GlobalisationUtil.java +++ b/ccm-core/src/com/arsdigita/toolbox/GlobalisationUtil.java @@ -51,24 +51,24 @@ public class GlobalisationUtil { } /** - * Lookup the globalised message identified by the provided key in the resource bundle. + * Lookup the globalized message identified by the provided key in the resource bundle. * * @param key Message key - * @return The globalised message. + * @return The globalized message. */ - public GlobalizedMessage globalise(final String key) { + public GlobalizedMessage globalize(final String key) { return new GlobalizedMessage(key, bundleName); } /** - * Lookup the globalised message identified by the provided key in the resource bundle and - * replace the placeholders in the message with the provided arguments. + * Lookup the globalized message identified by the provided key in the resource bundle and + replace the placeholders in the message with the provided arguments. * * @param key The key of the message to lookup. * @param args Arguments for the placeholders in the message. - * @return The globalised message. + * @return The globalized message. */ - public GlobalizedMessage globalise(final String key, + public GlobalizedMessage globalize(final String key, final Object[] args) { return new GlobalizedMessage(key, bundleName, args); } diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsInitializer.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsInitializer.java index 2bf456cf4..52b515ec9 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsInitializer.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/SciPublicationsPersonsInitializer.java @@ -106,9 +106,9 @@ public class SciPublicationsPersonsInitializer extends CompoundInitializer { AuthoringKitWizard.registerAssetStep( Publication.BASE_DATA_OBJECT_TYPE, SciPublicationsPersonsStep.class, - globalisationUtil.globalise( + globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.related_persons.title"), - globalisationUtil.globalise( + globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.related_persons.desc"), 50); diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java index 3c727c7c5..24e9cc487 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonForm.java @@ -64,16 +64,19 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { public void addWidgets() { final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); - add(new Label(globalisationUtil.globalise( - "com.arsdigita.cms.contentassets.publicationspersons.select_person"))); + + // add(new Label(globalisationUtil.globalize( + // "com.arsdigita.cms.contentassets.publicationspersons.select_person"))); itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType(GenericPerson.class.getName())); + itemSearch.setLabel(globalisationUtil.globalize( + "com.arsdigita.cms.contentassets.publicationspersons.select_person")); itemSearch.setDisableCreatePane(true); add(itemSearch); - add(new Label(globalisationUtil.globalise( - "com.arsdigita.cms.contentassets.publicationspersons.select_person_relation"))); + // add(new Label(globalisationUtil.globalize( + // "com.arsdigita.cms.contentassets.publicationspersons.select_person_relation"))); final ParameterModel relationParam = new StringParameter(RELATION); final SingleSelect relationSelect = new SingleSelect(relationParam); relationSelect.addValidationListener(new NotNullValidationListener()); @@ -87,6 +90,8 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { relation = relations.getRelationAttribute(); relationSelect.addOption(new Option(relation.getKey(), relation.getName())); } + relationSelect.setLabel(globalisationUtil.globalize( + "com.arsdigita.cms.contentassets.publicationspersons.select_person_relation")); add(relationSelect); } @@ -118,12 +123,12 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); if (data.get(ITEM_SEARCH) == null) { - data.addError(globalisationUtil.globalise( + data.addError(globalisationUtil.globalize( "com.arsdigita.cms.contentasset.publications_persons.none_selected")); } if ((data.get(RELATION) == null) || ((String) data.get(RELATION)).isEmpty()) { - data.addError(globalisationUtil.globalise( + data.addError(globalisationUtil.globalize( "com.arsdigita.cms.contentasset.publications_persons.none_relation_selected")); } diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonTable.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonTable.java index 1bebb79e5..aea409dbd 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonTable.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsPersonTable.java @@ -34,7 +34,6 @@ import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.cms.CMS; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.RelationAttribute; import com.arsdigita.cms.RelationAttributeCollection; import com.arsdigita.cms.contentassets.SciPublicationsPersonsPersonCollection; import com.arsdigita.cms.contentassets.SciPublicationsPersonsService; @@ -65,21 +64,21 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct this.itemModel = itemModel; - setEmptyView(new Label(globalisationUtil.globalise( + setEmptyView(new Label(globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.persons.none"))); final TableColumnModel colModel = getColumnModel(); colModel.add(new TableColumn( 0, - globalisationUtil.globalise( + globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.person"))); colModel.add(new TableColumn( 1, - globalisationUtil.globalise( + globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.person.relation"))); colModel.add(new TableColumn( 2, - globalisationUtil.globalise( + globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.person.remove"), TABLE_COL_DEL)); @@ -163,7 +162,7 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct case 1: return relation; case 2: - return globalisationUtil.globalise( + return globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publication_persons.person.remove"); default: return null; @@ -272,7 +271,7 @@ public class SciPublicationsPersonsPersonTable extends Table implements TableAct if (canEdit) { final ControlLink link = new ControlLink(new Label((GlobalizedMessage) value)); - link.setConfirmation(globalisationUtil.globalise( + link.setConfirmation(globalisationUtil.globalize( "com.arsdigita.cms.contentassets.publications_persons.person.remove.confirm")); return link; } else { diff --git a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsStep.java b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsStep.java index 1c1cb2c03..4fb191e6e 100644 --- a/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsStep.java +++ b/ccm-sci-assets-publicationspersons/src/com/arsdigita/cms/contentassets/ui/SciPublicationsPersonsStep.java @@ -48,7 +48,7 @@ public class SciPublicationsPersonsStep extends SimpleEditStep { final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); final BasicItemForm addPersonsSheet = new SciPublicationsPersonsPersonForm(itemModel); add(ADD_PUBLICATION_PERSON, - globalisationUtil.globalise("com.arsdigita.cms.contentassets.publications_persons.person_add"), + globalisationUtil.globalize("com.arsdigita.cms.contentassets.publications_persons.person_add"), new WorkflowLockedComponentAccess(addPersonsSheet, itemModel), addPersonsSheet.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetAddForm.java b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetAddForm.java index f077b9c60..f7facda66 100644 --- a/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetAddForm.java +++ b/ccm-sci-assets-publicationspublicationtype/src/com/arsdigita/cms/contentassets/ui/PublicationTypeAssetAddForm.java @@ -60,8 +60,9 @@ public class PublicationTypeAssetAddForm extends BasicItemForm { @Override public void addWidgets() { - add(new Label(PublicationTypeAssetGlobalizationUtil. - globalize("scipublications.publication_type_asset.form.type"))); + + //add(new Label(PublicationTypeAssetGlobalizationUtil. + // globalize("scipublications.publication_type_asset.form.type"))); final SingleSelect type = new SingleSelect(PUB_TYPE); type.addValidationListener(new NotNullValidationListener()); type.addValidationListener(new NotEmptyValidationListener()); @@ -74,15 +75,22 @@ public class PublicationTypeAssetAddForm extends BasicItemForm { final RelationAttribute value = values.getRelationAttribute(); type.addOption(new Option(value.getKey(), value.getName())); } + type.setLabel(PublicationTypeAssetGlobalizationUtil. + globalize("scipublications.publication_type_asset.form.type")); add(type); - add(new Label(PublicationTypeAssetGlobalizationUtil. - globalize("scipublications.publication_type_asset.form.isbn"))); - add(new TextField(ISBN)); + //add(new Label(PublicationTypeAssetGlobalizationUtil. + // globalize("scipublications.publication_type_asset.form.isbn"))); + final TextField isbn = new TextField(ISBN); + isbn.setLabel(PublicationTypeAssetGlobalizationUtil. + globalize("scipublications.publication_type_asset.form.isbn")); + add(isbn); - add(new Label(PublicationTypeAssetGlobalizationUtil. - globalize("scipublications.publication_type_asset.form.misc"))); + //add(new Label(PublicationTypeAssetGlobalizationUtil. + // globalize("scipublications.publication_type_asset.form.misc"))); final TextArea misc = new TextArea(MISC); + misc.setLabel(PublicationTypeAssetGlobalizationUtil. + globalize("scipublications.publication_type_asset.form.misc")); misc.setRows(12); misc.setCols(60); add(misc); diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorForm.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorForm.java index cbf054052..eb95c3793 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorForm.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorForm.java @@ -52,7 +52,7 @@ public class SciPublicationsMovieDirectorForm extends BasicItemForm implements F public void addWidgets() { final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); - add(new Label(globalisationUtil.globalise("publications.dramaticarts.ui.movie.director"))); + add(new Label(globalisationUtil.globalize("publications.dramaticarts.ui.movie.director"))); itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( GenericPerson.BASE_DATA_OBJECT_TYPE)); @@ -92,7 +92,7 @@ public class SciPublicationsMovieDirectorForm extends BasicItemForm implements F = new SciPublicationsDramaticArtsGlobalisationUtil(); if (data.get(ITEM_SEARCH) == null) { - data.addError(globalisationUtil.globalise( + data.addError(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.director.no_director_selected")); } diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorSheet.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorSheet.java index 0572ca57c..5df9219b1 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorSheet.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorSheet.java @@ -62,17 +62,17 @@ public class SciPublicationsMovieDirectorSheet this.itemModel = itemModel; - setEmptyView(new Label(globalisationUtil.globalise( + setEmptyView(new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.director.none"))); final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - globalisationUtil.globalise("publications.dramaticarts.ui.movie.director"), + globalisationUtil.globalize("publications.dramaticarts.ui.movie.director"), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - globalisationUtil.globalise("publications.dramaticarts.ui.movie.director.remove"), + globalisationUtil.globalize("publications.dramaticarts.ui.movie.director.remove"), TABLE_COL_DEL)); setModelBuilder(new ModelBuilder(itemModel)); @@ -147,7 +147,7 @@ public class SciPublicationsMovieDirectorSheet case 0: return director.getFullName(); case 1: - return new Label(globalisationUtil.globalise( + return new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.director.remove")); default: return null; @@ -235,7 +235,7 @@ public class SciPublicationsMovieDirectorSheet if (canEdit) { final ControlLink link = new ControlLink((Label)value); - link.setConfirmation(globalisationUtil.globalise( + link.setConfirmation(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.director.remove.confirm")); return link; } else { diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorStep.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorStep.java index 8a8bad7b3..f7eb36709 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorStep.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieDirectorStep.java @@ -48,7 +48,7 @@ public class SciPublicationsMovieDirectorStep extends SimpleEditStep { = new SciPublicationsDramaticArtsGlobalisationUtil(); final BasicItemForm setDirectorForm = new SciPublicationsMovieDirectorForm(itemModel); add(SET_MOVIE_DIRECTOR_STEP, - globalisationUtil.globalise("publications.dramaticarts.ui.movie.director"), + globalisationUtil.globalize("publications.dramaticarts.ui.movie.director"), new WorkflowLockedComponentAccess(setDirectorForm, itemModel), setDirectorForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyForm.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyForm.java index ac6857598..488d70fc1 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyForm.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyForm.java @@ -56,7 +56,7 @@ public class SciPublicationsMovieProductionCompanyForm public void addWidgets() { final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); - add(new Label(globalisationUtil.globalise( + add(new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.production_company"))); itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( @@ -98,7 +98,7 @@ public class SciPublicationsMovieProductionCompanyForm = new SciPublicationsDramaticArtsGlobalisationUtil(); if (data.get(ITEM_SEARCH) == null) { - data.addError(globalisationUtil.globalise( + data.addError(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.production_company.no_company_selected")); } diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanySheet.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanySheet.java index e2e14dabb..0ac29ef87 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanySheet.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanySheet.java @@ -62,17 +62,17 @@ public class SciPublicationsMovieProductionCompanySheet this.itemModel = itemModel; - setEmptyView(new Label(globalisationUtil.globalise( + setEmptyView(new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.production_company.none"))); final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - globalisationUtil.globalise("publications.dramaticarts.ui.movie.production_company"), + globalisationUtil.globalize("publications.dramaticarts.ui.movie.production_company"), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - globalisationUtil.globalise( + globalisationUtil.globalize( "publications.dramaticarts.ui.movie.production_company.remove"), TABLE_COL_DEL)); @@ -146,7 +146,7 @@ public class SciPublicationsMovieProductionCompanySheet case 0: return productionCompany.getTitle(); case 1: - return new Label(globalisationUtil.globalise( + return new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.production_company.remove")); default: return null; @@ -234,7 +234,7 @@ public class SciPublicationsMovieProductionCompanySheet if (canEdit) { final ControlLink link = new ControlLink((Label) value); - link.setConfirmation(globalisationUtil.globalise( + link.setConfirmation(globalisationUtil.globalize( "publications.dramaticarts.ui.movie.production_company.remove.confirm")); return link; } else { diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyStep.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyStep.java index 8829715de..599ffb11f 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyStep.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMovieProductionCompanyStep.java @@ -49,7 +49,7 @@ public class SciPublicationsMovieProductionCompanyStep extends SimpleEditStep { final BasicItemForm setProductionCompanyForm = new SciPublicationsMovieProductionCompanyForm(itemModel); add(SET_PRODUCTION_COMPANY_STEP, - globalisationUtil.globalise("publications.ui.dramaticarts.movie.productioncompany"), + globalisationUtil.globalize("publications.ui.dramaticarts.movie.productioncompany"), new WorkflowLockedComponentAccess(setProductionCompanyForm, itemModel), setProductionCompanyForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMoviePropertiesStep.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMoviePropertiesStep.java index f159c701e..fedd8075f 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMoviePropertiesStep.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsMoviePropertiesStep.java @@ -82,8 +82,8 @@ public class SciPublicationsMoviePropertiesStep extends PublicationPropertiesSte final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); addStep(new SciPublicationsMovieDirectorStep(itemModel, parent), - globalisationUtil.globalise("publications.dramaticarts.ui.movie.director")); + globalisationUtil.globalize("publications.dramaticarts.ui.movie.director")); addStep(new SciPublicationsMovieProductionCompanyStep(itemModel, parent), - globalisationUtil.globalise("publications.dramaticarts.ui.movie.production_company")); + globalisationUtil.globalize("publications.dramaticarts.ui.movie.production_company")); } } diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterForm.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterForm.java index f7718d09c..f76a24178 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterForm.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterForm.java @@ -56,7 +56,7 @@ public class SciPublicationsPlayProductionTheaterForm public void addWidgets() { final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); - add(new Label(globalisationUtil.globalise( + add(new Label(globalisationUtil.globalize( "publications.dramaticarts.play.ui.productiontheater"))); itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( @@ -98,7 +98,7 @@ public class SciPublicationsPlayProductionTheaterForm = new SciPublicationsDramaticArtsGlobalisationUtil(); if (data.get(ITEM_SEARCH) == null) { - data.addError(globalisationUtil.globalise( + data.addError(globalisationUtil.globalize( "publications.dramaticarts.ui.play.production_theater.no_theater_selected")); } diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterSheet.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterSheet.java index 6ae9ce5d6..f3e5b6583 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterSheet.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterSheet.java @@ -61,17 +61,17 @@ public class SciPublicationsPlayProductionTheaterSheet super(); this.itemModel = itemModel; - setEmptyView(new Label(globalisationUtil.globalise( + setEmptyView(new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.play.production_theater.none"))); final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - globalisationUtil.globalise("publications.dramaticarts.ui.play.productiontheater"), + globalisationUtil.globalize("publications.dramaticarts.ui.play.productiontheater"), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - globalisationUtil.globalise( + globalisationUtil.globalize( "publications.dramaticarts.ui.play.production_theater.remove"), TABLE_COL_DEL)); @@ -145,7 +145,7 @@ public class SciPublicationsPlayProductionTheaterSheet case 0: return productionTheater.getTitle(); case 1: - return new Label(globalisationUtil.globalise( + return new Label(globalisationUtil.globalize( "publications.dramaticarts.ui.play.production_theater.remove")); default: return null; @@ -234,7 +234,7 @@ public class SciPublicationsPlayProductionTheaterSheet if (canEdit) { final ControlLink link = new ControlLink((Label) value); - link.setConfirmation(globalisationUtil.globalise( + link.setConfirmation(globalisationUtil.globalize( "publications.dramaticarts.ui.play.production_theater.remove.confirm")); return link; } else { diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterStep.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterStep.java index 8a6b0013e..8f280567a 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterStep.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayProductionTheaterStep.java @@ -49,7 +49,7 @@ public class SciPublicationsPlayProductionTheaterStep extends SimpleEditStep { final BasicItemForm setProductionTheaterForm = new SciPublicationsPlayProductionTheaterForm( itemModel); add(SET_PRODUCTION_THEATER_STEP, - globalisationUtil.globalise("publications.dramaticarts.play.ui.productiontheater"), + globalisationUtil.globalize("publications.dramaticarts.play.ui.productiontheater"), new WorkflowLockedComponentAccess(setProductionTheaterForm, itemModel), setProductionTheaterForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertiesStep.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertiesStep.java index f1cb68ad3..230a6f3a9 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertiesStep.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertiesStep.java @@ -53,7 +53,7 @@ public class SciPublicationsPlayPropertiesStep extends PublicationWithPublisherP final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); - sheet.add(globalisationUtil.globalise( + sheet.add(globalisationUtil.globalize( "publications.dramaticarts.ui.play.first_production_year"), SciPublicationsPlay.FIRST_PRODUCTION_YEAR); @@ -94,8 +94,7 @@ public class SciPublicationsPlayPropertiesStep extends PublicationWithPublisherP final SciPublicationsDramaticArtsGlobalisationUtil globalisationUtil = new SciPublicationsDramaticArtsGlobalisationUtil(); addStep(new SciPublicationsPlayProductionTheaterStep(itemModel, parent), - globalisationUtil. - globalise("publications.dramaticarts.ui.play.first_production_theater")); + globalisationUtil.globalize("publications.dramaticarts.ui.play.first_production_theater")); } diff --git a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertyForm.java b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertyForm.java index 7d6587732..4d6425ce5 100644 --- a/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertyForm.java +++ b/ccm-sci-publications-dramaticarts/src/com/arsdigita/cms/contenttypes/ui/SciPublicationsPlayPropertyForm.java @@ -64,8 +64,8 @@ public class SciPublicationsPlayPropertyForm final ParameterModel firstProdYearParam = new IntegerParameter(SciPublicationsPlay.FIRST_PRODUCTION_YEAR); final TextField firstProdYear = new TextField(firstProdYearParam); firstProdYear.setMaxLength(4); - firstProdYear.setLabel(globalisationUtil.globalise("publications.dramaticarts.ui.play.first_production_year")); - add(new Label(globalisationUtil.globalise("publications.dramaticarts.ui.play.first_production_year"))); + firstProdYear.setLabel(globalisationUtil.globalize("publications.dramaticarts.ui.play.first_production_year")); + add(new Label(globalisationUtil.globalize("publications.dramaticarts.ui.play.first_production_year"))); add(firstProdYear); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java index 05a68e6b2..15f02c344 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java @@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.Folder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume; import com.arsdigita.cms.contenttypes.CollectedVolume; @@ -34,7 +33,6 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.kernel.Kernel; -import java.math.BigDecimal; /** * Form for adding an association between an ArticleInCollectedVolume and a @@ -63,13 +61,16 @@ public class ArticleInCollectedVolumeCollectedVolumeForm @Override protected void addWidgets() { - add(new Label( - PublicationGlobalizationUtil.globalize( - "publications.ui.articleInCollectedVolume.selectCollectedVolume"))); + + //add(new Label( + // PublicationGlobalizationUtil.globalize( + // "publications.ui.articleInCollectedVolume.selectCollectedVolume"))); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType( CollectedVolume.class.getName())); itemSearch.setDefaultCreationFolder(config.getDefaultCollectedVolumesFolder()); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInCollectedVolume.selectCollectedVolume")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeSheet.java index 9c13f7694..609e6fa2c 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeSheet.java @@ -68,15 +68,13 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet TableColumnModel colModel = getColumnModel(); colModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.articleInCollectedVolume.collectedVolume"). - localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInCollectedVolume.collectedVolume")), TABLE_COL_EDIT)); colModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.articleInCollectedVolume.collectedVolume.remove"). - localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInCollectedVolume.collectedVolume.remove")), TABLE_COL_DEL)); setModelBuilder( @@ -162,6 +160,7 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet } } + @Override public Object getKeyAt(int columnIndex) { return collectedVolume.getID(); } @@ -225,6 +224,7 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet extends LockableImpl implements TableCellRenderer { + @Override public Component getComponent(Table table, PageState state, Object value, @@ -246,9 +246,9 @@ public class ArticleInCollectedVolumeCollectedVolumeSheet if (canEdit) { ControlLink link = new ControlLink(value.toString()); link.setConfirmation( - (String) PublicationGlobalizationUtil.globalize( + PublicationGlobalizationUtil.globalize( "publications.ui.articleInCollectedVolume.collectedVolume." - + "confirm_remove").localize()); + + "confirm_remove")); return link; } else { Label label = new Label(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java index dbb7a705e..2a083799c 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java @@ -50,15 +50,14 @@ public class ArticleInCollectedVolumeCollectedVolumeStep BasicItemForm addCollectedVolumeForm = new ArticleInCollectedVolumeCollectedVolumeForm(itemModel); add(ADD_COLLECTED_VOLUME_STEP, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.collectedVolume.addCollectedVolume").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.collectedVolume.addCollectedVolume"), new WorkflowLockedComponentAccess(addCollectedVolumeForm, itemModel), addCollectedVolumeForm.getSaveCancelSection().getCancelButton()); ArticleInCollectedVolumeCollectedVolumeSheet sheet = - new ArticleInCollectedVolumeCollectedVolumeSheet( - itemModel); + new ArticleInCollectedVolumeCollectedVolumeSheet(itemModel); setDisplayComponent(sheet); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java index c891114e2..739763a5d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java @@ -115,6 +115,7 @@ public class ArticleInCollectedVolumePropertiesStep super(); } + @Override public String format(DomainObject obj, String attribute, PageState state) { if ((get(obj, attribute) != null) && (get(obj, attribute) instanceof Boolean) diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java index 179f2097a..a04a1383b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertyForm.java @@ -63,36 +63,34 @@ public class ArticleInCollectedVolumePropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.article_in_collected_volume.pages_from"). - localize())); ParameterModel fromParam = new IntegerParameter( ArticleInCollectedVolume.PAGES_FROM); TextField pagesFrom = new TextField(fromParam); + pagesFrom.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.article_in_collected_volume.pages_from")); add(pagesFrom); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.article_in_collected_volume.pages_to"). - localize())); ParameterModel toParam = new IntegerParameter( ArticleInCollectedVolume.PAGES_TO); TextField pagesTo = new TextField(toParam); + pagesTo.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.article_in_collected_volume.pages_to")); add(pagesTo); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.article_in_collected_volume.chapter"). - localize())); ParameterModel chapterParam = new StringParameter( ArticleInCollectedVolume.CHAPTER); TextField chapter = new TextField(chapterParam); + chapter.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.article_in_collected_volume.chapter")); add(chapter); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.articleInCollectedVolume.reviewed"))); reviewed = new CheckboxGroup("reviewedGroup"); reviewed.addOption(new Option(REVIEWED, "")); + reviewed.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInCollectedVolume.reviewed")); add(reviewed); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java index 810065c6f..edf09b9f6 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalExtraXmlGenerator.java @@ -35,6 +35,7 @@ import com.arsdigita.xml.Element; */ public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator { + @Override public void generateXML(final ContentItem item, final Element element, final PageState state) { @@ -62,6 +63,7 @@ public class ArticleInJournalExtraXmlGenerator implements ExtraXMLGenerator { } } + @Override public void addGlobalStateParams(final Page p) { //nothing } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java index 557038bb1..0208a7d54 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java @@ -61,14 +61,14 @@ public class ArticleInJournalJournalForm @Override protected void addWidgets() { - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.articleInJournal.selectJournal"))); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType( Journal.class.getName())); itemSearch.setDefaultCreationFolder(config.getDefaultJournalsFolder()); itemSearch.setEditAfterCreate(false); itemSearch.setQueryField("symbol"); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInJournal.selectJournal")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalSheet.java index 0fd43195b..265f23992 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalSheet.java @@ -66,13 +66,13 @@ public class ArticleInJournalJournalSheet TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.articleInJournal.journal").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInJournal.journal")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.articleInJournal.journal.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInJournal.journal.remove")), TABLE_COL_DEL)); setModelBuilder(new ArticleInJournalJournalSheetModelBuilder(itemModel)); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalStep.java index de8477ca8..06c504e98 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalStep.java @@ -46,8 +46,8 @@ public class ArticleInJournalJournalStep extends SimpleEditStep { BasicItemForm addJournalForm = new ArticleInJournalJournalForm(itemModel); add(ADD_JOURNAL_STEP, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleInJournal.addJournal").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.articleInJournal.addJournal"), new WorkflowLockedComponentAccess(addJournalForm, itemModel), addJournalForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertiesStep.java index e972ff803..30cad98ae 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertiesStep.java @@ -103,21 +103,21 @@ public class ArticleInJournalPropertiesStep extends PublicationPropertiesStep { BasicPageForm editBasicSheet = new ArticleInJournalPropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.edit_basic_sheet"). - localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet, + itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton() + ); basicProperties.setDisplayComponent( getArticleInJournalPropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.basic_properties").localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.publication.basic_properties")), basicProperties); } @@ -127,8 +127,8 @@ public class ArticleInJournalPropertiesStep extends PublicationPropertiesStep { super.addSteps(itemModel, parent); addStep(new ArticleInJournalJournalStep(itemModel, parent), - (String) PublicationGlobalizationUtil.globalize( - "publication.ui.articleInJournal.journal").localize()); + PublicationGlobalizationUtil.globalize( + "publication.ui.articleInJournal.journal")); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java index 30b1d4bef..e72d1941b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalPropertyForm.java @@ -69,54 +69,54 @@ public class ArticleInJournalPropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.volume").localize())); ParameterModel volumeParam = new IntegerParameter(ArticleInJournal.VOLUME); TextField volume = new TextField(volumeParam); //volume.addValidationListener(new NotNullValidationListener()); //volume.addValidationListener(new NotEmptyValidationListener()); + volume.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.volume")); add(volume); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.issue").localize())); ParameterModel issueParam = new StringParameter(ArticleInJournal.ISSUE); TextField issue = new TextField(issueParam); + issue.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.issue")); add(issue); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.pages_from").localize())); ParameterModel pagesFromParam = new IntegerParameter(ArticleInJournal.PAGES_FROM); TextField pagesFrom = new TextField(pagesFromParam); + pagesFrom.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.pages_from")); add(pagesFrom); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.pages_to").localize())); ParameterModel pagesToParam = new IntegerParameter(ArticleInJournal.PAGES_TO); TextField pagesTo = new TextField(pagesToParam); + pagesTo.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.pages_to")); add(pagesTo); Calendar today = new GregorianCalendar(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.publicationDate"). - localize())); ParameterModel pubDateParam = new DateParameter(ArticleInJournal.PUBLICATION_DATE); com.arsdigita.bebop.form.Date pubDate = new com.arsdigita.bebop.form.Date( pubDateParam); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); + pubDate.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.publicationDate")); add(pubDate); - reviewedLabel = new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.reviewed")); add(reviewedLabel); reviewed = new CheckboxGroup("reviewedGroup"); reviewed.addOption(new Option(REVIEWED, "")); + reviewed.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.reviewed")); add(reviewed); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java index 53b4d6e60..25b039bf3 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java @@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.Folder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolume; import com.arsdigita.cms.contenttypes.ArticleInCollectedVolumeCollection; @@ -35,7 +34,7 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.kernel.Kernel; -import java.math.BigDecimal; + import org.apache.log4j.Logger; /** @@ -68,14 +67,14 @@ public class CollectedVolumeArticleAddForm @Override protected void addWidgets() { - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.articles.select_article"). - localize())); + m_itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( ArticleInCollectedVolume.class.getName())); m_itemSearch.setDefaultCreationFolder(config.getDefaultArticlesInCollectedVolumeFolder()); + m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.articles.select_article")); add(m_itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesStep.java index fdf1ab30f..b1fca27cf 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesStep.java @@ -45,8 +45,8 @@ public class CollectedVolumeArticlesStep extends SimpleEditStep { BasicItemForm addArticleSheet = new CollectedVolumeArticleAddForm(itemModel); add(ADD_ARTICLE_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.add_article").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.add_article"), new WorkflowLockedComponentAccess(addArticleSheet, itemModel), addArticleSheet.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesTable.java index 05d3fad16..1bbb4a5fa 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticlesTable.java @@ -73,23 +73,23 @@ public class CollectedVolumeArticlesTable TableColumnModel colModel = getColumnModel(); colModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.article").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.article")), TABLE_COL_EDIT)); colModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.article.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.article.remove")), TABLE_COL_DEL)); colModel.add(new TableColumn( 2, - PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.article.up").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.article.up")), TABLE_COL_UP)); colModel.add(new TableColumn( 3, - PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.article.down").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.article.down")), TABLE_COL_DOWN)); setModelBuilder( @@ -264,11 +264,8 @@ public class CollectedVolumeArticlesTable if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publications.ui.collected_volume." - + "articles.confirm_remove"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.articles.confirm_remove")); return link; } else { Label label = new Label(value.toString()); @@ -293,7 +290,7 @@ public class CollectedVolumeArticlesTable if (0 == row) { s_log.debug("Row is first row in table, don't show up link"); - Label label = new Label(""); + Label label = new Label(); return label; } else { ControlLink link = new ControlLink("up"); @@ -324,7 +321,7 @@ public class CollectedVolumeArticlesTable if ((articles.size() - 1) == row) { s_log.debug("Row is last row in table, don't show down link"); - Label label = new Label(""); + Label label = new Label(); return label; } else { ControlLink link = new ControlLink("down"); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java index e233b51a5..c7a654848 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeExtraXmlGenerator.java @@ -85,6 +85,7 @@ public class CollectedVolumeExtraXmlGenerator implements ExtraXMLGenerator { generator.generateXML(state, articlesElem, ""); } + @Override public void addGlobalStateParams(final Page page) { //Nothing } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertiesStep.java index 999da6900..997f18b4b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertiesStep.java @@ -67,22 +67,19 @@ public class CollectedVolumePropertiesStep BasicPageForm editBasicSheet = new CollectedVolumePropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.collected_volume.edit_basic_sheet"). - localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.collected_volume.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet,itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent( getCollectedVolumePropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.basic_properties"). - localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.publication.basic_properties")), basicProperties); } @@ -103,6 +100,7 @@ public class CollectedVolumePropertiesStep super(); } + @Override public String format(DomainObject obj, String attribute, PageState state) { if ((get(obj, attribute) != null) && (get(obj, attribute) instanceof Boolean) diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java index df806835f..48f799c5c 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumePropertyForm.java @@ -41,9 +41,8 @@ public class CollectedVolumePropertyForm FormInitListener, FormSubmissionListener { - private static final Logger s_log = - Logger.getLogger( - CollectedVolumePropertyForm.class); + private static final Logger s_log = Logger.getLogger( + CollectedVolumePropertyForm.class); private static final String REVIEWED = "reviewed"; private CollectedVolumePropertiesStep m_step; public static final String ID = "CollectedVolumeEdit"; @@ -62,11 +61,13 @@ public class CollectedVolumePropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label(PublicationGlobalizationUtil.globalize("publications.ui.collectedVolume.reviewed"))); reviewed = new CheckboxGroup("reviewedGroup"); reviewed.addOption(new Option(REVIEWED, "")); + reviewed.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.collectedVolume.reviewed")); add(reviewed); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java index 31e5d7a99..3c1826cd3 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java @@ -26,7 +26,6 @@ import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.Folder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Expertise; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; @@ -34,7 +33,6 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.kernel.Kernel; -import java.math.BigDecimal; /** * @@ -60,13 +58,13 @@ public class ExpertiseOrdererForm @Override protected void addWidgets() { - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.orderer"))); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. findByAssociatedObjectType(GenericOrganizationalUnit.class. getName())); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setEditAfterCreate(false); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.orderer")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererSheet.java index 2dfdf997e..2a7c15019 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererSheet.java @@ -64,13 +64,13 @@ public class ExpertiseOrdererSheet TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.orderer").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.orderer")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.orderer.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.orderer.remove")), TABLE_COL_DEL)); setModelBuilder(new ExpertiseOrganizationSheetModelBuilder(itemModel)); @@ -230,10 +230,8 @@ public class ExpertiseOrdererSheet if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publication.ui.expertise.orderer.remove.confirm"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publication.ui.expertise.orderer.remove.confirm")); return link; } else { Label label = new Label(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererStep.java index 50875395c..2bc849d2d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererStep.java @@ -44,8 +44,8 @@ public class ExpertiseOrdererStep extends SimpleEditStep { BasicItemForm setOrdererForm = new ExpertiseOrdererForm(itemModel); add(SET_EXPERTISE_ORDERER_STEP, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.setOrderer").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.setOrderer"), new WorkflowLockedComponentAccess(setOrdererForm, itemModel), setOrdererForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java index c9f842645..931682bf3 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java @@ -20,13 +20,11 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; import com.arsdigita.cms.ContentType; -import com.arsdigita.cms.Folder; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Expertise; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; @@ -34,7 +32,6 @@ import com.arsdigita.cms.contenttypes.PublicationsConfig; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.kernel.Kernel; -import java.math.BigDecimal; /** * @@ -60,13 +57,13 @@ public class ExpertiseOrganizationForm @Override protected void addWidgets() { - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.organization"))); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. findByAssociatedObjectType(GenericOrganizationalUnit.class. getName())); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setEditAfterCreate(false); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.organization")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationSheet.java index e5e554269..07af929ce 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationSheet.java @@ -64,13 +64,13 @@ public class ExpertiseOrganizationSheet TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.organization").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.organization")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.organization.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.organization.remove")), TABLE_COL_DEL)); setModelBuilder(new ExpertiseOrganizationSheetModelBuilder(itemModel)); @@ -231,10 +231,8 @@ public class ExpertiseOrganizationSheet if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publication.ui.expertise.organization.remove.confirm"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publication.ui.expertise.organization.remove.confirm")); return link; } else { Label label = new Label(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationStep.java index 332711a7b..ab489fea9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationStep.java @@ -45,8 +45,8 @@ public class ExpertiseOrganizationStep extends SimpleEditStep { BasicItemForm setOrgaForm = new ExpertiseOrganizationForm(itemModel); add(SET_EXPERTISE_ORGANIZATION_STEP, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.setOrganization").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.setOrganization"), new WorkflowLockedComponentAccess(setOrgaForm, itemModel), setOrgaForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertisePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertisePropertyForm.java index 26bfa4b18..ba8549344 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertisePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertisePropertyForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -29,11 +28,8 @@ import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Expertise; -import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; -import com.arsdigita.cms.ui.ItemSearchWidget; /** * @@ -61,19 +57,20 @@ public class ExpertisePropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.place").localize())); ParameterModel placeParam = new StringParameter(Expertise.PLACE); TextField place = new TextField(placeParam); + place.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.place")); add(place); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.expertise.number_of_pages").localize())); ParameterModel numberOfPagesParam = new IntegerParameter(Expertise.NUMBER_OF_PAGES); TextField numberOfPages = new TextField(numberOfPagesParam); + numberOfPages.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.expertise.number_of_pages")); add(numberOfPages); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationAddForm.java index 956c26094..5ee4dec1b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationAddForm.java @@ -54,12 +54,12 @@ public class GenericOrganizationalUnitPublicationAddForm @Override public void addWidgets() { - add(new Label((String) PublicationGlobalizationUtil.globalize( - "genericorganizationalunit.ui.publication.select").localize())); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType(Publication.class. getName())); itemSearch.setDisableCreatePane(true); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "genericorganizationalunit.ui.publication.select")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsStep.java index 25076c204..627d80ce5 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsStep.java @@ -49,8 +49,8 @@ public class GenericOrganizationalUnitPublicationsStep extends SimpleEditStep { final BasicItemForm addPublicationSheet = new GenericOrganizationalUnitPublicationAddForm(itemModel); add(ADD_PUBLICATION_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "genericorganizationalunit.ui.add_publication").localize(), + PublicationGlobalizationUtil.globalize( + "genericorganizationalunit.ui.add_publication"), new WorkflowLockedComponentAccess(addPublicationSheet, itemModel), addPublicationSheet.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java index a11159871..9c5450e2f 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPublicationsTable.java @@ -38,7 +38,6 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitPublicationsCollection; import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.dispatcher.ItemResolver; -import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.util.LockableImpl; import java.math.BigDecimal; @@ -67,15 +66,13 @@ public class GenericOrganizationalUnitPublicationsTable final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "genericorganizationalunit.ui.publications.columns.name"). - localize(), + new Label(PublicationGlobalizationUtil.globalize( + "genericorganizationalunit.ui.publications.columns.name")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "genericorganizationalunit.ui.publications.columns.remove"). - localize(), + new Label(PublicationGlobalizationUtil.globalize( + "genericorganizationalunit.ui.publications.columns.remove")), TABLE_COL_DEL)); setModelBuilder(new ModelBuilder(itemModel)); @@ -97,6 +94,7 @@ public class GenericOrganizationalUnitPublicationsTable this.itemModel = itemModel; } + @Override public TableModel makeModel(final Table table, final PageState state) { table.getRowSelectionModel().clearSelection(state); @@ -201,6 +199,7 @@ public class GenericOrganizationalUnitPublicationsTable extends LockableImpl implements TableCellRenderer { + @Override public Component getComponent(final Table table, final PageState state, final Object value, @@ -221,10 +220,8 @@ public class GenericOrganizationalUnitPublicationsTable if (canEdit) { final ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "genericorganizationalunit.ui.publications.remove.confirm"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "genericorganizationalunit.ui.publications.remove.confirm")); return link; } else { final Label label = new Label(value.toString()); @@ -236,6 +233,7 @@ public class GenericOrganizationalUnitPublicationsTable private class ActionListener implements TableActionListener { + @Override public void cellSelected(final TableActionEvent event) { final PageState state = event.getPageState(); @@ -256,6 +254,7 @@ public class GenericOrganizationalUnitPublicationsTable } + @Override public void headSelected(final TableActionEvent event) { //Nothing } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java index b28dba89b..fb4cd62c4 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/GreyLiteraturePropertyForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -28,7 +27,6 @@ import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.bebop.parameters.ParameterModel; -import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.GreyLiterature; @@ -58,22 +56,21 @@ public class GreyLiteraturePropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.greyliterature.pages_from"). - localize())); ParameterModel fromParam = new IntegerParameter( GreyLiterature.PAGES_FROM); TextField pagesFrom = new TextField(fromParam); + pagesFrom.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.greyliterature.pages_from")); add(pagesFrom); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.greyliterature.pages_to"). - localize())); ParameterModel toParam = new IntegerParameter( GreyLiterature.PAGES_TO); TextField pagesTo = new TextField(toParam); + pagesTo.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.greyliterature.pages_to")); add(pagesTo); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java index 10f7fb146..81ab07bc7 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java @@ -37,7 +37,8 @@ import com.arsdigita.kernel.Kernel; import java.math.BigDecimal; /** - * Form for adding an association between a InProceedings publication and a proceedings publication. + * Form for adding an association between a InProceedings publication and a + * proceedings publication. * * @author Jens Pelzetter * @version $Id$ @@ -61,13 +62,12 @@ public class InProceedingsProceedingsForm @Override protected void addWidgets() { - add(new Label( - PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.selectProceedings"))); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType( Proceedings.class.getName())); itemSearch.setDefaultCreationFolder(config.getDefaultProceedingsFolder()); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.selectProceedings")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsSheet.java index 946e302b9..77ad36632 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsSheet.java @@ -67,13 +67,13 @@ public class InProceedingsProceedingsSheet TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.proceedings").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.proceedings")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.proceedings.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.proceedings.remove")), TABLE_COL_DEL)); setModelBuilder(new InProceedingsProceedingsSheetModelBuilder( @@ -149,9 +149,8 @@ public class InProceedingsProceedingsSheet case 0: return proceedings.getTitle(); case 1: - return PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.proceedings.remove"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.proceedings.remove")); default: return null; } @@ -224,6 +223,7 @@ public class InProceedingsProceedingsSheet extends LockableImpl implements TableCellRenderer { + @Override public Component getComponent(Table table, PageState state, Object value, @@ -243,10 +243,8 @@ public class InProceedingsProceedingsSheet if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation( - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.proceedings." - + "confirm_remove").localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.proceedings.confirm_remove")); return link; } else { Label label = new Label(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsStep.java index a38a65b1e..f61e78ad9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsStep.java @@ -47,8 +47,8 @@ public class InProceedingsProceedingsStep extends SimpleEditStep { BasicItemForm addProceedingsForm = new InProceedingsProceedingsForm( itemModel); add(ADD_PROCEEDINGS_STEP, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.addProceedings").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.addProceedings"), new WorkflowLockedComponentAccess(addProceedingsForm, itemModel), addProceedingsForm.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertiesStep.java index d5862e768..21405cda7 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertiesStep.java @@ -66,20 +66,20 @@ public class InProceedingsPropertiesStep BasicPageForm editBasicSheet = new InProceedingsPropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.inproceedings.edit_basic_sheet").localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.inproceedings.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet, + itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent( getInProceedingsPropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publications.basic_properties").localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.publications.basic_properties")), basicProperties); } @@ -89,7 +89,7 @@ public class InProceedingsPropertiesStep super.addSteps(itemModel, parent); addStep(new InProceedingsProceedingsStep(itemModel, parent), - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.inProceedings.proceedings").localize()); + PublicationGlobalizationUtil.globalize( + "publications.ui.inProceedings.proceedings")); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java index eeb540c04..fb3e4c0c6 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsPropertyForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -57,20 +56,21 @@ public class InProceedingsPropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.inproceedings.pages_from").localize())); ParameterModel pagesFromParam = new IntegerParameter(InProceedings.PAGES_FROM); TextField pagesFrom = new TextField(pagesFromParam); + pagesFrom.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.inproceedings.pages_from")); add(pagesFrom); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.inproceedings.pages_to").localize())); ParameterModel pagesToParam = new IntegerParameter(InProceedings.PAGES_TO); TextField pagesTo = new TextField(pagesToParam); + pagesTo.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.inproceedings.pages_to")); add(pagesTo); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java index 27b89379f..72864d4b9 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java @@ -60,13 +60,13 @@ public class InternetArticleOrganizationForm @Override public void addWidgets() { - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.select_organization"))); itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType( GenericOrganizationalUnit.class.getName())); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setEditAfterCreate(false); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.select_organization")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationSheet.java index 21d18338a..26e1f9a19 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationSheet.java @@ -64,13 +64,13 @@ public class InternetArticleOrganizationSheet TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.organization").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.organization")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.organization.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.organization.remove")), TABLE_COL_DEL)); setModelBuilder(new InternetArticleOrganizationSheetModelBuilder( @@ -122,10 +122,12 @@ public class InternetArticleOrganizationSheet } } + @Override public int getColumnCount() { return table.getColumnModel().size(); } + @Override public boolean nextRow() { boolean ret; @@ -139,19 +141,20 @@ public class InternetArticleOrganizationSheet return ret; } + @Override public Object getElementAt(final int columnIndex) { switch (columnIndex) { case 0: return orga.getTitle(); case 1: - return PublicationGlobalizationUtil.globalize( - "publication.ui.internetarticle.organization.remove"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publication.ui.internetarticle.organization.remove")); default: return null; } } + @Override public Object getKeyAt(final int columnIndex) { return orga.getID(); } @@ -240,10 +243,8 @@ public class InternetArticleOrganizationSheet if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publications.ui.internetarticle.organization.remove.confirm"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.organization.remove.confirm")); return link; } else { Label label = new Label(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationStep.java index 97be972b1..988613523 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationStep.java @@ -46,10 +46,10 @@ public class InternetArticleOrganizationStep extends SimpleEditStep { BasicItemForm setOrgaForm = new InternetArticleOrganizationForm( itemModel); add(SET_INTERNET_ARTICLE_ORGANIZATION_STEP, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.setOrganization").localize(), - new WorkflowLockedComponentAccess(setOrgaForm, itemModel), - setOrgaForm.getSaveCancelSection().getCancelButton()); + PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.setOrganization"), + new WorkflowLockedComponentAccess(setOrgaForm, itemModel), + setOrgaForm.getSaveCancelSection().getCancelButton()); InternetArticleOrganizationSheet sheet = new InternetArticleOrganizationSheet( itemModel); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java index 036e94863..d8d132c74 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertiesStep.java @@ -94,21 +94,19 @@ public class InternetArticlePropertiesStep extends PublicationPropertiesStep { BasicPageForm editBasicSheet = new InternetArticlePropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.edit_basic_sheet"). - localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet,itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent( getInternetArticlePropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.basic_properties").localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.publication.basic_properties")), basicProperties); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java index 81980f17d..008d5d949 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticlePropertyForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -67,42 +66,43 @@ public class InternetArticlePropertyForm protected void addWidgets() { super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.place").localize())); ParameterModel placeParam = new StringParameter(InternetArticle.PLACE); TextField place = new TextField(placeParam); + place.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.place")); add(place); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.number").localize())); ParameterModel numberParam = new StringParameter(InternetArticle.NUMBER); TextField number = new TextField(numberParam); + number.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.number")); add(number); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.number_of_pages").localize())); ParameterModel numberOfPagesParam = new IntegerParameter(InternetArticle.NUMBER_OF_PAGES); TextField numberOfPages = new TextField(numberOfPagesParam); + numberOfPages.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.number_of_pages")); add(numberOfPages); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.edition").localize())); ParameterModel editionParam = new StringParameter(InternetArticle.EDITION); TextField edition = new TextField(editionParam); + edition.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.edition")); add(edition); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.issn").localize())); ParameterModel issnParam = new StringParameter(InternetArticle.ISSN); TextField issn = new TextField(issnParam); + issn.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.issn")); issn.setMaxLength(9); issn.addValidationListener(new ParameterListener() { + @Override public void validate(ParameterEvent event) throws FormProcessException { ParameterData data = event.getParameterData(); @@ -132,33 +132,34 @@ public class InternetArticlePropertyForm add(issn); Calendar today = new GregorianCalendar(); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.lastAccessed"). - localize())); - ParameterModel pubDateParam = - new DateParameter(InternetArticle.LAST_ACCESSED); + //add(new Label(PublicationGlobalizationUtil.globalize( + // "publications.ui.internetarticle.lastAccessed"))); + ParameterModel pubDateParam = new DateParameter( + InternetArticle.LAST_ACCESSED); com.arsdigita.bebop.form.Date pubDate = new com.arsdigita.bebop.form.Date( pubDateParam); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); + pubDate.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.lastAccessed")); add(pubDate); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.url").localize())); ParameterModel urlModel = new StringParameter(InternetArticle.URL); TextField url = new TextField(urlModel); + url.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.url")); add(url); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.urn").localize())); ParameterModel urnModel = new StringParameter(InternetArticle.URN); TextField urn = new TextField(urnModel); + urn.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.urn")); add(urn); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.internetarticle.doi").localize())); ParameterModel doiModel = new StringParameter(InternetArticle.DOI); TextField doi = new TextField(doiModel); + doi.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.internetarticle.doi")); add(doi); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java index 6ff1561ee..6552384af 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java @@ -66,14 +66,13 @@ public class JournalArticleAddForm @Override public void addWidgets() { - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.journal.articles.select_article"). - localize())); m_itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( ArticleInJournal.class.getName())); m_itemSearch.setDefaultCreationFolder(config.getDefaultArticlesInJournalFolder()); + m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.articles.select_article")); add(m_itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesStep.java index 2fc426536..150cd6cca 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesStep.java @@ -45,9 +45,10 @@ public class JournalArticlesStep extends SimpleEditStep { BasicItemForm addArticleSheet = new JournalArticleAddForm(itemModel); add(ADD_ARTICLE_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize("publications.ui.journal.add_article").localize(), - new WorkflowLockedComponentAccess(addArticleSheet, itemModel), - addArticleSheet.getSaveCancelSection().getCancelButton()); + PublicationGlobalizationUtil.globalize( + "publications.ui.journal.add_article"), + new WorkflowLockedComponentAccess(addArticleSheet, itemModel), + addArticleSheet.getSaveCancelSection().getCancelButton()); JournalArticlesTable articlesTable = new JournalArticlesTable(itemModel); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java index 86da03b22..369f9de5c 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticlesTable.java @@ -69,23 +69,23 @@ public class JournalArticlesTable TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.journal.article").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.article")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.journal.article.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.article.remove")), TABLE_COL_DEL)); columnModel.add(new TableColumn( 2, - PublicationGlobalizationUtil.globalize( - "publications.ui.journal.article.up").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.article.up")), TABLE_COL_UP)); columnModel.add(new TableColumn( 3, - PublicationGlobalizationUtil.globalize( - "publications.ui.journal.article.down").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.article.down")), TABLE_COL_DOWN)); setModelBuilder(new JournalArticlesTableModelBuilder(itemModel)); @@ -159,9 +159,8 @@ public class JournalArticlesTable case 0: return m_article.getTitle(); case 1: - return PublicationGlobalizationUtil.globalize( - "publications.ui.journal.article.remove"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.article.remove")); default: return null; } @@ -237,6 +236,7 @@ public class JournalArticlesTable private class DeleteCellRenderer extends LockableImpl implements TableCellRenderer { + @Override public Component getComponent( Table table, PageState state, @@ -250,15 +250,14 @@ public class JournalArticlesTable Journal journal = (Journal) m_itemModel.getSelectedObject( state); - boolean canEdit = securityManager.canAccess(state.getRequest(), - com.arsdigita.cms.SecurityManager.DELETE_ITEM, - journal); + boolean canEdit = securityManager.canAccess( + state.getRequest(), + com.arsdigita.cms.SecurityManager.DELETE_ITEM, + journal); if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "cms.contenttypes.ui.journal.articles.confirm_delete"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "cms.contenttypes.ui.journal.articles.confirm_delete")); return link; } else { return new Label(value.toString()); @@ -281,13 +280,12 @@ public class JournalArticlesTable int col) { if (0 == row) { - Label label = new Label(""); + Label label = new Label(); return label; } else { ControlLink link = new ControlLink( - (String) PublicationGlobalizationUtil.globalize( - "cms.contenttypes.ui.journal.articles.up"). - localize()); + new Label(PublicationGlobalizationUtil.globalize( + "cms.contenttypes.ui.journal.articles.up"))); return link; } } @@ -315,9 +313,8 @@ public class JournalArticlesTable return label; } else { ControlLink link = new ControlLink( - (String) PublicationGlobalizationUtil.globalize( - "cms.contenttypes.ui.journal.articles.down"). - localize()); + new Label(PublicationGlobalizationUtil.globalize( + "cms.contenttypes.ui.journal.articles.down"))); return link; } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java index ca8fd65c3..e4d71bec7 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertiesStep.java @@ -85,7 +85,9 @@ public class JournalPropertiesStep extends SimpleEditStep { "publications.ui.journal.abstract"), Journal.ABSTRACT); - sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.journal.symbol"), Journal.SYMBOL); + sheet.add(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.symbol"), + Journal.SYMBOL); if (!ContentSection.getConfig().getHideLaunchDate()) { @@ -121,20 +123,18 @@ public class JournalPropertiesStep extends SimpleEditStep { BasicPageForm editBasicSheet = new JournalPropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.journal.edit_basic_sheet").localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.journal.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet,itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent(getJournalPropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.basic_properties"). - localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.publication.basic_properties")), basicProperties); } @@ -150,8 +150,7 @@ public class JournalPropertiesStep extends SimpleEditStep { protected void addStep(SimpleEditStep step, String labelKey) { segmentedPanel.addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - labelKey).localize()), + new Label(PublicationGlobalizationUtil.globalize(labelKey)), step); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java index 6eb321350..14f12e098 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalPropertyForm.java @@ -68,16 +68,16 @@ public class JournalPropertyForm protected void addWidgets() { super.addWidgets(); - add(new Label((String) PublicationGlobalizationUtil.globalize("publications.ui.journal.symbol").localize())); final ParameterModel symbolModel = new StringParameter(Journal.SYMBOL); final TextField symbol = new TextField(symbolModel); + symbol.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.symbol")); add(symbol); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.journal.issn").localize())); final ParameterModel issnParam = new StringParameter(Journal.ISSN); final TextField issn = new TextField(issnParam); issn.addValidationListener(new ParameterListener() { + @Override public void validate(final ParameterEvent event) throws FormProcessException { final ParameterData data = event.getParameterData(); String value = (String) data.getValue(); @@ -102,24 +102,26 @@ public class JournalPropertyForm } }); + issn.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.issn")); add(issn); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.journal.firstYearOfPublication").localize())); final ParameterModel firstYearParam = new IntegerParameter(Journal.FIRST_YEAR); final TextField firstYear = new TextField(firstYearParam); + firstYear.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.firstYearOfPublication")); add(firstYear); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.journal.lastYearOfPublication").localize())); final ParameterModel lastYearParam = new IntegerParameter(Journal.LAST_YEAR); final TextField lastYear = new TextField(lastYearParam); + lastYear.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.lastYearOfPublication")); add(lastYear); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.journal.abstract").localize())); final ParameterModel abstractParam = new StringParameter(Journal.ABSTRACT); final TextArea abstractArea = new TextArea(abstractParam); + abstractArea.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.journal.abstract")); abstractArea.setCols(60); abstractArea.setRows(18); add(abstractArea); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java index 853633994..95e696028 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertiesStep.java @@ -39,46 +39,47 @@ public class MonographPropertiesStep extends PublicationWithPublisherPropertiesStep { public MonographPropertiesStep(ItemSelectionModel itemModel, - AuthoringKitWizard parent) { + AuthoringKitWizard parent) { super(itemModel, parent); } public static Component getMonographPropertySheet( ItemSelectionModel itemModel) { - DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) PublicationWithPublisherPropertiesStep. - getPublicationWithPublisherPropertySheet(itemModel); + DomainObjectPropertySheet sheet = (DomainObjectPropertySheet) + PublicationWithPublisherPropertiesStep + .getPublicationWithPublisherPropertySheet(itemModel); sheet.add(PublicationGlobalizationUtil.globalize( "publications.ui.monograph.reviewed"), - Monograph.REVIEWED, new ReviewedFormatter()); + Monograph.REVIEWED, + new ReviewedFormatter()); return sheet; } @Override protected void addBasicProperties(ItemSelectionModel itemModel, - AuthoringKitWizard parent) { + AuthoringKitWizard parent) { SimpleEditStep basicProperties = new SimpleEditStep(itemModel, - parent, - EDIT_SHEET_NAME); + parent, + EDIT_SHEET_NAME); - BasicPageForm editBasicSheet = - new MonographPropertyForm(itemModel, this); + BasicPageForm editBasicSheet + = new MonographPropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.monograph.edit_basic_sheet").localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.monograph.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet,itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent( getMonographPropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.basic_properties").localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.publication.basic_properties")), basicProperties); } @@ -92,8 +93,8 @@ public class MonographPropertiesStep public String format(DomainObject obj, String attribute, PageState state) { if ((get(obj, attribute) != null) - && (get(obj, attribute) instanceof Boolean) - && ((Boolean) get(obj, attribute) == true)) { + && (get(obj, attribute) instanceof Boolean) + && ((Boolean) get(obj, attribute) == true)) { return (String) PublicationGlobalizationUtil.globalize( "publications.ui.monograph.reviewed.yes").localize(); } else { diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java index 78c5e4b51..c3e53cd2d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/MonographPropertyForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -58,12 +57,13 @@ public class MonographPropertyForm @Override protected void addWidgets() { + super.addWidgets(); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.monograph.reviewed"))); reviewed = new CheckboxGroup("reviewedGroup"); reviewed.addOption(new Option(REVIEWED, "")); + reviewed.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.monograph.reviewed")); add(reviewed); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/OrganizationPublicationsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/OrganizationPublicationsTable.java index 061bb49fe..f3b804823 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/OrganizationPublicationsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/OrganizationPublicationsTable.java @@ -57,20 +57,24 @@ public class OrganizationPublicationsTable extends Table { this.itemModel = itemModel; - setEmptyView(new Label(PublicationGlobalizationUtil.globalize("organization.ui.publications.none"))); + setEmptyView(new Label(PublicationGlobalizationUtil + .globalize("organization.ui.publications.none"))); final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize("organization.ui.publications.columns.name").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "organization.ui.publications.columns.name")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize("organization.ui.publications.columns.year").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "organization.ui.publications.columns.year")), TABLE_COL_YEAR)); columnModel.add(new TableColumn( 2, - PublicationGlobalizationUtil.globalize("organization.ui.publications.columns.type").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "organization.ui.publications.columns.type")), TABLE_COL_TYPE)); setModelBuilder(new ModelBuilder(itemModel)); @@ -86,10 +90,12 @@ public class OrganizationPublicationsTable extends Table { this.itemModel = itemModel; } + @Override public TableModel makeModel(final Table table, final PageState state) { table.getRowSelectionModel().clearSelection(state); - final GenericOrganizationalUnit orga = (GenericOrganizationalUnit) itemModel.getSelectedItem(state); + final GenericOrganizationalUnit orga = (GenericOrganizationalUnit) + itemModel.getSelectedItem(state); return new Model(table, state, orga); } @@ -98,13 +104,16 @@ public class OrganizationPublicationsTable extends Table { private class Model implements TableModel { - private Table table; - private PublicationBundleCollection publications; + private final Table table; + private final PublicationBundleCollection publications; - public Model(final Table table, final PageState state, final GenericOrganizationalUnit orga) { + public Model(final Table table, + final PageState state, + final GenericOrganizationalUnit orga) { this.table = table; - publications = new PublicationBundleCollection((DataCollection) orga.getGenericOrganizationalUnitBundle(). - get("unPublished")); + publications = new PublicationBundleCollection((DataCollection) + orga.getGenericOrganizationalUnitBundle() + .get("unPublished")); } @Override @@ -112,6 +121,7 @@ public class OrganizationPublicationsTable extends Table { return table.getColumnModel().size(); } + @Override public boolean nextRow() { boolean ret; @@ -132,7 +142,8 @@ public class OrganizationPublicationsTable extends Table { case 1: return publications.getPublication().getYearOfPublication(); case 2: - return ((DataObject) publications.getPublication().get("type")).get("label"); + return ((DataObject) publications.getPublication() + .get("type")).get("label"); default: return null; } @@ -147,6 +158,7 @@ public class OrganizationPublicationsTable extends Table { private class EditCellRenderer extends LockableImpl implements TableCellRenderer { + @Override public Component getComponent(final Table table, final PageState state, final Object value, diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsStep.java index cd50f70ae..6f0b5a39f 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsStep.java @@ -78,8 +78,9 @@ public class PersonPublicationsStep extends SimpleEditStep { if (alias == null) { target.setLabel(""); } else { - target.setLabel(PublicationGlobalizationUtil.globalize("person.ui.publications.header", - new String[]{alias.getFullName()})); + target.setLabel(PublicationGlobalizationUtil.globalize( + "person.ui.publications.header", + new String[]{alias.getFullName()})); } } }); @@ -96,8 +97,9 @@ public class PersonPublicationsStep extends SimpleEditStep { if (alias == null) { target.setLabel(""); } else { - target.setLabel(PublicationGlobalizationUtil.globalize("person.ui.publications.header.alias_of", - new String[]{person.getFullName()})); + target.setLabel(PublicationGlobalizationUtil.globalize( + "person.ui.publications.header.alias_of", + new String[]{person.getFullName()})); } } @@ -107,7 +109,8 @@ public class PersonPublicationsStep extends SimpleEditStep { aliasHeader.add(personAliasPubsHeader); aliasHeader.add(personAliasOfHeader); - final PersonPublicationsTable aliasPublicationsTable = new PersonPublicationsTable(itemModel, true); + final PersonPublicationsTable aliasPublicationsTable = new + PersonPublicationsTable(itemModel, true); panel.addSegment(aliasHeader, aliasPublicationsTable); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsTable.java index ccbf58073..009d71679 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PersonPublicationsTable.java @@ -91,15 +91,18 @@ public class PersonPublicationsTable extends Table { final TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize("person.ui.publications.columns.name").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "person.ui.publications.columns.name")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize("person.ui.publications.columns.year").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "person.ui.publications.columns.year")), TABLE_COL_YEAR)); columnModel.add(new TableColumn( 2, - PublicationGlobalizationUtil.globalize("person.ui.publications.columns.type").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "person.ui.publications.columns.type")), TABLE_COL_TYPE)); setModelBuilder(new ModelBuilder(itemModel, useAlias)); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java index 3b176ec89..558a79c90 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java @@ -60,13 +60,14 @@ public class ProceedingsOrganizerForm @Override protected void addWidgets() { - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.organizer"))); + itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType.findByAssociatedObjectType( GenericOrganizationalUnit.class.getName())); itemSearch.setDefaultCreationFolder(config.getDefaultOrganizationsFolder()); itemSearch.setEditAfterCreate(false); + itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.organizer")); add(itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerSheet.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerSheet.java index 68e52ec6c..03d60b6d5 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerSheet.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerSheet.java @@ -65,13 +65,13 @@ public class ProceedingsOrganizerSheet TableColumnModel columnModel = getColumnModel(); columnModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.organizer").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.organizer")), TABLE_COL_EDIT)); columnModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.organizer.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.organizer.remove")), TABLE_COL_DEL)); setModelBuilder(new ProceedingsOrganizerSheetModelBuilder(itemModel)); @@ -119,10 +119,12 @@ public class ProceedingsOrganizerSheet } } + @Override public int getColumnCount() { return table.getColumnModel().size(); } + @Override public boolean nextRow() { boolean ret; @@ -136,19 +138,20 @@ public class ProceedingsOrganizerSheet return ret; } + @Override public Object getElementAt(final int columnIndex) { switch (columnIndex) { case 0: return organizer.getTitle(); case 1: - return PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.organizer.remove"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.organizer.remove")); default: return null; } } + @Override public Object getKeyAt(final int columnIndex) { return organizer.getID(); } @@ -232,10 +235,8 @@ public class ProceedingsOrganizerSheet if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publications.ui.proceedings.organizer.remove.confirm"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.organizer.remove.confirm")); return link; } else { Label label = new Label(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerStep.java index 1de354d07..6e3276eb1 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerStep.java @@ -44,9 +44,10 @@ public class ProceedingsOrganizerStep extends SimpleEditStep { BasicItemForm setOrganizerForm = new ProceedingsOrganizerForm(itemModel); add(SET_PROCEEDINGS_ORGANIZER_STEP, - (String) PublicationGlobalizationUtil.globalize("publications.ui.proceedings.setOrganizer").localize(), - new WorkflowLockedComponentAccess(setOrganizerForm, itemModel), - setOrganizerForm.getSaveCancelSection().getCancelButton()); + PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.setOrganizer"), + new WorkflowLockedComponentAccess(setOrganizerForm, itemModel), + setOrganizerForm.getSaveCancelSection().getCancelButton()); ProceedingsOrganizerSheet sheet = new ProceedingsOrganizerSheet( itemModel); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java index 6e3a8bc15..8f52e743d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java @@ -63,13 +63,13 @@ public class ProceedingsPapersAddForm @Override protected void addWidgets() { - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.select_paper").localize())); m_itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType( InProceedings.class.getName())); m_itemSearch.setDefaultCreationFolder(config.getDefaultInProceedingsFolder()); + m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.select_paper")); add(m_itemSearch); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersStep.java index 47aacce7e..96596a6fc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersStep.java @@ -45,10 +45,10 @@ public class ProceedingsPapersStep extends SimpleEditStep { BasicItemForm addPaperSheet = new ProceedingsPapersAddForm(itemModel); add(ADD_PAPER_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.add_paper").localize(), - new WorkflowLockedComponentAccess(addPaperSheet, itemModel), - addPaperSheet.getSaveCancelSection().getCancelButton()); + PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.add_paper"), + new WorkflowLockedComponentAccess(addPaperSheet, itemModel), + addPaperSheet.getSaveCancelSection().getCancelButton()); ProceedingsPapersTable papersTable = new ProceedingsPapersTable( itemModel); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersTable.java index 071828cb2..f50b3472b 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersTable.java @@ -71,23 +71,23 @@ public class ProceedingsPapersTable TableColumnModel colModel = getColumnModel(); colModel.add(new TableColumn( 0, - PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.paper").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper")), TABLE_COL_EDIT)); colModel.add(new TableColumn( 1, - PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.paper.remove").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper.remove")), TABLE_COL_DEL)); colModel.add(new TableColumn( 2, - PublicationGlobalizationUtil.globalize( - "publications.ui.procedings.paper.up").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.procedings.paper.up")), TABLE_COL_UP)); colModel.add(new TableColumn( 3, - PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.paper.down").localize(), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper.down")), TABLE_COL_DOWN)); setModelBuilder( @@ -115,8 +115,8 @@ public class ProceedingsPapersTable @Override public TableModel makeModel(Table table, PageState state) { table.getRowSelectionModel().clearSelection(state); - Proceedings proceedings = - (Proceedings) m_itemModel.getSelectedObject(state); + Proceedings proceedings = (Proceedings) m_itemModel + .getSelectedObject(state); return new ProceedingsPapersTableModel(table, state, proceedings); @@ -161,17 +161,14 @@ public class ProceedingsPapersTable case 0: return m_paper.getTitle(); case 1: - return PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.paper.remove"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper.remove")); case 2: - return PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.paper.up"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper.up")); case 3: - return PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.paper.down"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper.down")); default: return null; } @@ -273,10 +270,8 @@ public class ProceedingsPapersTable if (canEdit) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publications.ui.proceedings.paper.confirm_remove"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.paper.confirm_remove")); return link; } else { Label label = new Label(value.toString()); @@ -299,7 +294,7 @@ public class ProceedingsPapersTable int col) { if (0 == row) { s_log.debug("Row is first row in table, don't show up link"); - Label label = new Label(""); + Label label = new Label(); return label; } else { ControlLink link = new ControlLink(value.toString()); @@ -331,7 +326,7 @@ public class ProceedingsPapersTable if ((papers.size() - 1) == row) { s_log.debug("Row is last row in table, don't show down link"); - Label label = new Label(""); + Label label = new Label(); return label; } else { ControlLink link = new ControlLink(value.toString()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertiesStep.java index 742650038..523fdd414 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertiesStep.java @@ -110,20 +110,19 @@ public class ProceedingsPropertiesStep BasicPageForm editBasicSheet = new ProceedingsPropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.edit_basic_sheet").localize(), - new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet.getSaveCancelSection(). - getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet,itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent( getProceedingsPropertySheet(itemModel)); getSegmentedPanel().addSegment( - new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.basic_properties").localize()), + new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.basic_properties")), basicProperties); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertyForm.java index 624b7e007..447b40dff 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPropertyForm.java @@ -20,7 +20,6 @@ package com.arsdigita.cms.contenttypes.ui; import com.arsdigita.bebop.FormData; import com.arsdigita.bebop.FormProcessException; -import com.arsdigita.bebop.Label; import com.arsdigita.bebop.event.FormInitListener; import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.bebop.event.FormSectionEvent; @@ -35,7 +34,6 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Proceedings; import com.arsdigita.cms.contenttypes.ProceedingsConfig; -import com.arsdigita.cms.contenttypes.Publication; import java.util.Calendar; import java.util.GregorianCalendar; @@ -66,21 +64,20 @@ public class ProceedingsPropertyForm @Override protected void addWidgets() { + super.addWidgets(); final ProceedingsConfig proceedingsConfig = Proceedings.getProceedingsConfig(); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.name_of_conference"))); final ParameterModel nameOfConfParam = new StringParameter( Proceedings.NAME_OF_CONFERENCE); final TextField nameOfConf = new TextField(nameOfConfParam); nameOfConf.addValidationListener(new NotNullValidationListener()); nameOfConf.addValidationListener(new NotEmptyValidationListener()); + nameOfConf.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.name_of_conference")); add(nameOfConf); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.place_of_conference"))); final ParameterModel placeOfConfParam = new StringParameter( Proceedings.PLACE_OF_CONFERENCE); final TextField placeOfConf = new TextField(placeOfConfParam); @@ -88,11 +85,11 @@ public class ProceedingsPropertyForm placeOfConf.addValidationListener(new NotNullValidationListener()); placeOfConf.addValidationListener(new NotEmptyValidationListener()); } + placeOfConf.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.place_of_conference")); add(placeOfConf); final Calendar today = new GregorianCalendar(); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.date_from_of_conference"))); final ParameterModel dateFromParam = new DateParameter( Proceedings.DATE_FROM_OF_CONFERENCE); final Date dateFrom = new Date(dateFromParam); @@ -101,10 +98,10 @@ public class ProceedingsPropertyForm dateFrom.addValidationListener(new NotNullValidationListener()); dateFrom.addValidationListener(new NotEmptyValidationListener()); } + dateFrom.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.date_from_of_conference")); add(dateFrom); - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.proceedings.date_to_of_conference"))); final ParameterModel dateToParam = new DateParameter( Proceedings.DATE_TO_OF_CONFERENCE); final Date dateTo = new Date(dateToParam); @@ -113,6 +110,8 @@ public class ProceedingsPropertyForm dateTo.addValidationListener(new NotNullValidationListener()); dateTo.addValidationListener(new NotEmptyValidationListener()); } + dateTo.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.proceedings.date_to_of_conference")); add(dateTo); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java index 601422a6c..3ee0f4b3d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java @@ -75,22 +75,23 @@ public class PublicationAuthorAddForm @Override protected void addWidgets() { - add(new Label(PublicationGlobalizationUtil.globalize( - "publications.ui.authors.selectAuthor"))); + m_itemSearch = new ItemSearchWidget( ITEM_SEARCH, ContentType.findByAssociatedObjectType(GenericPerson.class.getName())); m_itemSearch.setDefaultCreationFolder(config.getDefaultAuthorsFolder()); m_itemSearch.setEditAfterCreate(false); + m_itemSearch.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.selectAuthor")); add(m_itemSearch); - selectedAuthorLabel = new Label(""); + selectedAuthorLabel = new Label(); add(selectedAuthorLabel); - add(new Label((String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.author.is_editor").localize())); isEditor = new CheckboxGroup("isEditorGroup"); isEditor.addOption(new Option(ISEDITOR, "")); + isEditor.setLabel(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.author.is_editor")); add(isEditor); } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java index 0a8544b81..187359253 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsPropertyStep.java @@ -50,8 +50,8 @@ public class PublicationAuthorsPropertyStep extends SimpleEditStep { BasicItemForm addAuthorSheet = new PublicationAuthorAddForm(itemModel, this); add(ADD_AUTHOR_SHEET_NAME, - (String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.add_author").localize(), + PublicationGlobalizationUtil.globalize( + "publications.ui.authors.add_author"), new WorkflowLockedComponentAccess(addAuthorSheet, itemModel), addAuthorSheet.getSaveCancelSection().getCancelButton()); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java index 7ed268b41..b56292e35 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorsTable.java @@ -183,21 +183,18 @@ public class PublicationAuthorsTable return m_author.getFullName(); case 1: if (m_authorshipCollection.isEditor()) { - return (String) PublicationGlobalizationUtil.globalize( - "publications.ui.authors.author.is_editor_true"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.author.is_editor_true")); } else { - return PublicationGlobalizationUtil.globalize( - "publications.ui.authors.author.is_not_editor"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.author.is_not_editor")); } case 2: - return PublicationGlobalizationUtil.globalize( - "publications.ui.authors.edit_assoc").localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.edit_assoc")); case 3: - return PublicationGlobalizationUtil.globalize( - "publications.ui.authors.author.remove"). - localize(); + return new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.author.remove")); default: return null; } @@ -332,10 +329,8 @@ public class PublicationAuthorsTable if (canDelete) { ControlLink link = new ControlLink(value.toString()); - link.setConfirmation((String) PublicationGlobalizationUtil. - globalize( - "publications.ui.authors.author.confirm_remove"). - localize()); + link.setConfirmation(PublicationGlobalizationUtil.globalize( + "publications.ui.authors.author.confirm_remove")); return link; } else { Label label = new Label(value.toString()); @@ -392,7 +387,7 @@ public class PublicationAuthorsTable if ((authors.size() - 1) == row) { s_log.debug("Row is last row in table, don't show down link"); - Label label = new Label(""); + Label label = new Label(); return label; } else { ControlLink link = new ControlLink("down"); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java index 65475b810..abbbefad1 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java @@ -131,12 +131,12 @@ public class PublicationPropertiesStep extends SimpleEditStep { BasicPageForm editBasicSheet = new PublicationPropertyForm(itemModel, this); - basicProperties.add(EDIT_SHEET_NAME, (String) PublicationGlobalizationUtil. - globalize("publications.ui.publication.edit_basic_sheet"). - localize(), new WorkflowLockedComponentAccess(editBasicSheet, - itemModel), - editBasicSheet. - getSaveCancelSection().getCancelButton()); + basicProperties.add( + EDIT_SHEET_NAME, + PublicationGlobalizationUtil. + globalize("publications.ui.publication.edit_basic_sheet"), + new WorkflowLockedComponentAccess(editBasicSheet,itemModel), + editBasicSheet.getSaveCancelSection().getCancelButton()); basicProperties.setDisplayComponent(getPublicationPropertySheet( itemModel)); @@ -156,6 +156,12 @@ public class PublicationPropertiesStep extends SimpleEditStep { } } + /** + * + * @param step + * @param labelKey + * @deprecated use addStep(step, GlobalizedMessage) instead + */ protected void addStep(SimpleEditStep step, String labelKey) { addStep(step, PublicationGlobalizationUtil.globalize(labelKey)); // segmentedPanel.addSegment(