LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Verschieben der Methode getNegotiatedLocale() von DispatcherHelper nach GlobalozationHelper 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1097 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2011-09-05 12:08:58 +00:00
parent 7b7760a88e
commit f028ec41e0
12 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ccm-cms/src/com/arsdigita/cms/ContentItemXMLRenderer.java
View File

@ -9,6 +9,7 @@ import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.domain.DomainObject; import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DomainObjectTraversalAdapter; import com.arsdigita.domain.DomainObjectTraversalAdapter;
import com.arsdigita.domain.DomainObjectXMLRenderer; import com.arsdigita.domain.DomainObjectXMLRenderer;
import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.persistence.metadata.Property; import com.arsdigita.persistence.metadata.Property;
import com.arsdigita.xml.Element; import com.arsdigita.xml.Element;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -110,7 +111,7 @@ public class ContentItemXMLRenderer extends DomainObjectXMLRenderer {
RelationAttributeCollection relationAttributeCollection = RelationAttributeCollection relationAttributeCollection =
new RelationAttributeCollection( new RelationAttributeCollection(
m_relationAttribute, key); m_relationAttribute, key);
relationAttributeCollection.addLanguageFilter(DispatcherHelper. relationAttributeCollection.addLanguageFilter(GlobalizationHelper.
getNegotiatedLocale().getLanguage()); getNegotiatedLocale().getLanguage());
if (relationAttributeCollection.size() > 0) { if (relationAttributeCollection.size() > 0) {
relationAttributeCollection.next(); relationAttributeCollection.next();

4
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/CompoundContentItemPanel.java
View File

@ -31,7 +31,7 @@ import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentSection; import com.arsdigita.cms.ContentSection;
import com.arsdigita.cms.ExtraXMLGenerator; import com.arsdigita.cms.ExtraXMLGenerator;
import com.arsdigita.cms.dispatcher.XMLGenerator; 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.ParameterMap;
import com.arsdigita.web.URL; import com.arsdigita.web.URL;
import com.arsdigita.web.Web; import com.arsdigita.web.Web;
@ -147,7 +147,7 @@ public abstract class CompoundContentItemPanel
bundle = (ContentBundle) item; bundle = (ContentBundle) item;
resolved = bundle.getInstance(DispatcherHelper.getNegotiatedLocale(). resolved = bundle.getInstance(GlobalizationHelper.getNegotiatedLocale().
getLanguage()); getLanguage());
if (resolved == null) { if (resolved == null) {

4
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java
View File

@ -27,7 +27,7 @@ import com.arsdigita.cms.RelationAttribute;
import com.arsdigita.cms.contenttypes.GenericContactTypeCollection; import com.arsdigita.cms.contenttypes.GenericContactTypeCollection;
import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection;
import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -102,7 +102,7 @@ public class GenericContactAttachPersonPropertyForm extends BasicPageForm
// Add the Options to the SingleSelect widget // Add the Options to the SingleSelect widget
GenericContactTypeCollection contacttypes = GenericContactTypeCollection contacttypes =
new GenericContactTypeCollection(); new GenericContactTypeCollection();
contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
getLanguage()); getLanguage());
while (contacttypes.next()) { while (contacttypes.next()) {

5
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEditPersonPropertyForm.java
View File

@ -30,7 +30,8 @@ import com.arsdigita.cms.contenttypes.GenericContactTypeCollection;
import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPerson;
import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection;
import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.globalization.GlobalizationHelper;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -112,7 +113,7 @@ public class GenericContactEditPersonPropertyForm extends BasicPageForm implemen
// Add the Options to the SingleSelect widget // Add the Options to the SingleSelect widget
GenericContactTypeCollection contacttypes = new GenericContactTypeCollection(); GenericContactTypeCollection contacttypes = new GenericContactTypeCollection();
contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().getLanguage()); contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage());
while (contacttypes.next()) { while (contacttypes.next()) {
RelationAttribute ct = contacttypes.getRelationAttribute(); RelationAttribute ct = contacttypes.getRelationAttribute();

4
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntriesTable.java
View File

@ -39,7 +39,7 @@ import com.arsdigita.cms.contenttypes.GenericContactEntryKeys;
import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -149,7 +149,7 @@ public class GenericContactEntriesTable extends Table implements TableActionList
switch (columnIndex) { switch (columnIndex) {
case 0: case 0:
GenericContactEntryKeys keys = new GenericContactEntryKeys(m_contactEntry.getKey()); GenericContactEntryKeys keys = new GenericContactEntryKeys(m_contactEntry.getKey());
keys.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().getLanguage()); keys.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage());
if (keys.next()) { if (keys.next()) {
Object key = keys.getName(); Object key = keys.getName();

5
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactEntryAddForm.java
View File

@ -33,7 +33,8 @@ import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.cms.contenttypes.GenericContactEntryKeys; import com.arsdigita.cms.contenttypes.GenericContactEntryKeys;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.globalization.GlobalizationHelper;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -65,7 +66,7 @@ public class GenericContactEntryAddForm extends BasicItemForm {
// Add the Options to the SingleSelect widget // Add the Options to the SingleSelect widget
GenericContactEntryKeys keyList = new GenericContactEntryKeys(); GenericContactEntryKeys keyList = new GenericContactEntryKeys();
keyList.addLanguageFilter(DispatcherHelper.getNegotiatedLocale().getLanguage()); keyList.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().getLanguage());
while(keyList.next()) { while(keyList.next()) {
String currentKey = keyList.getKey(); String currentKey = keyList.getKey();
contactEntryKey.addOption(new Option(currentKey, keyList.getName())); contactEntryKey.addOption(new Option(currentKey, keyList.getName()));

4
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java
View File

@ -41,7 +41,7 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitContactCollection
import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.globalization.GlobalizationHelper;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -94,7 +94,7 @@ public class GenericOrganizationalUnitContactAddForm
GenericContactTypeCollection contacttypes = GenericContactTypeCollection contacttypes =
new GenericContactTypeCollection(); new GenericContactTypeCollection();
contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
getLanguage()); getLanguage());
while (contacttypes.next()) { while (contacttypes.next()) {

14
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactTable.java
View File

@ -43,16 +43,22 @@ import com.arsdigita.cms.contenttypes.GenericOrganizationalUnitContactCollection
import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.util.GlobalizationUtil;
; ;
import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; 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; import org.apache.log4j.Logger;
/** /**
@ -192,7 +198,7 @@ public class GenericOrganizationalUnitContactTable extends Table implements
"Getting human readable contact type for contact type \"%s\"...", "Getting human readable contact type for contact type \"%s\"...",
m_contactCollection.getContactType())); m_contactCollection.getContactType()));
String lang = String lang =
DispatcherHelper.getNegotiatedLocale(). GlobalizationHelper.getNegotiatedLocale().
getLanguage(); getLanguage();
if (m_contacttypes.size() <= 0) { if (m_contacttypes.size() <= 0) {
s_log.warn(String.format("No matching relation " s_log.warn(String.format("No matching relation "
@ -218,11 +224,11 @@ public class GenericOrganizationalUnitContactTable extends Table implements
"Human readable contact type is: \"%s\"...", "Human readable contact type is: \"%s\"...",
m_contacttypes.getRelationAttribute( m_contacttypes.getRelationAttribute(
m_contactCollection.getContactType(), m_contactCollection.getContactType(),
DispatcherHelper.getNegotiatedLocale(). GlobalizationHelper.getNegotiatedLocale().
getLanguage()).getName())); getLanguage()).getName()));
return m_contacttypes.getRelationAttribute( return m_contacttypes.getRelationAttribute(
m_contactCollection.getContactType(), m_contactCollection.getContactType(),
DispatcherHelper.getNegotiatedLocale(). GlobalizationHelper.getNegotiatedLocale().
getLanguage()).getName(); getLanguage()).getName();
} }
case 1: case 1:

6
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java
View File

@ -42,7 +42,7 @@ import com.arsdigita.cms.contenttypes.GenericPerson;
import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil; import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.cms.ui.authoring.BasicItemForm; import com.arsdigita.cms.ui.authoring.BasicItemForm;
import com.arsdigita.dispatcher.DispatcherHelper; import com.arsdigita.globalization.GlobalizationHelper;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -97,7 +97,7 @@ public class GenericOrganizationalUnitPersonAddForm
globalize("cms.ui.select_one").localize()))); globalize("cms.ui.select_one").localize())));
RelationAttributeCollection roles = new RelationAttributeCollection( RelationAttributeCollection roles = new RelationAttributeCollection(
getRoleAttributeName()); getRoleAttributeName());
roles.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). roles.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
getLanguage()); getLanguage());
while (roles.next()) { while (roles.next()) {
RelationAttribute role; RelationAttribute role;
@ -119,7 +119,7 @@ public class GenericOrganizationalUnitPersonAddForm
RelationAttributeCollection statusColl = RelationAttributeCollection statusColl =
new RelationAttributeCollection( new RelationAttributeCollection(
getStatusAttributeName()); getStatusAttributeName());
statusColl.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). statusColl.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
getLanguage()); getLanguage());
while (statusColl.next()) { while (statusColl.next()) {
RelationAttribute status; RelationAttribute status;

5
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java
View File

@ -39,7 +39,8 @@ import com.arsdigita.cms.contenttypes.GenericContactTypeCollection;
import com.arsdigita.cms.contenttypes.GenericPersonContactCollection; import com.arsdigita.cms.contenttypes.GenericPersonContactCollection;
import com.arsdigita.cms.contenttypes.GenericPerson; import com.arsdigita.cms.contenttypes.GenericPerson;
import com.arsdigita.cms.ui.ItemSearchWidget; import com.arsdigita.cms.ui.ItemSearchWidget;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.globalization.GlobalizationHelper;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -96,7 +97,7 @@ public class GenericPersonContactAddForm extends BasicItemForm {
// Add the Options to the SingleSelect widget // Add the Options to the SingleSelect widget
GenericContactTypeCollection contacttypes = GenericContactTypeCollection contacttypes =
new GenericContactTypeCollection(); new GenericContactTypeCollection();
contacttypes.addLanguageFilter(DispatcherHelper.getNegotiatedLocale(). contacttypes.addLanguageFilter(GlobalizationHelper.getNegotiatedLocale().
getLanguage()); getLanguage());
while (contacttypes.next()) { while (contacttypes.next()) {

4
ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactTable.java
View File

@ -43,8 +43,8 @@ import com.arsdigita.cms.contenttypes.util.ContenttypesGlobalizationUtil;
import com.arsdigita.cms.dispatcher.ItemResolver; import com.arsdigita.cms.dispatcher.ItemResolver;
import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.cms.dispatcher.Utilities;
import com.arsdigita.cms.util.GlobalizationUtil; import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.globalization.GlobalizationHelper;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import java.math.BigDecimal; import java.math.BigDecimal;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@ -184,7 +184,7 @@ public class GenericPersonContactTable extends Table implements
s_log.debug(String.format( s_log.debug(String.format(
"Getting human readable contact type for contact type \"%s\"...", "Getting human readable contact type for contact type \"%s\"...",
m_contactCollection.getContactType())); m_contactCollection.getContactType()));
String lang = DispatcherHelper.getNegotiatedLocale(). String lang = GlobalizationHelper.getNegotiatedLocale().
getLanguage(); getLanguage();
if (contacttypes.size() <= 0) { if (contacttypes.size() <= 0) {
s_log.warn("No contact entry types found. Using key as " s_log.warn("No contact entry types found. Using key as "

2
ccm-cms/src/com/arsdigita/cms/dispatcher/ItemURLFinder.java
View File

@ -59,6 +59,7 @@ public class ItemURLFinder implements URLFinder {
* @return * @return
* @throws NoValidURLException * @throws NoValidURLException
*/ */
@Override
public String find(OID oid, String context) throws NoValidURLException { public String find(OID oid, String context) throws NoValidURLException {
if (s_log.isDebugEnabled()) { if (s_log.isDebugEnabled()) {
s_log.debug("Locating " + oid + " in " + context); s_log.debug("Locating " + oid + " in " + context);
@ -100,6 +101,7 @@ public class ItemURLFinder implements URLFinder {
* @return * @return
* @throws NoValidURLException * @throws NoValidURLException
*/ */
@Override
public String find(OID oid) throws NoValidURLException { public String find(OID oid) throws NoValidURLException {
if (s_log.isDebugEnabled()) { if (s_log.isDebugEnabled()) {
s_log.debug("Locating " + oid); s_log.debug("Locating " + oid);