From f028ec41e03663015c79aa66e87bf5fe338eb15e Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 5 Sep 2011 12:08:58 +0000 Subject: [PATCH] Verschieben der Methode getNegotiatedLocale() von DispatcherHelper nach GlobalozationHelper git-svn-id: https://svn.libreccm.org/ccm/trunk@1097 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/ContentItemXMLRenderer.java | 3 ++- .../contenttypes/ui/CompoundContentItemPanel.java | 4 ++-- .../ui/GenericContactAttachPersonPropertyForm.java | 4 ++-- .../ui/GenericContactEditPersonPropertyForm.java | 5 +++-- .../ui/GenericContactEntriesTable.java | 4 ++-- .../ui/GenericContactEntryAddForm.java | 5 +++-- .../GenericOrganizationalUnitContactAddForm.java | 4 ++-- .../ui/GenericOrganizationalUnitContactTable.java | 14 ++++++++++---- .../ui/GenericOrganizationalUnitPersonAddForm.java | 6 +++--- .../ui/GenericPersonContactAddForm.java | 5 +++-- .../contenttypes/ui/GenericPersonContactTable.java | 4 ++-- .../arsdigita/cms/dispatcher/ItemURLFinder.java | 2 ++ 12 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java b/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java index a188ab126..9b73e1366 100644 --- a/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java +++ b/ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java @@ -9,6 +9,7 @@ import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObjectTraversalAdapter; import com.arsdigita.domain.DomainObjectXMLRenderer; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.persistence.metadata.Property; import com.arsdigita.xml.Element; import org.apache.log4j.Logger; @@ -110,7 +111,7 @@ public class ContentItemXMLRenderer extends DomainObjectXMLRenderer { RelationAttributeCollection relationAttributeCollection = new RelationAttributeCollection( m_relationAttribute, key); - relationAttributeCollection.addLanguageFilter(DispatcherHelper. + relationAttributeCollection.addLanguageFilter(GlobalizationHelper. getNegotiatedLocale().getLanguage()); if (relationAttributeCollection.size() > 0) { relationAttributeCollection.next(); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java index 1c0c09df8..b8d4f34d8 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java @@ -31,7 +31,7 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ExtraXMLGenerator; import com.arsdigita.cms.dispatcher.XMLGenerator; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.web.ParameterMap; import com.arsdigita.web.URL; import com.arsdigita.web.Web; @@ -147,7 +147,7 @@ public abstract class CompoundContentItemPanel bundle = (ContentBundle) item; - resolved = bundle.getInstance(DispatcherHelper.getNegotiatedLocale(). + resolved = bundle.getInstance(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); if (resolved == null) { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java index 4c288c0af..9bc5ee4a8 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java @@ -27,7 +27,7 @@ import com.arsdigita.cms.RelationAttribute; import com.arsdigita.cms.contenttypes.GenericContactTypeCollection; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.util.UncheckedWrapperException; import org.apache.log4j.Logger; @@ -102,7 +102,7 @@ public class GenericContactAttachPersonPropertyForm extends BasicPageForm // Add the Options to the SingleSelect widget GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); - contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); while (contacttypes.next()) { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java index 164c31309..5a651fb32 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java @@ -30,7 +30,8 @@ import com.arsdigita.cms.contenttypes.GenericContactTypeCollection; import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; -import com.arsdigita.dispatcher.DispatcherHelper; + +import com.arsdigita.globalization.GlobalizationHelper; import org.apache.log4j.Logger; @@ -112,7 +113,7 @@ public class GenericContactEditPersonPropertyForm extends BasicPageForm implemen // Add the Options to the SingleSelect widget GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); - contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().getLanguage()); + contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); while (contacttypes.next()) { RelationAttribute ct = contacttypes.getRelationAttribute(); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java index ae045d393..c7c980201 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java @@ -39,7 +39,7 @@ import com.arsdigita.cms.contenttypes.GenericContactEntryKeys; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.util.GlobalizationUtil; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.util.LockableImpl; import java.math.BigDecimal; @@ -149,7 +149,7 @@ public class GenericContactEntriesTable extends Table implements TableActionList switch (columnIndex) { case 0: GenericContactEntryKeys keys = new GenericContactEntryKeys(m_contactEntry.getKey()); - keys.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().getLanguage()); + keys.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); if (keys.next()) { Object key = keys.getName(); 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 d2a235cd8..caef3133a 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java @@ -33,7 +33,8 @@ import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.cms.contenttypes.GenericContactEntryKeys; -import com.arsdigita.dispatcher.DispatcherHelper; + +import com.arsdigita.globalization.GlobalizationHelper; import org.apache.log4j.Logger; @@ -65,7 +66,7 @@ public class GenericContactEntryAddForm extends BasicItemForm { // Add the Options to the SingleSelect widget GenericContactEntryKeys keyList = new GenericContactEntryKeys(); - keyList.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().getLanguage()); + keyList.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage()); while(keyList.next()) { String currentKey = keyList.getKey(); contactEntryKey.addOption(new Option(currentKey, keyList.getName())); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java index 6e0b7de0b..e61d5958d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java @@ -41,7 +41,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitContactCollection import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import org.apache.log4j.Logger; /** @@ -94,7 +94,7 @@ public class GenericOrganizationalUnitContactAddForm GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); - contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); while (contacttypes.next()) { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java index 57afde08d..9401dd02f 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java @@ -43,16 +43,22 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitContactCollection import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.Utilities; -import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.cms.util.GlobalizationUtil; ; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.util.LockableImpl; import java.math.BigDecimal; +import org.apache.log4j.Logger; +import com.arsdigita.util.LockableImpl; +import java.math.BigDecimal; +import org.apache.log4j.Logger; +import com.arsdigita.util.LockableImpl; +import java.math.BigDecimal; import org.apache.log4j.Logger; /** @@ -192,7 +198,7 @@ public class GenericOrganizationalUnitContactTable extends Table implements "Getting human readable contact type for contact type \"%s\"...", m_contactCollection.getContactType())); String lang = - DispatcherHelper.getNegotiatedLocale(). + GlobalizationHelper.getNegotiatedLocale(). getLanguage(); if (m_contacttypes.size() <= 0) { s_log.warn(String.format("No matching relation " @@ -218,11 +224,11 @@ public class GenericOrganizationalUnitContactTable extends Table implements "Human readable contact type is: \"%s\"...", m_contacttypes.getRelationAttribute( m_contactCollection.getContactType(), - DispatcherHelper.getNegotiatedLocale(). + GlobalizationHelper.getNegotiatedLocale(). getLanguage()).getName())); return m_contacttypes.getRelationAttribute( m_contactCollection.getContactType(), - DispatcherHelper.getNegotiatedLocale(). + GlobalizationHelper.getNegotiatedLocale(). getLanguage()).getName(); } case 1: 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 b047c0c3f..2b7dbf69a 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java @@ -42,7 +42,7 @@ import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.authoring.BasicItemForm; -import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.globalization.GlobalizationHelper; import org.apache.log4j.Logger; /** @@ -97,7 +97,7 @@ public class GenericOrganizationalUnitPersonAddForm globalize("cms.ui.select_one").localize()))); RelationAttributeCollection roles = new RelationAttributeCollection( getRoleAttributeName()); - roles.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + roles.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); while (roles.next()) { RelationAttribute role; @@ -119,7 +119,7 @@ public class GenericOrganizationalUnitPersonAddForm RelationAttributeCollection statusColl = new RelationAttributeCollection( getStatusAttributeName()); - statusColl.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + statusColl.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); while (statusColl.next()) { RelationAttribute status; 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 d08ca6acf..463358513 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java @@ -39,7 +39,8 @@ import com.arsdigita.cms.contenttypes.GenericContactTypeCollection; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.ui.ItemSearchWidget; -import com.arsdigita.dispatcher.DispatcherHelper; + +import com.arsdigita.globalization.GlobalizationHelper; import org.apache.log4j.Logger; @@ -96,7 +97,7 @@ public class GenericPersonContactAddForm extends BasicItemForm { // Add the Options to the SingleSelect widget GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); - contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). + contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale(). getLanguage()); while (contacttypes.next()) { diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java index f950aab04..ba16ff8b4 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java @@ -43,8 +43,8 @@ import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.util.GlobalizationUtil; -import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.util.LockableImpl; import java.math.BigDecimal; import org.apache.log4j.Logger; @@ -184,7 +184,7 @@ public class GenericPersonContactTable extends Table implements s_log.debug(String.format( "Getting human readable contact type for contact type \"%s\"...", m_contactCollection.getContactType())); - String lang = DispatcherHelper.getNegotiatedLocale(). + String lang = GlobalizationHelper.getNegotiatedLocale(). getLanguage(); if (contacttypes.size() <= 0) { s_log.warn("No contact entry types found. Using key as " diff --git a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java index 396bcbf64..8899f5349 100755 --- a/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java +++ b/ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java @@ -59,6 +59,7 @@ public class ItemURLFinder implements URLFinder { * @return * @throws NoValidURLException */ + @Override public String find(OID oid, String context) throws NoValidURLException { if (s_log.isDebugEnabled()) { s_log.debug("Locating " + oid + " in " + context); @@ -100,6 +101,7 @@ public class ItemURLFinder implements URLFinder { * @return * @throws NoValidURLException */ + @Override public String find(OID oid) throws NoValidURLException { if (s_log.isDebugEnabled()) { s_log.debug("Locating " + oid);