harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ton...@apache.org
Subject svn commit: r727987 - /harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
Date Fri, 19 Dec 2008 09:40:35 GMT
Author: tonywu
Date: Fri Dec 19 01:40:34 2008
New Revision: 727987

URL: http://svn.apache.org/viewvc?rev=727987&view=rev
Log:
resolve a merge error

Modified:
    harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java

Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java?rev=727987&r1=727986&r2=727987&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
(original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ResourceBundleTest.java
Fri Dec 19 01:40:34 2008
@@ -375,9 +375,11 @@
         }
     }
 
-	protected void setUp() {
-	}
-
+	/**
+     * The control with given formats.
+     */
+    static class GivenFormatsControl extends Control {
+        List<String> formats;
         GivenFormatsControl(List<String> theFormats) {
             super();
             formats = theFormats;



Mime
View raw message