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 c03d7bb56..9d880e56b 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 @@ -31,6 +31,8 @@ import com.arsdigita.bebop.form.Option; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.DateParameter; import com.arsdigita.bebop.parameters.IntegerParameter; +import com.arsdigita.bebop.parameters.NotEmptyValidationListener; +import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; @@ -74,6 +76,8 @@ public class ArticleInJournalPropertyForm ParameterModel volumeParam = new IntegerParameter(ArticleInJournal.VOLUME); TextField volume = new TextField(volumeParam); + volume.addValidationListener(new NotNullValidationListener()); + volume.addValidationListener(new NotEmptyValidationListener()); add(volume); add(new Label((String) PublicationGlobalizationUtil.globalize( 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 80e1df2c5..c3ba1e53a 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 @@ -29,13 +29,12 @@ import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.form.Date; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.DateParameter; +import com.arsdigita.bebop.parameters.NotEmptyValidationListener; +import com.arsdigita.bebop.parameters.NotNullValidationListener; 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.GenericOrganizationalUnit; import com.arsdigita.cms.contenttypes.Proceedings; -import com.arsdigita.cms.ui.ItemSearchWidget; import java.util.Calendar; import java.util.GregorianCalendar; @@ -49,7 +48,7 @@ public class ProceedingsPropertyForm FormInitListener, FormSubmissionListener { - private ProceedingsPropertiesStep m_step; + private ProceedingsPropertiesStep m_step; public static final String ID = "proceedingsEdit"; public ProceedingsPropertyForm(ItemSelectionModel itemModel) { @@ -66,12 +65,14 @@ public class ProceedingsPropertyForm @Override protected void addWidgets() { super.addWidgets(); - + add(new Label(PublicationGlobalizationUtil.globalize( "publications.ui.proceedings.name_of_conference"))); ParameterModel nameOfConfParam = new StringParameter( Proceedings.NAME_OF_CONFERENCE); TextField nameOfConf = new TextField(nameOfConfParam); + nameOfConf.addValidationListener(new NotNullValidationListener()); + nameOfConf.addValidationListener(new NotEmptyValidationListener()); add(nameOfConf); add(new Label(PublicationGlobalizationUtil.globalize( @@ -79,6 +80,8 @@ public class ProceedingsPropertyForm ParameterModel placeOfConfParam = new StringParameter( Proceedings.PLACE_OF_CONFERENCE); TextField placeOfConf = new TextField(placeOfConfParam); + placeOfConf.addValidationListener(new NotNullValidationListener()); + placeOfConf.addValidationListener(new NotEmptyValidationListener()); add(placeOfConf); Calendar today = new GregorianCalendar(); @@ -88,6 +91,8 @@ public class ProceedingsPropertyForm Proceedings.DATE_FROM_OF_CONFERENCE); Date dateFrom = new Date(dateFromParam); dateFrom.setYearRange(1900, today.get(Calendar.YEAR) + 3); + dateFrom.addValidationListener(new NotNullValidationListener()); + dateFrom.addValidationListener(new NotEmptyValidationListener()); add(dateFrom); add(new Label(PublicationGlobalizationUtil.globalize( @@ -96,6 +101,8 @@ public class ProceedingsPropertyForm Proceedings.DATE_TO_OF_CONFERENCE); Date dateTo = new Date(dateToParam); dateTo.setYearRange(1900, today.get(Calendar.YEAR) + 3); + dateTo.addValidationListener(new NotNullValidationListener()); + dateTo.addValidationListener(new NotEmptyValidationListener()); add(dateTo); } @@ -106,7 +113,7 @@ public class ProceedingsPropertyForm FormData data = fse.getFormData(); Proceedings proceedings = (Proceedings) super.initBasicWidgets(fse); - + data.put(Proceedings.NAME_OF_CONFERENCE, proceedings.getNameOfConference()); data.put(Proceedings.PLACE_OF_CONFERENCE, @@ -126,7 +133,7 @@ public class ProceedingsPropertyForm if ((proceedings != null) && getSaveCancelSection().getSaveButton(). - isSelected(fse.getPageState())) { + isSelected(fse.getPageState())) { proceedings.setNameOfConference((String) data.get( Proceedings.NAME_OF_CONFERENCE)); proceedings.setPlaceOfConference((String) data.get( diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java index 1a773782f..6c643a774 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertyForm.java @@ -29,6 +29,8 @@ import com.arsdigita.bebop.event.FormSubmissionListener; import com.arsdigita.bebop.form.TextArea; import com.arsdigita.bebop.form.TextField; import com.arsdigita.bebop.parameters.IntegerParameter; +import com.arsdigita.bebop.parameters.NotEmptyValidationListener; +import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; @@ -78,6 +80,8 @@ public class PublicationPropertyForm Publication.YEAR_OF_PUBLICATION); TextField yearOfPublication = new TextField(yearOfPublicationParam); yearOfPublication.setMaxLength(4); + yearOfPublication.addValidationListener(new NotNullValidationListener()); + yearOfPublication.addValidationListener(new NotEmptyValidationListener()); add(yearOfPublication); add(new Label((String) PublicationGlobalizationUtil.globalize( diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties index 7679c36e4..8352814b0 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties @@ -109,13 +109,13 @@ publications.ui.internetarticle.publicationdate=Ver\u00f6ffentlichungsdatum #================ publications.ui.articleinjournal.edit_basic_sheet=Basiseigenschaften bearbeiten publications.ui.articleinjournal.issn=ISSN -publications.ui.articleinjournal.issue=Jahrgang +publications.ui.articleinjournal.issue=Ausgabe publications.ui.articleinjournal.journal=Zeitschrift publications.ui.articleinjournal.url=URL publications.ui.articleinjournal.pages_from=Erste Seite publications.ui.articleinjournal.pages_to=Letzte Seite publications.ui.articleinjournal.publicationDate=Erscheinungsdatum -publications.ui.articleinjournal.volume=Band +publications.ui.articleinjournal.volume=Jahrgang #UnPublished #===========