You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2017/03/07 14:18:59 UTC
svn commit: r1785841 - in /turbine/fulcrum/trunk/localization: pom.xml
src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
Author: gk
Date: Tue Mar 7 14:18:59 2017
New Revision: 1785841
URL: http://svn.apache.org/viewvc?rev=1785841&view=rev
Log:
- add properties for release
- update javadoc comment
Modified:
turbine/fulcrum/trunk/localization/pom.xml
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
Modified: turbine/fulcrum/trunk/localization/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/pom.xml?rev=1785841&r1=1785840&r2=1785841&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/pom.xml (original)
+++ turbine/fulcrum/trunk/localization/pom.xml Tue Mar 7 14:18:59 2017
@@ -138,6 +138,11 @@
</profiles>
<properties>
+ <!-- used for profile apache-release -->
+ <turbine.site.path>fulcrum/fulcrum-localization</turbine.site.path>
+ <turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/localization</turbine.scmPubCheckoutDirectory>
+ <turbine.site.cache>${project.build.directory}/turbine-sites</turbine.site.cache>
+ <siteContent.path>${project.build.directory}/staging</siteContent.path>
<!-- This bits are used for the staging directory -->
<fulcrum.release.version>1.0.6</fulcrum.release.version>
<fulcrum.rc.version>RC1</fulcrum.rc.version>
Modified: turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java?rev=1785841&r1=1785840&r2=1785841&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java (original)
+++ turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java Tue Mar 7 14:18:59 2017
@@ -112,7 +112,8 @@ public class SimpleLocalizationServiceIm
*
* @see {@link Configurable}
*/
- public void configure(Configuration conf) throws ConfigurationException
+ @Override
+ public void configure(Configuration conf) throws ConfigurationException
{
Locale jvmDefault = Locale.getDefault();
defaultLanguage =
@@ -149,7 +150,8 @@ public class SimpleLocalizationServiceIm
/**
* Called the first time the Service is used.
*/
- public void initialize() throws Exception
+ @Override
+ public void initialize() throws Exception
{
// initBundleNames(null);
defaultLocale = new Locale(defaultLanguage, defaultCountry);
@@ -198,7 +200,8 @@ public class SimpleLocalizationServiceIm
/**
* Retrieves the default language (specified in the config file).
*/
- public String getDefaultLanguage()
+ @Override
+ public String getDefaultLanguage()
{
return defaultLanguage;
}
@@ -206,7 +209,8 @@ public class SimpleLocalizationServiceIm
/**
* Retrieves the default country (specified in the config file).
*/
- public String getDefaultCountry()
+ @Override
+ public String getDefaultCountry()
{
return defaultCountry;
}
@@ -215,7 +219,8 @@ public class SimpleLocalizationServiceIm
* Retrieves the default Locale (as created from default
* language and default country).
*/
- public Locale getDefaultLocale()
+ @Override
+ public Locale getDefaultLocale()
{
return defaultLocale;
}
@@ -223,7 +228,8 @@ public class SimpleLocalizationServiceIm
/**
* @see org.apache.fulcrum.localization.SimpleLocalizationService#getDefaultBundleName()
*/
- public String getDefaultBundleName()
+ @Override
+ public String getDefaultBundleName()
{
return (bundleNames.length > 0 ? bundleNames[0] : "");
}
@@ -231,15 +237,17 @@ public class SimpleLocalizationServiceIm
/**
* @see org.apache.fulcrum.localization.SimpleLocalizationService#getBundleNames()
*/
- public String[] getBundleNames()
+ @Override
+ public String[] getBundleNames()
{
- return (String[]) bundleNames.clone();
+ return bundleNames.clone();
}
/**
* @see org.apache.fulcrum.localization.SimpleLocalizationService#getBundle()
*/
- public ResourceBundle getBundle()
+ @Override
+ public ResourceBundle getBundle()
{
return getBundle(getDefaultBundleName(), (Locale) null);
}
@@ -247,7 +255,8 @@ public class SimpleLocalizationServiceIm
/**
* @see org.apache.fulcrum.localization.SimpleLocalizationService#getBundle(String)
*/
- public ResourceBundle getBundle(String bundleName)
+ @Override
+ public ResourceBundle getBundle(String bundleName)
{
return getBundle(bundleName, (Locale) null);
}
@@ -262,7 +271,8 @@ public class SimpleLocalizationServiceIm
* indicated by the default language and country).
* @return A localized ResourceBundle.
*/
- public ResourceBundle getBundle(String bundleName, Locale locale)
+ @Override
+ public ResourceBundle getBundle(String bundleName, Locale locale)
{
// Assure usable inputs.
bundleName =
@@ -421,7 +431,8 @@ public class SimpleLocalizationServiceIm
*
* @param defaultBundle Name of default bundle.
*/
- public void setBundle(String defaultBundle)
+ @Override
+ public void setBundle(String defaultBundle)
{
if (bundleNames.length > 0)
{
@@ -443,7 +454,8 @@ public class SimpleLocalizationServiceIm
* @exception MissingResourceException Specified key cannot be matched.
* @see org.apache.fulcrum.localization.SimpleLocalizationService#getString(String, Locale, String)
*/
- public String getString(String bundleName, Locale locale, String key)
+ @Override
+ public String getString(String bundleName, Locale locale, String key)
throws MissingResourceException
{
String value = null;
@@ -500,7 +512,8 @@ public class SimpleLocalizationServiceIm
* @param key The key to retrieve the value for.
* @return The value mapped to the key.
*/
- public String getString(String key)
+ @Override
+ public String getString(String key)
{
return getString(getDefaultBundleName(), getDefaultLocale(), key);
}
@@ -530,7 +543,8 @@ public class SimpleLocalizationServiceIm
/**
* @see org.apache.fulcrum.localization.SimpleLocalizationService#format(String, Locale, String, Object)
*/
- public String format(
+ @Override
+ public String format(
String bundleName,
Locale locale,
String key,
@@ -542,7 +556,8 @@ public class SimpleLocalizationServiceIm
/**
* @see org.apache.fulcrum.localization.SimpleLocalizationService#format(String, Locale, String, Object, Object)
*/
- public String format(
+ @Override
+ public String format(
String bundleName,
Locale locale,
String key,
@@ -557,11 +572,15 @@ public class SimpleLocalizationServiceIm
* <code>ResourceBundle</code> referenced by
* <code>bundleName</code>, then formats that value for the
* specified <code>Locale</code> using <code>args</code>.
+ *
+ * If <code>locale</code> is <code>null</code>, {@link #getDefaultLocale()} will be checked.
+ * If <code>bundleName</code> is <code>null</code>, {@link #getDefaultBundleName()} will be checked (cft. {@link #getBundle(String, Locale)}.
*
* @return Localized, formatted text identified by
* <code>key</code>.
*/
- public String format(
+ @Override
+ public String format(
String bundleName,
Locale locale,
String key,