You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2013/07/13 21:23:41 UTC
svn commit: r1502842 -
/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java
Author: oheger
Date: Sat Jul 13 19:23:41 2013
New Revision: 1502842
URL: http://svn.apache.org/r1502842
Log:
Changed the splitting of Locale components.
Now we use a plain regular expression split rather than the more complex
split() method of PropertyConverter.
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java
Modified: commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java?rev=1502842&r1=1502841&r2=1502842&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java (original)
+++ commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration/PropertyConverter.java Sat Jul 13 19:23:41 2013
@@ -488,14 +488,14 @@ public final class PropertyConverter
}
else if (value instanceof String)
{
- List<String> elements = split((String) value, '_');
- int size = elements.size();
+ String[] elements = ((String) value).split("_");
+ int size = elements.length;
- if (size >= 1 && ((elements.get(0)).length() == 2 || (elements.get(0)).length() == 0))
+ if (size >= 1 && ((elements[0]).length() == 2 || (elements[0]).length() == 0))
{
- String language = elements.get(0);
- String country = (size >= 2) ? elements.get(1) : "";
- String variant = (size >= 3) ? elements.get(2) : "";
+ String language = elements[0];
+ String country = (size >= 2) ? elements[1] : "";
+ String variant = (size >= 3) ? elements[2] : "";
return new Locale(language, country, variant);
}