Author: painter
Date: Wed Jan 23 13:16:31 2019
New Revision: 1851909
URL: http://svn.apache.org/viewvc?rev=1851909&view=rev
Log:
Minor code cleanup, version bump for changes.xml
Modified:
turbine/fulcrum/trunk/localization/src/changes/changes.xml
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/SimpleLocalizationServiceImpl.java
Modified: turbine/fulcrum/trunk/localization/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/src/changes/changes.xml?rev=1851909&r1=1851908&r2=1851909&view=diff
==============================================================================
--- turbine/fulcrum/trunk/localization/src/changes/changes.xml (original)
+++ turbine/fulcrum/trunk/localization/src/changes/changes.xml Wed Jan 23
13:16:31 2019
@@ -24,7 +24,9 @@
</properties>
<body>
- <release version="1.0.7" date="in SVN">
+ <release version="1.0.8" date="in SVN">
+ </release>
+ <release version="1.0.7" date="2019-01-23">
<action dev="painter" type="update">
Moved changes.xml location for inclusion in report generation
</action>
Modified:
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java?rev=1851909&r1=1851908&r2=1851909&view=diff
==============================================================================
---
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
(original)
+++
turbine/fulcrum/trunk/localization/src/java/org/apache/fulcrum/localization/DefaultLocalizationService.java
Wed Jan 23 13:16:31 2019
@@ -141,7 +141,7 @@ public class DefaultLocalizationService
*/
public Locale getLocale(String header)
{
- if (!StringUtils.isEmpty(header))
+ if (StringUtils.isNotEmpty(header))
{
LocaleTokenizer tok = new LocaleTokenizer(header);
if (tok.hasNext())
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=1851909&r1=1851908&r2=1851909&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
Wed Jan 23 13:16:31 2019
@@ -353,7 +353,8 @@ public class SimpleLocalizationServiceIm
{
// Cache bundle.
bundlesByLocale.put(rb.getLocale(), rb);
- HashMap<String, HashMap<Locale, ResourceBundle>> bundlesByName
= new HashMap<String, HashMap<Locale, ResourceBundle>>(bundles);
+ HashMap<String, HashMap<Locale, ResourceBundle>> bundlesByName
+ = new HashMap<String, HashMap<Locale,
ResourceBundle>>(bundles);
bundlesByName.put(bundleName, bundlesByLocale);
this.bundles = bundlesByName;
}
