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 a04a1383b..0404eec08 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 @@ -88,7 +88,8 @@ public class ArticleInCollectedVolumePropertyForm add(chapter); reviewed = new CheckboxGroup("reviewedGroup"); - reviewed.addOption(new Option(REVIEWED, "")); + reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleInCollectedVolume.reviewed")))); reviewed.setLabel(PublicationGlobalizationUtil.globalize( "publications.ui.articleInCollectedVolume.reviewed")); add(reviewed); 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 7ec582595..72fc08b02 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 @@ -45,10 +45,10 @@ import java.util.GregorianCalendar; * @author Jens Pelzetter */ public class ArticleInJournalPropertyForm - extends PublicationPropertyForm - implements FormInitListener, - FormProcessListener, - FormSubmissionListener { + extends PublicationPropertyForm + implements FormInitListener, + FormProcessListener, + FormSubmissionListener { private static final String REVIEWED = "reviewed"; private ArticleInJournalPropertiesStep m_step; @@ -71,58 +71,54 @@ public class ArticleInJournalPropertyForm super.addWidgets(); - ParameterModel volumeParam = - new IntegerParameter(ArticleInJournal.VOLUME); + 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")); + "publications.ui.articleinjournal.volume")); add(volume); ParameterModel issueParam = new StringParameter(ArticleInJournal.ISSUE); TextField issue = new TextField(issueParam); issue.setLabel(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.issue")); + "publications.ui.articleinjournal.issue")); add(issue); - ParameterModel pagesFromParam = - new IntegerParameter(ArticleInJournal.PAGES_FROM); + ParameterModel pagesFromParam = new IntegerParameter(ArticleInJournal.PAGES_FROM); TextField pagesFrom = new TextField(pagesFromParam); pagesFrom.setLabel(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.pages_from")); + "publications.ui.articleinjournal.pages_from")); add(pagesFrom); - ParameterModel pagesToParam = - new IntegerParameter(ArticleInJournal.PAGES_TO); + ParameterModel pagesToParam = new IntegerParameter(ArticleInJournal.PAGES_TO); TextField pagesTo = new TextField(pagesToParam); pagesTo.setLabel(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.pages_to")); + "publications.ui.articleinjournal.pages_to")); add(pagesTo); Calendar today = new GregorianCalendar(); - ParameterModel pubDateParam = - new DateParameter(ArticleInJournal.PUBLICATION_DATE); - com.arsdigita.bebop.form.Date pubDate = - new com.arsdigita.bebop.form.Date( - pubDateParam); + ParameterModel pubDateParam = new DateParameter(ArticleInJournal.PUBLICATION_DATE); + com.arsdigita.bebop.form.Date pubDate = new com.arsdigita.bebop.form.Date( + pubDateParam); pubDate.setYearAsc(false); pubDate.setYearRange(1900, today.get(Calendar.YEAR) + 2); pubDate.setLabel(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.publicationDate")); + "publications.ui.articleinjournal.publicationDate")); add(pubDate); reviewed = new CheckboxGroup("reviewedGroup"); - reviewed.addOption(new Option(REVIEWED, "")); + reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.articleinjournal.reviewed")))); reviewed.setLabel(PublicationGlobalizationUtil.globalize( - "publications.ui.articleinjournal.reviewed")); + "publications.ui.articleinjournal.reviewed")); add(reviewed); } - + protected final CheckboxGroup getReviewed() { return reviewed; } - + @Override public void init(FormSectionEvent fse) throws FormProcessException { super.init(fse); @@ -152,15 +148,15 @@ public class ArticleInJournalPropertyForm ArticleInJournal article = (ArticleInJournal) processBasicWidgets(fse); if ((article != null) && getSaveCancelSection().getSaveButton(). - isSelected(fse.getPageState())) { + isSelected(fse.getPageState())) { article.setVolume((Integer) data.get(ArticleInJournal.VOLUME)); article.setIssue((String) data.get(ArticleInJournal.ISSUE)); article.setPagesFrom( - (Integer) data.get(ArticleInJournal.PAGES_FROM)); + (Integer) data.get(ArticleInJournal.PAGES_FROM)); article.setPagesTo( - (Integer) data.get(ArticleInJournal.PAGES_TO)); + (Integer) data.get(ArticleInJournal.PAGES_TO)); article.setPublicationDate( - (Date) data.get(ArticleInJournal.PUBLICATION_DATE)); + (Date) data.get(ArticleInJournal.PUBLICATION_DATE)); if (reviewed.getValue(fse.getPageState()) == null) { article.setReviewed(false); 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 48f799c5c..ea44801ba 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 @@ -65,7 +65,8 @@ public class CollectedVolumePropertyForm super.addWidgets(); reviewed = new CheckboxGroup("reviewedGroup"); - reviewed.addOption(new Option(REVIEWED, "")); + reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.collectedVolume.reviewed")))); reviewed.setLabel(PublicationGlobalizationUtil.globalize( "publications.ui.collectedVolume.reviewed")); add(reviewed); 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 c3e53cd2d..d11f7d924 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,6 +20,7 @@ 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; @@ -61,7 +62,8 @@ public class MonographPropertyForm super.addWidgets(); reviewed = new CheckboxGroup("reviewedGroup"); - reviewed.addOption(new Option(REVIEWED, "")); + reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.monograph.reviewed")))); reviewed.setLabel(PublicationGlobalizationUtil.globalize( "publications.ui.monograph.reviewed")); add(reviewed); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java index 4716e8b09..096387444 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ReviewPropertyForm.java @@ -18,24 +18,13 @@ */ 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.bebop.event.FormSubmissionListener; -import com.arsdigita.bebop.form.TextField; -import com.arsdigita.bebop.parameters.DateParameter; -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.Review; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; /** * diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java index 6fbe6127a..133c92669 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/WorkingPaperPropertyForm.java @@ -63,7 +63,8 @@ public class WorkingPaperPropertyForm super.addWidgets(); reviewed = new CheckboxGroup("reviewedGroup"); - reviewed.addOption(new Option(REVIEWED, "")); + reviewed.addOption(new Option(REVIEWED, new Label(PublicationGlobalizationUtil.globalize( + "publications.ui.workingpaper.reviewed")))); reviewed.setLabel(PublicationGlobalizationUtil.globalize( "publications.ui.workingpaper.reviewed")); add(reviewed);