diff --git a/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/ui/GenericOrgaUnitTextAssetEdit.java b/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/ui/GenericOrgaUnitTextAssetEdit.java index 777f34d35..80e581a5a 100644 --- a/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/ui/GenericOrgaUnitTextAssetEdit.java +++ b/ccm-cms-assets-orgaunittext/src/com/arsdigita/cms/contentassets/ui/GenericOrgaUnitTextAssetEdit.java @@ -33,8 +33,8 @@ import com.arsdigita.bebop.parameters.NotEmptyValidationListener; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ItemSelectionModel; -import com.arsdigita.cms.RelationAttribute; import com.arsdigita.cms.RelationAttributeCollection; +import com.arsdigita.cms.RelationAttributeResourceBundleControl; import com.arsdigita.cms.contentassets.GenericOrgaUnitTextAsset; import com.arsdigita.cms.contentassets.GenericOrgaUnitTextAssetGlobalizationUtil; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; @@ -42,7 +42,7 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.util.UncheckedWrapperException; import java.util.TooManyListenersException; -import com.arsdigita.globalization.GlobalizationHelper; +import com.arsdigita.globalization.GlobalizedMessage; /** * @@ -80,9 +80,15 @@ public class GenericOrgaUnitTextAssetEdit extends BasicItemForm implements FormS final RelationAttributeCollection names = new RelationAttributeCollection( "GenericOrgaUnitTextAssetName"); - names.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); + //names.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); while (names.next()) { - target.addOption(new Option(names.getKey(), names.getName())); + //target.addOption(new Option(names.getKey(), names.getName())); + target.addOption(new Option( + names.getKey(), + new Label(new GlobalizedMessage( + names.getKey(), + "GenericOrgaUnitTextAssetName", + new RelationAttributeResourceBundleControl())))); } } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java index 1a11d5133..95a2a7fb8 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java @@ -30,6 +30,7 @@ import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.RelationAttributeResourceBundleControl; import com.arsdigita.cms.contenttypes.GenericContact; import com.arsdigita.cms.contenttypes.GenericContactEntry; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; @@ -37,10 +38,9 @@ import com.arsdigita.cms.contenttypes.GenericContactEntryKeys; import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.ui.authoring.BasicItemForm; -import com.arsdigita.globalization.GlobalizationHelper; +import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.util.UncheckedWrapperException; import java.util.TooManyListenersException; -import java.util.logging.Level; import org.apache.log4j.Logger; @@ -55,7 +55,7 @@ public class GenericContactEntryAddForm extends BasicItemForm { /** * Creates a new instance of CategoryLocalizationAddForm. - * + * * @param itemModel */ public GenericContactEntryAddForm(ItemSelectionModel itemModel) { @@ -72,7 +72,7 @@ public class GenericContactEntryAddForm extends BasicItemForm { ParameterModel contactEntryKeyParam = new StringParameter(GenericContactEntry.KEY); SingleSelect contactEntryKey = new SingleSelect(contactEntryKeyParam); contactEntryKey.setLabel(ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericcontact.contactEntry.key")); + "cms.contenttypes.ui.genericcontact.contactEntry.key")); contactEntryKey.addValidationListener(new NotNullValidationListener()); contactEntryKey.addOption(new Option("", new Label(GlobalizationUtil.globalize( "cms.ui.select_one")))); @@ -84,11 +84,17 @@ public class GenericContactEntryAddForm extends BasicItemForm { final SingleSelect target = (SingleSelect) event.getTarget(); final GenericContactEntryKeys keyList = new GenericContactEntryKeys(); - keyList.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale() - .getLanguage()); +// keyList.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale() +// .getLanguage()); while (keyList.next()) { String currentKey = keyList.getKey(); - target.addOption(new Option(currentKey, keyList.getName())); + //target.addOption(new Option(currentKey, keyList.getName())); + target.addOption(new Option( + currentKey, + new Label(new GlobalizedMessage( + currentKey, + GenericContactEntryKeys.ATTRIBUTE_NAME, + new RelationAttributeResourceBundleControl())))); } } @@ -104,16 +110,16 @@ public class GenericContactEntryAddForm extends BasicItemForm { ParameterModel contactEntryValueParam = new StringParameter(GenericContactEntry.VALUE); TextField contactEntryValue = new TextField(contactEntryValueParam); contactEntryValue.setLabel(ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericcontact.contactEntry.value")); + "cms.contenttypes.ui.genericcontact.contactEntry.value")); contactEntryValue.addValidationListener(new NotNullValidationListener()); add(contactEntryValue); // Description field, only for internal usage ParameterModel contactEntryDescriptionParam = new StringParameter( - GenericContactEntry.DESCRIPTION); + GenericContactEntry.DESCRIPTION); TextField contactEntryDescription = new TextField(contactEntryDescriptionParam); contactEntryDescription.setLabel(ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericcontact.contactEntry.description")); + "cms.contenttypes.ui.genericcontact.contactEntry.description")); add(contactEntryDescription); } @@ -139,14 +145,14 @@ public class GenericContactEntryAddForm extends BasicItemForm { // save only if save button was pressed if (contact != null - && getSaveCancelSection().getSaveButton() - .isSelected(fse.getPageState())) { + && getSaveCancelSection().getSaveButton() + .isSelected(fse.getPageState())) { GenericContactEntry contactEntry = new GenericContactEntry( - contact, - (String) data.get(GenericContactEntry.KEY), - (String) data.get(GenericContactEntry.VALUE), - (String) data.get(GenericContactEntry.DESCRIPTION)); + contact, + (String) data.get(GenericContactEntry.KEY), + (String) data.get(GenericContactEntry.VALUE), + (String) data.get(GenericContactEntry.DESCRIPTION)); contact.addContactEntry(contactEntry); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java index 22a1feb85..9b57b1512 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java @@ -113,17 +113,18 @@ public class GenericOrganizationalUnitPersonAddForm final RelationAttributeCollection roles = new RelationAttributeCollection( getRoleAttributeName()); - roles.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). - getLanguage()); +// roles.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). +// getLanguage()); while (roles.next()) { RelationAttribute role; role = roles.getRelationAttribute(); //target.addOption(new Option(role.getKey(), role.getName())); - target.addOption(new Option(role.getKey(), - new Label(new GlobalizedMessage( - role.getKey(), - getRoleAttributeName(), - new RelationAttributeResourceBundleControl())))); + target.addOption(new Option( + role.getKey(), + new Label(new GlobalizedMessage( + role.getKey(), + getRoleAttributeName(), + new RelationAttributeResourceBundleControl())))); } } @@ -150,16 +151,18 @@ public class GenericOrganizationalUnitPersonAddForm final SingleSelect target = (SingleSelect) event.getTarget(); RelationAttributeCollection statusColl = new RelationAttributeCollection( getStatusAttributeName()); - statusColl.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). - getLanguage()); +// statusColl.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). +// getLanguage()); while (statusColl.next()) { RelationAttribute status; status = statusColl.getRelationAttribute(); //target.addOption(new Option(status.getKey(), status.getName())); - target.addOption(new Option(status.getKey(), - new Label(new GlobalizedMessage(status.getKey(), - getStatusAttributeName(), - new RelationAttributeResourceBundleControl())))); + target.addOption(new Option( + status.getKey(), + new Label(new GlobalizedMessage( + status.getKey(), + getStatusAttributeName(), + new RelationAttributeResourceBundleControl())))); } } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java index f569ed8a2..c74f1ba29 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java @@ -36,6 +36,7 @@ import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.ContentType; import com.arsdigita.cms.RelationAttribute; +import com.arsdigita.cms.RelationAttributeResourceBundleControl; import com.arsdigita.cms.contenttypes.GenericContact; import com.arsdigita.cms.contenttypes.GenericContactTypeCollection; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; @@ -43,7 +44,7 @@ import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.util.GlobalizationUtil; -import com.arsdigita.globalization.GlobalizationHelper; +import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.Kernel; import com.arsdigita.util.UncheckedWrapperException; @@ -61,7 +62,7 @@ import org.apache.log4j.Logger; public class GenericPersonContactAddForm extends BasicItemForm { private static final Logger s_log = Logger.getLogger( - GenericPersonContactAddForm.class); + GenericPersonContactAddForm.class); private GenericPersonPropertiesStep m_step; private ItemSearchWidget m_itemSearch; private SaveCancelSection m_saveCancelSection; @@ -86,22 +87,22 @@ public class GenericPersonContactAddForm extends BasicItemForm { // Attach a GenericContact object add(new Label(ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericperson.select_contact"))); + "cms.contenttypes.ui.genericperson.select_contact"))); this.m_itemSearch = new ItemSearchWidget(ITEM_SEARCH, ContentType. findByAssociatedObjectType( - "com.arsdigita.cms.contenttypes.GenericContact")); + "com.arsdigita.cms.contenttypes.GenericContact")); add(this.m_itemSearch); // GenericContact type field ParameterModel contactTypeParam = new StringParameter( - GenericPersonContactCollection.CONTACTS_KEY); + GenericPersonContactCollection.CONTACTS_KEY); SingleSelect contactType = new SingleSelect(contactTypeParam); contactType.setLabel(ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericperson.contact.type")); + "cms.contenttypes.ui.genericperson.contact.type")); contactType.addValidationListener(new NotNullValidationListener()); contactType.addOption(new Option("", new Label(GlobalizationUtil. - globalize("cms.ui.select_one")))); + globalize("cms.ui.select_one")))); try { contactType.addPrintListener(new PrintListener() { @@ -111,12 +112,18 @@ public class GenericPersonContactAddForm extends BasicItemForm { // Add the Options to the SingleSelect widget final GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); - contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). - getLanguage()); +// contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). +// getLanguage()); while (contacttypes.next()) { RelationAttribute ct = contacttypes.getRelationAttribute(); - target.addOption(new Option(ct.getKey(), ct.getName())); + //target.addOption(new Option(ct.getKey(), ct.getName())); + target.addOption(new Option( + ct.getKey(), + new Label(new GlobalizedMessage( + ct.getKey(), + GenericContactTypeCollection.ATTRIBUTE_NAME, + new RelationAttributeResourceBundleControl())))); } } @@ -143,17 +150,17 @@ public class GenericPersonContactAddForm extends BasicItemForm { final FormData data = fse.getFormData(); final PageState state = fse.getPageState(); GenericPerson person = (GenericPerson) getItemSelectionModel(). - getSelectedObject(state); + getSelectedObject(state); if (!this.getSaveCancelSection().getCancelButton().isSelected(state)) { GenericContact contact = (GenericContact) data.get(ITEM_SEARCH); contact = (GenericContact) contact.getContentBundle().getInstance( - person.getLanguage()); + person.getLanguage()); person.addContact(contact, (String) data.get( - GenericPersonContactCollection.CONTACTS_KEY)); + GenericPersonContactCollection.CONTACTS_KEY)); m_itemSearch.publishCreatedItem(data, contact); } @@ -167,14 +174,14 @@ public class GenericPersonContactAddForm extends BasicItemForm { if (data.get(ITEM_SEARCH) == null) { data.addError( - ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericperson.select_contact.none_selected")); + ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.genericperson.select_contact.none_selected")); return; } GenericPerson person = (GenericPerson) getItemSelectionModel(). - getSelectedObject(state); + getSelectedObject(state); GenericContact contact = (GenericContact) data.get(ITEM_SEARCH); @@ -182,21 +189,21 @@ public class GenericPersonContactAddForm extends BasicItemForm { Kernel.getConfig(). languageIndependentItems()))) { data.addError( - ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericperson.select_contact.no_suitable_language_variant")); + ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.genericperson.select_contact.no_suitable_language_variant")); return; } contact = (GenericContact) contact.getContentBundle().getInstance(person. - getLanguage()); + getLanguage()); GenericPersonContactCollection contacts = person.getContacts(); contacts.addFilter(String.format("id = %s", contact.getID().toString())); if (contacts.size() > 0) { data.addError( - ContenttypesGlobalizationUtil.globalize( - "cms.contenttypes.ui.genericperson.select_contact.already_added")); + ContenttypesGlobalizationUtil.globalize( + "cms.contenttypes.ui.genericperson.select_contact.already_added")); } contacts.close(); 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 e9e0a9a8a..6f0c39960 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 @@ -34,13 +34,14 @@ import com.arsdigita.cms.ContentType; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.RelationAttribute; import com.arsdigita.cms.RelationAttributeCollection; +import com.arsdigita.cms.RelationAttributeResourceBundleControl; import com.arsdigita.cms.contentassets.SciPublicationsPersonsService; import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; -import com.arsdigita.globalization.GlobalizationHelper; +import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.toolbox.GlobalisationUtil; import com.arsdigita.util.UncheckedWrapperException; import java.util.TooManyListenersException; @@ -72,10 +73,10 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { // add(new Label(globalisationUtil.globalize( // "com.arsdigita.cms.contentassets.publicationspersons.select_person"))); itemSearch = new ItemSearchWidget( - ITEM_SEARCH, - ContentType.findByAssociatedObjectType(GenericPerson.class.getName())); + ITEM_SEARCH, + ContentType.findByAssociatedObjectType(GenericPerson.class.getName())); itemSearch.setLabel(globalisationUtil.globalize( - "com.arsdigita.cms.contentassets.publicationspersons.select_person")); + "com.arsdigita.cms.contentassets.publicationspersons.select_person")); itemSearch.setDisableCreatePane(true); add(itemSearch); @@ -93,13 +94,19 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { public void prepare(final PrintEvent event) { final SingleSelect target = (SingleSelect) event.getTarget(); final RelationAttributeCollection relations = new RelationAttributeCollection( - SciPublicationsPersonsService.RELATION_ATTRIBUTE); - relations.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale() - .getLanguage()); + SciPublicationsPersonsService.RELATION_ATTRIBUTE); +// relations.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale() +// .getLanguage()); while (relations.next()) { RelationAttribute relation; relation = relations.getRelationAttribute(); - target.addOption(new Option(relation.getKey(), relation.getName())); + //target.addOption(new Option(relation.getKey(), relation.getName())); + target.addOption(new Option( + relation.getKey(), + new Label(new GlobalizedMessage( + relation.getKey(), + SciPublicationsPersonsService.RELATION_ATTRIBUTE, + new RelationAttributeResourceBundleControl())))); } } @@ -109,7 +116,7 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { throw new UncheckedWrapperException(ex); } relationSelect.setLabel(globalisationUtil.globalize( - "com.arsdigita.cms.contentassets.publicationspersons.select_person_relation")); + "com.arsdigita.cms.contentassets.publicationspersons.select_person_relation")); add(relationSelect); } @@ -142,12 +149,12 @@ public class SciPublicationsPersonsPersonForm extends BasicItemForm { final GlobalisationUtil globalisationUtil = new SciPublicationsPersonsGlobalisationUtil(); if (data.get(ITEM_SEARCH) == null) { data.addError(globalisationUtil.globalize( - "com.arsdigita.cms.contentasset.publications_persons.none_selected")); + "com.arsdigita.cms.contentasset.publications_persons.none_selected")); } if ((data.get(RELATION) == null) || ((String) data.get(RELATION)).isEmpty()) { data.addError(globalisationUtil.globalize( - "com.arsdigita.cms.contentasset.publications_persons.none_relation_selected")); + "com.arsdigita.cms.contentasset.publications_persons.none_relation_selected")); } } 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 f7facda66..5bc2c2202 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 @@ -31,11 +31,12 @@ import com.arsdigita.bebop.parameters.NotEmptyValidationListener; import com.arsdigita.bebop.parameters.NotNullValidationListener; import com.arsdigita.cms.ItemSelectionModel; import com.arsdigita.cms.RelationAttribute; +import com.arsdigita.cms.RelationAttributeResourceBundleControl; import com.arsdigita.cms.contentassets.PublicationTypeAsset; import com.arsdigita.cms.contentassets.PublicationTypeValuesCollection; import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.ui.authoring.BasicItemForm; -import com.arsdigita.globalization.GlobalizationHelper; +import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.kernel.ui.ACSObjectSelectionModel; /** @@ -51,7 +52,8 @@ public class PublicationTypeAssetAddForm extends BasicItemForm { private final ItemSelectionModel itemModel; private final ACSObjectSelectionModel typeModel; - public PublicationTypeAssetAddForm(final ItemSelectionModel itemModel, final ACSObjectSelectionModel typeModel) { + public PublicationTypeAssetAddForm(final ItemSelectionModel itemModel, + final ACSObjectSelectionModel typeModel) { super("PublicationTypeAssetAddForm", itemModel); this.itemModel = itemModel; @@ -67,13 +69,19 @@ public class PublicationTypeAssetAddForm extends BasicItemForm { type.addValidationListener(new NotNullValidationListener()); type.addValidationListener(new NotEmptyValidationListener()); type.addOption(new Option("", new Label(PublicationTypeAssetGlobalizationUtil.globalize( - "scipublications.publication_type_asset.form.type.select_one")))); + "scipublications.publication_type_asset.form.type.select_one")))); final PublicationTypeValuesCollection values = new PublicationTypeValuesCollection(); - values.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); + //values.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); while (values.next()) { final RelationAttribute value = values.getRelationAttribute(); - type.addOption(new Option(value.getKey(), value.getName())); + //type.addOption(new Option(value.getKey(), value.getName())); + type.addOption(new Option( + value.getKey(), + new Label(new GlobalizedMessage( + value.getKey(), + PublicationTypeValuesCollection.ATTRIBUTE_NAME, + new RelationAttributeResourceBundleControl())))); } type.setLabel(PublicationTypeAssetGlobalizationUtil. globalize("scipublications.publication_type_asset.form.type")); @@ -101,7 +109,8 @@ public class PublicationTypeAssetAddForm extends BasicItemForm { final PageState state = event.getPageState(); if (typeModel.getSelectedObject(state) != null) { - final PublicationTypeAsset typeAsset = (PublicationTypeAsset) typeModel.getSelectedObject(state); + final PublicationTypeAsset typeAsset = (PublicationTypeAsset) typeModel. + getSelectedObject(state); final FormData data = event.getFormData(); data.put(PUB_TYPE, typeAsset.getPublicationType());