Index: src/java/org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java =================================================================== RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java,v retrieving revision 1.4 diff -u -r1.4 JetspeedLocalizationService.java --- src/java/org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java 26 Feb 2003 17:46:34 -0000 1.4 +++ src/java/org/apache/jetspeed/services/customlocalization/JetspeedLocalizationService.java 6 Mar 2003 10:50:19 -0000 @@ -62,14 +62,10 @@ */ // Java imports -import java.util.Hashtable; import java.util.Locale; -import java.util.ResourceBundle; // 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.RunData; // Jetspeed imports @@ -78,81 +74,6 @@ public class JetspeedLocalizationService extends TurbineLocalizationService implements CustomLocalizationService { - public JetspeedLocalizationService() - { - super(); - } - - public void init() throws InitializationException - { - super.init(); - } - - protected void initBundleNames(String ignored[]) - { - 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) - { - 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) - { - bundleNames = new String[0]; - } - } - - public String getDefaultBundleName() - { - return bundleNames.length > 0 ? bundleNames[0] : ""; - } - - public ResourceBundle getBundle() - { - return super.getBundle(); - } - - public ResourceBundle getBundle(String bundleName) - { - return super.getBundle(bundleName); - } - - public ResourceBundle getBundle(String bundleName, String languageHeader) - { - return super.getBundle(bundleName, languageHeader); - } - - public ResourceBundle getBundle(RunData data) - { - return super.getBundle(data); - } - - public ResourceBundle getBundle(String bundleName, RunData data) - { - return super.getBundle(bundleName, data); - } - - public ResourceBundle getBundle(String bundleName, Locale locale) - { - return super.getBundle(bundleName, locale); - } - - public void setBundle(String defaultBundle) - { - super.setBundle(defaultBundle); - } - - public final Locale getLocale(RunData data) { JetspeedUser user = (JetspeedUser) data.getUser(); @@ -183,21 +104,4 @@ } } } - - public Locale getLocale(String header) - { - return super.getLocale(header); - } - - public String getString(String bundleName, Locale locale, String key) - { - return super.getString(bundleName, locale, key); - } - - private Hashtable bundles; - private String bundleNames[]; - private Locale defaultLocale; - private String defaultLanguage; - private String defaultCountry; - -} +} \ No newline at end of file