You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2005/06/21 00:18:38 UTC
svn commit: r191577 - in /portals/jetspeed-2/trunk:
components/persistence/src/java/org/apache/jetspeed/util/ojb/
components/registry/src/java/org/apache/jetspeed/om/impl/
components/registry/src/java/org/apache/jetspeed/om/servlet/impl/
portal/src/jav...
Author: shinsuke
Date: Mon Jun 20 15:18:37 2005
New Revision: 191577
URL: http://svn.apache.org/viewcvs?rev=191577&view=rev
Log:
removed system locale dependency
Modified:
portals/jetspeed-2/trunk/components/persistence/src/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java
portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java
Modified: portals/jetspeed-2/trunk/components/persistence/src/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/persistence/src/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java?rev=191577&r1=191576&r2=191577&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/persistence/src/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java (original)
+++ portals/jetspeed-2/trunk/components/persistence/src/java/org/apache/jetspeed/util/ojb/LocaleFieldConversion.java Mon Jun 20 15:18:37 2005
@@ -18,6 +18,7 @@
import java.util.Locale;
import java.util.StringTokenizer;
+import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.ojb.broker.accesslayer.conversions.ConversionException;
import org.apache.ojb.broker.accesslayer.conversions.FieldConversion;
@@ -112,7 +113,7 @@
}
else
{
- return Locale.getDefault();
+ return JetspeedLocale.getDefaultLocale();
}
}
else
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java?rev=191577&r1=191576&r2=191577&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java Mon Jun 20 15:18:37 2005
@@ -26,6 +26,7 @@
import org.apache.jetspeed.om.common.MutableDescription;
import org.apache.jetspeed.om.common.ParameterComposite;
import org.apache.jetspeed.util.HashCodeBuilder;
+import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.common.DescriptionSet;
@@ -177,7 +178,7 @@
public void setDescription(String desc)
{
System.out.println("Setting description..." + desc);
- addDescription(Locale.getDefault(), desc);
+ addDescription(JetspeedLocale.getDefaultLocale(), desc);
System.out.println("Description Set " + desc);
}
@@ -189,7 +190,7 @@
public String getDescription()
{
- Description desc = getDescription(Locale.getDefault());
+ Description desc = getDescription(JetspeedLocale.getDefaultLocale());
if (desc != null)
{
Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java?rev=191577&r1=191576&r2=191577&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/om/servlet/impl/WebApplicationDefinitionImpl.java Mon Jun 20 15:18:37 2005
@@ -32,6 +32,7 @@
import org.apache.jetspeed.om.impl.DisplayNameSetImpl;
import org.apache.jetspeed.om.impl.WebAppDescriptionImpl;
import org.apache.jetspeed.om.impl.WebAppDisplayNameImpl;
+import org.apache.jetspeed.util.JetspeedLocale;
import org.apache.jetspeed.util.JetspeedObjectID;
import org.apache.pluto.om.common.Description;
import org.apache.pluto.om.common.DescriptionSet;
@@ -231,7 +232,7 @@
*/
public String getDescription()
{
- Description desc = getDescription(Locale.getDefault());
+ Description desc = getDescription(JetspeedLocale.getDefaultLocale());
if (desc != null)
{
return desc.getDescription();
@@ -246,7 +247,7 @@
*/
public void setDescription(String desc)
{
- addDescription(Locale.getDefault(), desc);
+ addDescription(JetspeedLocale.getDefaultLocale(), desc);
}
/**
Modified: portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java?rev=191577&r1=191576&r2=191577&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java (original)
+++ portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/WebApplicationDescriptor.java Mon Jun 20 15:18:37 2005
@@ -23,6 +23,7 @@
import org.apache.jetspeed.om.servlet.impl.SecurityRoleImpl;
import org.apache.jetspeed.om.servlet.impl.WebApplicationDefinitionImpl;
import org.apache.jetspeed.tools.pamanager.PortletApplicationException;
+import org.apache.jetspeed.util.JetspeedLocale;
/**
* Utilities for manipulating the web.xml deployment descriptor
@@ -86,7 +87,7 @@
wd.setContextRoot(contextRoot);
//wd.addDescription(locale, displayName);
- wd.addDescription(Locale.getDefault(), contextRoot);
+ wd.addDescription(JetspeedLocale.getDefaultLocale(), contextRoot);
return wd;
}
@@ -97,4 +98,4 @@
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org