diff --git a/ccm-cms-assets-notes/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/Notes.xml b/ccm-cms-assets-notes/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/Notes.xml index 715b8d99f..602d0211e 100755 --- a/ccm-cms-assets-notes/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/Notes.xml +++ b/ccm-cms-assets-notes/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contentassets/Notes.xml @@ -14,28 +14,28 @@ ---> - - - - - - + --> + + + + + + - - - - - - + + + + + + - - + + 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 a0fd2b27f..1782776c9 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 @@ -36,6 +36,7 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.ui.authoring.BasicPageForm; +import com.arsdigita.globalization.GlobalizedMessage; import java.util.Arrays; import java.util.Comparator; import java.util.Locale; @@ -160,9 +161,8 @@ public class PublicationPropertyForm } @Override - protected String getTitleLabel() { - return (String) PublicationGlobalizationUtil.globalize( - "publications.ui.publication.title").localize(); + protected GlobalizedMessage getTitleLabel() { + return PublicationGlobalizationUtil.globalize("publications.ui.publication.title"); } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java index 8927864c3..f1e967647 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesPropertyForm.java @@ -32,6 +32,7 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.Series; import com.arsdigita.cms.ui.authoring.BasicPageForm; +import com.arsdigita.globalization.GlobalizedMessage; import org.apache.log4j.Logger; /** @@ -103,8 +104,7 @@ public class SeriesPropertyForm } @Override - protected String getTitleLabel() { - return (String) PublicationGlobalizationUtil.globalize( - "publications.ui.series.title").localize(); + protected GlobalizedMessage getTitleLabel() { + return PublicationGlobalizationUtil.globalize("publications.ui.series.title"); } } diff --git a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java index 7d0adfb6a..93af924ba 100644 --- a/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java +++ b/ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java @@ -15,6 +15,7 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.SciDepartment; import com.arsdigita.cms.contenttypes.SciDepartmentConfig; +import com.arsdigita.globalization.GlobalizedMessage; /** * @@ -90,8 +91,7 @@ public class SciDepartmentPropertyForm } @Override - public String getTitleLabel() { - return (String) SciDepartmentGlobalizationUtil.globalize( - "scidepartment.ui.title").localize(); + public GlobalizedMessage getTitleLabel() { + return SciDepartmentGlobalizationUtil.globalize("scidepartment.ui.title"); } } diff --git a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePropertyForm.java b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePropertyForm.java index 080d2d36c..e7781be25 100644 --- a/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePropertyForm.java +++ b/ccm-sci-types-institute/src/com/arsdigita/cms/contenttypes/ui/SciInstitutePropertyForm.java @@ -15,6 +15,7 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.SciInstitute; import com.arsdigita.cms.contenttypes.SciInstituteConfig; +import com.arsdigita.globalization.GlobalizedMessage; /** * @@ -90,8 +91,7 @@ public class SciInstitutePropertyForm } @Override - public String getTitleLabel() { - return (String) SciInstituteGlobalizationUtil.globalize( - "sciinstitute.ui.title").localize(); + public GlobalizedMessage getTitleLabel() { + return SciInstituteGlobalizationUtil.globalize("sciinstitute.ui.title"); } } diff --git a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java index 08df3895a..aa4c62259 100644 --- a/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java +++ b/ccm-sci-types-project/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java @@ -19,6 +19,7 @@ import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.contenttypes.SciProject; import com.arsdigita.cms.contenttypes.SciProjectConfig; +import com.arsdigita.globalization.GlobalizedMessage; import java.util.Calendar; import java.util.GregorianCalendar; @@ -63,11 +64,11 @@ public class SciProjectPropertyForm add(new Label(SciProjectGlobalizationUtil.globalize( "sciproject.ui.begin"))); final IncompleteDateParameter beginParam = - new IncompleteDateParameter(SciProject.BEGIN); + new IncompleteDateParameter(SciProject.BEGIN); beginParam.allowSkipMonth(true); - beginParam.allowSkipDay(true); + beginParam.allowSkipDay(true); final Calendar today = new GregorianCalendar(); - final Date begin = new Date(beginParam); + final Date begin = new Date(beginParam); begin.setAutoCurrentYear(false); begin.setYearRange(1970, (today.get(Calendar.YEAR) + 2)); add(begin); @@ -138,13 +139,13 @@ public class SciProjectPropertyForm project.setBeginSkipDay( ((IncompleteDateParameter) data.getParameter( SciProject.BEGIN).getModel()).isDaySkipped()); - project.setBegin((java.util.Date) data.get(SciProject.BEGIN)); + project.setBegin((java.util.Date) data.get(SciProject.BEGIN)); project.setEndSkipMonth( ((IncompleteDateParameter) data.getParameter( SciProject.END).getModel()).isMonthSkipped()); project.setEndSkipDay(((IncompleteDateParameter) data.getParameter( SciProject.END).getModel()).isDaySkipped()); - project.setEnd((java.util.Date) data.get(SciProject.END)); + project.setEnd((java.util.Date) data.get(SciProject.END)); project.setProjectShortDescription((String) data.get( SciProject.PROJECT_SHORT_DESCRIPTION)); @@ -155,8 +156,8 @@ public class SciProjectPropertyForm } @Override - public String getTitleLabel() { - return (String) SciProjectGlobalizationUtil.globalize( - "sciproject.ui.title").localize(); + public GlobalizedMessage getTitleLabel() { + return SciProjectGlobalizationUtil.globalize("sciproject.ui.title"); } + }