paulsp 2002/11/16 09:30:32
Modified: src/java/org/apache/jetspeed/services/customlocalization
JetspeedLocalizationService.java
build build.xml
Log:
Formatting changes as dictated by checkStyle. No functional changes
Revision Changes Path
1.3 +33 -27
jakarta-jetspeed/src/java/org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java
Index: JetspeedLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedLocalizationService.java 16 Nov 2002 16:50:59 -0000 1.2
+++ JetspeedLocalizationService.java 16 Nov 2002 17:30:31 -0000 1.3
@@ -61,19 +61,21 @@
* @version $Id$
*/
-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
+// Java imports
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.ResourceBundle;
-import org.apache.turbine.services.TurbineBaseService;
+// Turbine imports
import org.apache.turbine.services.localization.TurbineLocalizationService;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.*;
+import org.apache.turbine.util.RunData;
+// Jetspeed imports
import org.apache.jetspeed.om.security.JetspeedUser;
-
public class JetspeedLocalizationService extends TurbineLocalizationService
implements CustomLocalizationService
{
public JetspeedLocalizationService()
@@ -81,7 +83,7 @@
super();
}
- public void init()throws InitializationException
+ public void init() throws InitializationException
{
super.init();
}
@@ -90,19 +92,24 @@
{
bundleNames = TurbineResources.getStringArray("locale.default.bundles");
String name = TurbineResources.getString("locale.default.bundle");
- if(name != null && name.length() > 0)
- if(bundleNames == null || bundleNames.length <= 0)
+ if (name != null && name.length() > 0)
{
- bundleNames = (new String[] {name});
- } else
+ if (bundleNames == null || bundleNames.length <= 0)
+ {
+ bundleNames = (new String[] {name});
+ }
+ else
+ {
+ String array[] = new String[bundleNames.length + 1];
+ array[0] = name;
+ System.arraycopy(bundleNames, 0, array, 1, bundleNames.length);
+ bundleNames = array;
+ }
+ }
+ if (bundleNames == null)
{
- String array[] = new String[bundleNames.length + 1];
- array[0] = name;
- System.arraycopy(bundleNames, 0, array, 1, bundleNames.length);
- bundleNames = array;
+ bundleNames = new String[0];
}
- if(bundleNames == null)
- bundleNames = new String[0];
}
public String getDefaultBundleName()
@@ -122,7 +129,7 @@
public ResourceBundle getBundle(String bundleName, String languageHeader)
{
- return super.getBundle(bundleName,languageHeader);
+ return super.getBundle(bundleName, languageHeader);
}
public ResourceBundle getBundle(RunData data)
@@ -132,12 +139,12 @@
public ResourceBundle getBundle(String bundleName, RunData data)
{
- return super.getBundle(bundleName,data);
+ return super.getBundle(bundleName, data);
}
public ResourceBundle getBundle(String bundleName, Locale locale)
{
- return super.getBundle(bundleName,locale);
+ return super.getBundle(bundleName, locale);
}
public void setBundle(String defaultBundle)
@@ -148,26 +155,25 @@
public final Locale getLocale(RunData data)
{
- String linguaggio=data.getLocale().getLanguage();
- JetspeedUser user = (JetspeedUser)data.getUser();
+ JetspeedUser user = (JetspeedUser) data.getUser();
if (user == null)
{
return
getLocale(data.getRequest().getHeader(CustomLocalizationService.ACCEPT_LANGUAGE));
}
else
{
- String lang="null";
+ String lang = "null";
try
{
- if (user.getPerm("language")==null)
+ if (user.getPerm("language") == null)
{
- return
getLocale(data.getRequest().getHeader(CustomLocalizationService.ACCEPT_LANGUAGE));
+ return
getLocale(data.getRequest().getHeader(CustomLocalizationService.ACCEPT_LANGUAGE));
}
else
{
lang = user.getPerm("language").toString();
- Locale locale = new Locale(lang,"");
+ Locale locale = new Locale(lang, "");
return locale;
}
}
@@ -186,7 +192,7 @@
public String getString(String bundleName, Locale locale, String key)
{
- return super.getString(bundleName,locale,key);
+ return super.getString(bundleName, locale, key);
}
private Hashtable bundles;
1.170 +1 -0 jakarta-jetspeed/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- build.xml 14 Nov 2002 20:30:23 -0000 1.169
+++ build.xml 16 Nov 2002 17:30:32 -0000 1.170
@@ -250,6 +250,7 @@
<include
name="org/apache/jetspeed/portal/controls/VelocityPortletSetControl.java"/>
<include
name="org/apache/jetspeed/portal/portlets/browser/DatabaseBrowserPortlet.java"/>
<include
name="org/apache/jetspeed/portal/security/portlets/PortletWrapper.java"/>
+ <include
name="org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java"/>
<include
name="org/apache/jetspeed/services/persistence/PortalPersistenceException.java"/>
<include
name="org/apache/jetspeed/services/psmlmanager/db/DBOperations.java"/>
<include
name="org/apache/jetspeed/services/registry/CastorRegistryService.java"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
