From 58d279ce5e362e7f485b2b98e02c5e448b309476 Mon Sep 17 00:00:00 2001 From: Henri Yandell Date: Sun, 19 Feb 2012 09:26:06 +0000 Subject: [PATCH] =?UTF-8?q?Applying=20Felix=20M=C3=BCller's=20patch=20from?= =?UTF-8?q?=20LANG-462=20to=20fix=20a=20timezone=20assumption=20in=20a=20t?= =?UTF-8?q?est=20and=20remove=20Java=206=20interface=20implementation=20@O?= =?UTF-8?q?verride=20statements?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1290976 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/commons/lang3/time/FastDateFormat.java | 2 -- .../org/apache/commons/lang3/time/FastDateParser.java | 7 ------- .../org/apache/commons/lang3/time/FastDatePrinter.java | 10 ---------- .../apache/commons/lang3/time/FastDateParserTest.java | 2 +- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java index 9f928af8f..e3d77557c 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDateFormat.java @@ -461,7 +461,6 @@ public StringBuffer format(Calendar calendar, StringBuffer buf) { /* (non-Javadoc) * @see DateParser#parse(java.lang.String) */ - @Override public Date parse(String source) throws ParseException { return parser.parse(source); } @@ -469,7 +468,6 @@ public Date parse(String source) throws ParseException { /* (non-Javadoc) * @see DateParser#parse(java.lang.String, java.text.ParsePosition) */ - @Override public Date parse(String source, ParsePosition pos) { return parser.parse(source, pos); } diff --git a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java index 139d66127..88449e5d2 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDateParser.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDateParser.java @@ -144,7 +144,6 @@ private void init() { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#getPattern() */ - @Override public String getPattern() { return pattern; } @@ -152,7 +151,6 @@ public String getPattern() { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#getTimeZone() */ - @Override public TimeZone getTimeZone() { return timeZone; } @@ -160,7 +158,6 @@ public TimeZone getTimeZone() { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#getLocale() */ - @Override public Locale getLocale() { return locale; } @@ -222,7 +219,6 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#parseObject(java.lang.String) */ - @Override public Object parseObject(String source) throws ParseException { return parse(source); } @@ -230,7 +226,6 @@ public Object parseObject(String source) throws ParseException { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#parse(java.lang.String) */ - @Override public Date parse(String source) throws ParseException { Date date= parse(source, new ParsePosition(0)); if(date==null) { @@ -242,7 +237,6 @@ public Date parse(String source) throws ParseException { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#parseObject(java.lang.String, java.text.ParsePosition) */ - @Override public Object parseObject(String source, ParsePosition pos) { return parse(source, pos); } @@ -250,7 +244,6 @@ public Object parseObject(String source, ParsePosition pos) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DateParser#parse(java.lang.String, java.text.ParsePosition) */ - @Override public Date parse(String source, ParsePosition pos) { int offset= pos.getIndex(); Matcher matcher= parsePattern.matcher(source.substring(offset)); diff --git a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java index 349319e18..0a4ca8595 100644 --- a/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java +++ b/src/main/java/org/apache/commons/lang3/time/FastDatePrinter.java @@ -375,7 +375,6 @@ protected NumberRule selectNumberRule(int field, int padding) { * @param pos the position - ignored * @return the buffer passed in */ - @Override public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition pos) { if (obj instanceof Date) { return format((Date) obj, toAppendTo); @@ -392,7 +391,6 @@ public StringBuffer format(Object obj, StringBuffer toAppendTo, FieldPosition po /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#format(long) */ - @Override public String format(long millis) { return format(new Date(millis)); } @@ -400,7 +398,6 @@ public String format(long millis) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#format(java.util.Date) */ - @Override public String format(Date date) { Calendar c = new GregorianCalendar(mTimeZone, mLocale); // hard code GregorianCalendar c.setTime(date); @@ -410,7 +407,6 @@ public String format(Date date) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#format(java.util.Calendar) */ - @Override public String format(Calendar calendar) { return format(calendar, new StringBuffer(mMaxLengthEstimate)).toString(); } @@ -418,7 +414,6 @@ public String format(Calendar calendar) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#format(long, java.lang.StringBuffer) */ - @Override public StringBuffer format(long millis, StringBuffer buf) { return format(new Date(millis), buf); } @@ -426,7 +421,6 @@ public StringBuffer format(long millis, StringBuffer buf) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#format(java.util.Date, java.lang.StringBuffer) */ - @Override public StringBuffer format(Date date, StringBuffer buf) { Calendar c = new GregorianCalendar(mTimeZone, mLocale); // hard code GregorianCalendar c.setTime(date); @@ -436,7 +430,6 @@ public StringBuffer format(Date date, StringBuffer buf) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#format(java.util.Calendar, java.lang.StringBuffer) */ - @Override public StringBuffer format(Calendar calendar, StringBuffer buf) { return applyRules(calendar, buf); } @@ -461,7 +454,6 @@ protected StringBuffer applyRules(Calendar calendar, StringBuffer buf) { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#getPattern() */ - @Override public String getPattern() { return mPattern; } @@ -469,7 +461,6 @@ public String getPattern() { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#getTimeZone() */ - @Override public TimeZone getTimeZone() { return mTimeZone; } @@ -477,7 +468,6 @@ public TimeZone getTimeZone() { /* (non-Javadoc) * @see org.apache.commons.lang3.time.DatePrinter#getLocale() */ - @Override public Locale getLocale() { return mLocale; } diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java index 7355049b0..36acc4da1 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java @@ -140,7 +140,7 @@ public void testParseLongShort() throws ParseException { Date parse = fdf.parse("2003 BC February 0010 PM Saturday 0015 0033 0020 0989 GMT-05:00"); assertEquals(cal.getTime(), parse); - fdf = getInstance("y G M d a E H m s S Z"); + fdf = getInstance("y G M d a E H m s S Z", NEW_YORK, Locale.US); assertEquals(cal.getTime(), fdf.parse("03 BC 2 10 PM Sat 15 33 20 989 -0500")); cal.set(Calendar.ERA, GregorianCalendar.AD);