weaver 2003/10/17 12:44:03
Modified: portal/src/java/org/apache/jetspeed/om/impl
LanguageSetImpl.java
Log:
Checks for valid locale on add(), in non found the system default is used
Revision Changes Path
1.2 +7 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java
Index: LanguageSetImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LanguageSetImpl.java 10 Oct 2003 05:12:09 -0000 1.1
+++ LanguageSetImpl.java 17 Oct 2003 19:44:03 -0000 1.2
@@ -59,6 +59,8 @@
import java.util.Locale;
import java.util.Set;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.pluto.om.common.Language;
import org.apache.pluto.om.common.LanguageSet;
@@ -128,6 +130,10 @@
public boolean add(Object o)
{
Language language = (Language) o;
+ if (language.getLocale() == null)
+ {
+ ((MutableLanguage) o).setLocale(Jetspeed.getDefaultLocale());
+ }
languageMap.put(language.getLocale(), language);
return super.add(o);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
