Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tab police 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1390989 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-09-27 13:12:09 +00:00
parent 0490f1c291
commit f068cb71b5
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.xml
View File

@ -42,8 +42,8 @@
<pathelement location="${build.home}/classes"/>
<pathelement location="${build.home}/tests"/>
<pathelement location="${junit.jar}"/>
<pathelement location="${easymock.jar}"/>
<pathelement location="${commons-io.jar}"/>
<pathelement location="${easymock.jar}"/>
<pathelement location="${commons-io.jar}"/>
</path>
<!-- ========== Executable Targets ======================================== -->

30
src/main/java/org/apache/commons/lang3/time/FastDateParser.java
View File

@ -107,7 +107,7 @@ protected FastDateParser(String pattern, TimeZone timeZone, Locale locale) {
*/
private void init() {
Calendar definingCalendar = Calendar.getInstance(timeZone, locale);
thisYear= definingCalendar.get(Calendar.YEAR);
thisYear= definingCalendar.get(Calendar.YEAR);
StringBuilder regex= new StringBuilder();
List<Strategy> collector = new ArrayList<Strategy>();
@ -460,7 +460,7 @@ private Strategy getStrategy(String formatField, Calendar definingCalendar) {
return formatField.length()>2 ?LITERAL_YEAR_STRATEGY :ABBREVIATED_YEAR_STRATEGY;
case 'Z':
case 'z':
return getLocaleSpecificStrategy(Calendar.ZONE_OFFSET, definingCalendar);
return getLocaleSpecificStrategy(Calendar.ZONE_OFFSET, definingCalendar);
}
}
@ -473,12 +473,12 @@ private Strategy getStrategy(String formatField, Calendar definingCalendar) {
* @return a cache of Locale to Strategy
*/
private static ConcurrentMap<Locale, Strategy> getCache(int field) {
synchronized(caches) {
if(caches[field]==null) {
caches[field]= new ConcurrentHashMap<Locale,Strategy>(3);
}
return caches[field];
}
synchronized(caches) {
if(caches[field]==null) {
caches[field]= new ConcurrentHashMap<Locale,Strategy>(3);
}
return caches[field];
}
}
/**
@ -489,12 +489,12 @@ private static ConcurrentMap<Locale, Strategy> getCache(int field) {
* @return a TextStrategy for the field and Locale
*/
private Strategy getLocaleSpecificStrategy(int field, Calendar definingCalendar) {
ConcurrentMap<Locale,Strategy> cache = getCache(field);
Strategy strategy= cache.get(Integer.valueOf(field));
ConcurrentMap<Locale,Strategy> cache = getCache(field);
Strategy strategy= cache.get(Integer.valueOf(field));
if(strategy==null) {
strategy= field==Calendar.ZONE_OFFSET
? new TimeZoneStrategy(locale)
: new TextStrategy(field, definingCalendar, locale);
strategy= field==Calendar.ZONE_OFFSET
? new TimeZoneStrategy(locale)
: new TextStrategy(field, definingCalendar, locale);
Strategy inCache= cache.putIfAbsent(locale, strategy);
if(inCache!=null) {
return inCache;
@ -503,7 +503,7 @@ private Strategy getLocaleSpecificStrategy(int field, Calendar definingCalendar)
return strategy;
}
/**
/**
* A strategy that copies the static or quoted field in the parsing pattern
*/
private static class CopyQuotedStrategy implements Strategy {
@ -546,7 +546,7 @@ public void setCalendar(FastDateParser parser, Calendar cal, String value) {
}
}
/**
/**
* A strategy that handles a text field in the parsing pattern
*/
private static class TextStrategy implements Strategy {

12
src/test/java/org/apache/commons/lang3/StringUtilsTest.java
View File

@ -77,12 +77,12 @@ public class StringUtilsTest {
private static final String[] EMPTY_ARRAY_LIST = {};
private static final String[] NULL_ARRAY_LIST = {null};
private static final Object[] NULL_TO_STRING_LIST = {
new Object(){
@Override
public String toString() {
return null;
}
}
new Object(){
@Override
public String toString() {
return null;
}
}
};
private static final String[] MIXED_ARRAY_LIST = {null, "", "foo"};
private static final Object[] MIXED_TYPE_LIST = {"foo", Long.valueOf(2L)};