Author: jleroux
Date: Mon Jul 26 20:24:28 2010
New Revision: 979430
URL:
http://svn.apache.org/viewvc?rev=979430&view=revLog:
Fix r979204 on Adam's remarks in dev ML
Modified:
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=979430&r1=979429&r2=979430&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelManagerFactory.java Mon Jul 26 20:24:28 2010
@@ -165,7 +165,7 @@ public class LabelManagerFactory {
}
public Set<String> getLocalesFound() {
- return localesFound;
+ return new TreeSet<String>(localesFound);
}
public static Collection<LabelFile> getFilesFound() {
Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java?rev=979430&r1=979429&r2=979430&view=diff==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java Mon Jul 26 20:24:28 2010
@@ -82,9 +82,7 @@ public class SaveLabelsToXmlFile {
Set<String> labelsList = factory.getLabelsList();
Set<String> localesFound = factory.getLocalesFound();
for (String localeName : localeNames) {
- if (!localesFound.contains(localeName)) {
- localesFound.add(localeName);
- }
+ localesFound.add(localeName);
}
// Remove a Label
if (UtilValidate.isNotEmpty(removeLabel)) {