From d13c3f68b63c83dce091fae6ea3c1a87a48e9a6d Mon Sep 17 00:00:00 2001
From: Doug Felt <dougfelt@gmail.com>
Date: Wed, 23 Nov 2005 00:13:07 +0000
Subject: [PATCH] ICU-4907 modifications for eclipse/1.3/foundation
 compatibility

X-SVN-Rev: 18825
---
 icu4j/src/com/ibm/icu/dev/test/TestFmwk.java      |  8 ++++----
 .../ibm/icu/dev/test/format/DateFormatTest.java   | 15 ++++++++-------
 icu4j/src/com/ibm/icu/text/SimpleDateFormat.java  |  2 ++
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java
index cdb9e51aaaa..daf417967d8 100755
--- a/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java
+++ b/icu4j/src/com/ibm/icu/dev/test/TestFmwk.java
@@ -541,7 +541,7 @@ public class TestFmwk extends AbstractTestLog {
         
         StringBuffer summary = null;
         try {
-            if (tests[0] == null) { // no args
+            if (tests.length == 0 || tests[0] == null) { // no args
                 params.init();
                 resolveTarget(params).run();
                 ec = params.errorCount;
@@ -561,10 +561,11 @@ public class TestFmwk extends AbstractTestLog {
                         if (summary == null) {
                             summary = new StringBuffer();
                         }
-                        summary.append("\nTest: " + tests[i]);
+                        summary.append("\nTest Root: " + tests[i] + "\n");
                         summary.append(params.errorSummary());
                     }
-               }
+                }
+                params.errorSummary = summary;
             }
         } catch (Exception e) {
             e.printStackTrace(params.log);
@@ -572,7 +573,6 @@ public class TestFmwk extends AbstractTestLog {
             params.log.println("encountered exception, exiting");
         }
         
-        params.errorSummary = summary;
         return ec;
     }
     
diff --git a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java
index 92229f7cbf9..c34a93fbc63 100755
--- a/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java
+++ b/icu4j/src/com/ibm/icu/dev/test/format/DateFormatTest.java
@@ -343,13 +343,13 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
             "y/M/d H:mm v", "pf", "2005/4/3 1:30 PT", "2005 04 03  01:30 PST", "2005/4/3 1:30 PT",
             "y/M/d H:mm", "pf", "2005/4/3 1:30 PT", "2005 04 03 01:30 PST", "2005/4/3 1:30",
             
-            "y/M/d H:mm zzz", "pf", "2004/10/31 1:30 PT", "2004 10 31 01:30 PDT", "2004/10/31 1:30 PDT",
-            "y/M/d H:mm zzz", "pf", "2004/10/31 1:30 PST", "2004 10 31 01:30 PST", "2004/10/31 1:30 PST",
-            "y/M/d H:mm zzz", "pf", "2004/10/31 1:30 PDT", "2004 10 31 01:30 PDT", "2004/10/31 1:30 PDT",
-            "y/M/d H:mm v", "pf", "2004/10/31 1:30 PT", "2004 10 31 01:30 PDT", "2004/10/31 1:30 PT",
-            "y/M/d H:mm v", "pf", "2004/10/31 1:30 PST", "2004 10 31 01:30 PST", "2004/10/31 1:30 PT",
-            "y/M/d H:mm v", "pf", "2004/10/31 1:30 PDT", "2004 10 31 01:30 PDT", "2004/10/31 1:30 PT",
-            "y/M/d H:mm", "pf", "2004/10/31 1:30", "2004 10 31 01:30 PDT", "2004/10/31 1:30",
+             "y/M/d H:mm zzz", "pf", "2004/10/31 1:30 PT", "2004 10 31 01:30 PST", "2004/10/31 1:30 PST",
+             "y/M/d H:mm zzz", "pf", "2004/10/31 1:30 PST", "2004 10 31 01:30 PST", "2004/10/31 1:30 PST",
+             "y/M/d H:mm zzz", "pf", "2004/10/31 1:30 PDT", "2004 10 31 01:30 PDT", "2004/10/31 1:30 PDT",
+             "y/M/d H:mm v", "pf", "2004/10/31 1:30 PT", "2004 10 31 01:30 PST", "2004/10/31 1:30 PT",
+             "y/M/d H:mm v", "pf", "2004/10/31 1:30 PST", "2004 10 31 01:30 PST", "2004/10/31 1:30 PT",
+             "y/M/d H:mm v", "pf", "2004/10/31 1:30 PDT", "2004 10 31 01:30 PDT", "2004/10/31 1:30 PT",
+             "y/M/d H:mm", "pf", "2004/10/31 1:30", "2004 10 31 01:30 PST", "2004/10/31 1:30",
         };
         expect(ZDATA, en);
 
@@ -2335,6 +2335,7 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         SimpleDateFormat univ = new SimpleDateFormat("EE G yyyy MM dd HH:mm:ss.SSS zzz", loc);
         String currentPat = null;
         SimpleDateFormat ref = new SimpleDateFormat(data[0], loc);
+
         while (i<data.length) {
             SimpleDateFormat fmt = new SimpleDateFormat("", loc);
             String pattern  = data[i++];
diff --git a/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java b/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java
index e8ff44fe63b..ef76afdb99e 100755
--- a/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java
+++ b/icu4j/src/com/ibm/icu/text/SimpleDateFormat.java
@@ -1226,8 +1226,10 @@ public class SimpleDateFormat extends DateFormat {
                     // then we ask the timezone to handle this local time
                     int[] offsets = new int[2];
                     tz.getOffset(copy.getTimeInMillis()+tz.getRawOffset(), true, offsets);
+
                     cal.set(Calendar.ZONE_OFFSET, offsets[0]);
                     cal.set(Calendar.DST_OFFSET, offsets[1]);
+                    cal.setTimeZone(tz);
                 }
             }
         }