[jboss-cvs] jboss-seam/src/main/org/jboss/seam/international ...
Gavin King
gavin.king at jboss.com
Tue Jun 19 15:41:44 EDT 2007
User: gavin
Date: 07/06/19 15:41:44
Modified: src/main/org/jboss/seam/international Locale.java
LocaleSelector.java Messages.java
ResourceBundle.java TimeZone.java
TimeZoneSelector.java
Log:
split ResourceBundle
Revision Changes Path
1.3 +4 -3 jboss-seam/src/main/org/jboss/seam/international/Locale.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Locale.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/Locale.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Locale.java 19 Jun 2007 19:21:17 -0000 1.2
+++ Locale.java 19 Jun 2007 19:41:44 -0000 1.3
@@ -18,10 +18,11 @@
* @author Gavin King
*/
@Scope(ScopeType.STATELESS)
- at Name("org.jboss.seam.core.locale")
- at Install(precedence=BUILT_IN)
+ at Name("org.jboss.seam.international.locale")
+ at Install(precedence=BUILT_IN, dependencies="org.jboss.seam.international.localeSelector")
@Intercept(NEVER)
-public class Locale {
+public class Locale
+{
@Unwrap
public java.util.Locale getLocale()
1.2 +2 -2 jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: LocaleSelector.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- LocaleSelector.java 19 Jun 2007 19:12:44 -0000 1.1
+++ LocaleSelector.java 19 Jun 2007 19:41:44 -0000 1.2
@@ -35,9 +35,9 @@
* @author Gavin King
*/
@Scope(ScopeType.SESSION)
- at Name("org.jboss.seam.core.localeSelector")
+ at Name("org.jboss.seam.international.localeSelector")
@Intercept(NEVER)
- at Install(precedence=BUILT_IN)
+ at Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class LocaleSelector extends Selector
{
private static final long serialVersionUID = -6087667065688208261L;
1.2 +1 -1 jboss-seam/src/main/org/jboss/seam/international/Messages.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Messages.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/Messages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Messages.java 19 Jun 2007 19:12:44 -0000 1.1
+++ Messages.java 19 Jun 2007 19:41:44 -0000 1.2
@@ -27,7 +27,7 @@
*/
@Scope(ScopeType.SESSION)
@Intercept(NEVER)
- at Name("org.jboss.seam.core.messages")
+ at Name("org.jboss.seam.international.messages")
@Install(precedence=BUILT_IN)
public class Messages implements Serializable
{
1.2 +5 -174 jboss-seam/src/main/org/jboss/seam/international/ResourceBundle.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ResourceBundle.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/ResourceBundle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ResourceBundle.java 19 Jun 2007 19:12:44 -0000 1.1
+++ ResourceBundle.java 19 Jun 2007 19:41:44 -0000 1.2
@@ -1,27 +1,13 @@
package org.jboss.seam.international;
import static org.jboss.seam.InterceptionType.NEVER;
-import static org.jboss.seam.annotations.Install.BUILT_IN;
+import static org.jboss.seam.annotations.Install.FRAMEWORK;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.MissingResourceException;
-
-import org.jboss.seam.Component;
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.Install;
import org.jboss.seam.annotations.Intercept;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
-import org.jboss.seam.annotations.Unwrap;
-import org.jboss.seam.log.LogProvider;
-import org.jboss.seam.log.Logging;
-import org.jboss.seam.navigation.Pages;
-import org.jboss.seam.util.EnumerationEnumeration;
-import org.jboss.seam.util.Strings;
/**
* Support for an application-global resource bundle
@@ -31,167 +17,12 @@
@Scope(ScopeType.SESSION)
@Intercept(NEVER)
@Name("org.jboss.seam.core.resourceBundle")
- at Install(precedence=BUILT_IN)
-public class ResourceBundle implements Serializable
+ at Install(precedence=FRAMEWORK, dependencies="org.jboss.seam.international.locale")
+public class ResourceBundle extends org.jboss.seam.core.ResourceBundle
{
- private static final long serialVersionUID = -3236251335438092538L;
- private static final LogProvider log = Logging.getLogProvider(ResourceBundle.class);
-
- private String[] bundleNames = {"messages"};
- private transient java.util.ResourceBundle bundle;
-
- public String[] getBundleNames()
- {
- return bundleNames;
- }
-
- public void setBundleNames(String[] bundleNames)
- {
- this.bundleNames = bundleNames;
- }
-
- @Deprecated
- public void setBundleName(String bundleName)
- {
- bundleNames = bundleName==null ? null : new String[] { bundleName };
- }
-
- @Deprecated
- public String getBundleName()
- {
- return bundleNames==null || bundleNames.length==0 ? null : bundleNames[0];
- }
-
- /**
- * Load a resource bundle by name (may be overridden by subclasses
- * who want to use non-standard resource bundle types).
- *
- * @param bundleName the name of the resource bundle
- * @return an instance of java.util.ResourceBundle
- */
- protected java.util.ResourceBundle loadBundle(String bundleName)
- {
- try
- {
- java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle(
- bundleName,
- Locale.instance(),
- Thread.currentThread().getContextClassLoader()
- );
- log.debug("loaded resource bundle: " + bundleName);
- return bundle;
- }
- catch (MissingResourceException mre)
- {
- log.debug("resource bundle missing: " + bundleName);
- return null;
- }
- }
-
- private void createUberBundle()
- {
- final List<java.util.ResourceBundle> littleBundles = new ArrayList<java.util.ResourceBundle>();
- if (bundleNames!=null)
- {
- for (String bundleName: bundleNames)
- {
- java.util.ResourceBundle littleBundle = loadBundle(bundleName);
- if (littleBundle!=null) littleBundles.add(littleBundle);
- }
- }
-
- java.util.ResourceBundle validatorBundle = loadBundle("ValidatorMessages");
- if (validatorBundle!=null) littleBundles.add(validatorBundle);
- java.util.ResourceBundle validatorDefaultBundle = loadBundle("org/hibernate/validator/resources/DefaultValidatorMessages");
- if (validatorDefaultBundle!=null) littleBundles.add(validatorDefaultBundle);
-
- bundle = new java.util.ResourceBundle()
- {
-
@Override
- public java.util.Locale getLocale()
+ protected java.util.Locale getCurrentLocale()
{
return Locale.instance();
}
-
- @Override
- public Enumeration<String> getKeys()
- {
- List<java.util.ResourceBundle> pageBundles = getPageResourceBundles();
- Enumeration<String>[] enumerations = new Enumeration[ littleBundles.size() + pageBundles.size() ];
- int i=0;
- for (; i<pageBundles.size(); i++)
- {
- enumerations[i++] = pageBundles.get(i).getKeys();
- }
- for (; i<littleBundles.size(); i++)
- {
- enumerations[i] = littleBundles.get(i).getKeys();
- }
- return new EnumerationEnumeration<String>(enumerations);
- }
-
- @Override
- protected Object handleGetObject(String key)
- {
- List<java.util.ResourceBundle> pageBundles = getPageResourceBundles();
- for (java.util.ResourceBundle pageBundle: pageBundles)
- {
- try
- {
- return pageBundle.getObject(key);
- }
- catch (MissingResourceException mre) {}
- }
-
- for (java.util.ResourceBundle littleBundle: littleBundles)
- {
- if (littleBundle!=null)
- {
- try
- {
- return littleBundle.getObject(key);
- }
- catch (MissingResourceException mre) {}
- }
- }
-
- return null; //superclass is responsible for throwing MRE
- }
-
- private List<java.util.ResourceBundle> getPageResourceBundles()
- {
- String viewId = Pages.getCurrentViewId();
- if (viewId!=null)
- {
- return Pages.instance().getResourceBundles(viewId);
- }
- else
- {
- return Collections.EMPTY_LIST;
- }
- }
-
- };
-
- }
-
- @Unwrap
- public java.util.ResourceBundle getBundle()
- {
- if (bundle==null) createUberBundle();
- return bundle;
- }
-
- @Override
- public String toString()
- {
- String concat = bundleNames==null ? "" : Strings.toString( ", ", (Object[]) bundleNames );
- return "ResourceBundle(" + concat + ")";
- }
-
- public static java.util.ResourceBundle instance()
- {
- return (java.util.ResourceBundle) Component.getInstance(ResourceBundle.class, true);
- }
}
1.2 +4 -3 jboss-seam/src/main/org/jboss/seam/international/TimeZone.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TimeZone.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/TimeZone.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TimeZone.java 19 Jun 2007 19:12:44 -0000 1.1
+++ TimeZone.java 19 Jun 2007 19:41:44 -0000 1.2
@@ -17,10 +17,11 @@
* @author Gavin King
*/
@Scope(ScopeType.STATELESS)
- at Name("org.jboss.seam.core.timeZone")
+ at Name("org.jboss.seam.international.timeZone")
@Intercept(NEVER)
- at Install(precedence=BUILT_IN)
-public class TimeZone {
+ at Install(precedence=BUILT_IN, dependencies="org.jboss.seam.international.timeZoneSelector")
+public class TimeZone
+{
@Unwrap
public java.util.TimeZone getTimeZone()
1.2 +2 -2 jboss-seam/src/main/org/jboss/seam/international/TimeZoneSelector.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TimeZoneSelector.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/TimeZoneSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- TimeZoneSelector.java 19 Jun 2007 19:12:44 -0000 1.1
+++ TimeZoneSelector.java 19 Jun 2007 19:41:44 -0000 1.2
@@ -23,9 +23,9 @@
* @author Gavin King
*/
@Scope(ScopeType.SESSION)
- at Name("org.jboss.seam.core.timeZoneSelector")
+ at Name("org.jboss.seam.international.timeZoneSelector")
@Intercept(NEVER)
- at Install(precedence=BUILT_IN)
+ at Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
public class TimeZoneSelector extends Selector
{
private static final long serialVersionUID = -5013819375360015369L;
More information about the jboss-cvs-commits
mailing list