ICU-10662 Removed 'synchronized' keyword from Calendar/TimeZone factory methods and...

X-SVN-Rev: 35108

diff --git a/.gitattributes b/.gitattributes
index 5b5feb4a149a3609ca3a6fca63c03f9a43bcdc16..75b75b81c8888f9e84afdd95f801ad2511339736 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -593,7 +593,13 @@ icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs -text
 icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs -text
 icu4j/main/tests/translit/translit-tests-build.launch -text
 icu4j/manifest.stub -text
+icu4j/perf-tests/.classpath -text
+icu4j/perf-tests/.project -text
+icu4j/perf-tests/.settings/org.eclipse.core.resources.prefs -text
+icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs -text
+icu4j/perf-tests/.settings/org.eclipse.jdt.ui.prefs -text
 icu4j/perf-tests/data/icuperf2report.xsl -text
+icu4j/perf-tests/src/com/ibm/icu/dev/test/perf/ServiceObjectCreationPerf.java -text
 icu4j/samples/build.properties -text
 icu4j/samples/manifest.stub -text
 icu4j/samples/src/com/ibm/icu/samples/iuc/data/popmsg/es.res -text

diff --git a/icu4j/build.xml b/icu4j/build.xml
index 114e87d10c1fbec1083954b890e29d07dd0e270f..0e0c95a55e8c3dc9b033061f50607829e536ae66 100644 (file)
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -126,7 +126,7 @@
         <ant dir="${icu4j.tools.dir}" target="clean" inheritAll="false"/>
         <ant dir="${icu4j.demos.dir}" target="clean" inheritAll="false"/>
         <ant dir="${icu4j.samples.dir}" target="clean" inheritAll="false"/>
-        <ant dir="${icu4j.perf.dir}" target="clean" inheritAll="false"/>
+        <ant dir="${icu4j.perf-tests.dir}" target="clean" inheritAll="false"/>
 
         <!-- delete all .jar files root directory -->
         <delete>
@@ -148,7 +148,7 @@
     </target>
 
     <!-- meta build targets -->
-    <target name="all" depends="info, main, tests, build-tools, tools, demos, samples, perf, jar, docs" description="Build all primary targets"/>
+    <target name="all" depends="info, main, tests, build-tools, tools, demos, samples, perf-tests, jar, docs" description="Build all primary targets"/>
     <target name="main" depends="info, core, collate, charset, currdata, langdata, regiondata, translit, localespi" description="Build ICU4J runtime library classes"/>
     <target name="tests" depends="info, core-tests, charset-tests, collate-tests, packaging-tests, translit-tests, testall, localespi-tests" description="Build ICU4J test classes"/>
 
@@ -392,7 +392,7 @@
         </jar>
     </target>
 
-       <target name="icu4jSrcJar" description="Build icu4j-src.jar">
+    <target name="icu4jSrcJar" description="Build icu4j-src.jar">
         <jar jarfile="${icu4j-src.jar.file}"
                 compress="true">
             <fileset dir="${icu4j.core.dir}/${src.dir}" includes="**/*.java"/>
@@ -405,7 +405,7 @@
                 <include name="license.html"/>
             </fileset>
         </jar>
-       </target>
+    </target>
 
     <target name="icu4jtestsJar" depends="info, tests" description="Build ICU4J all-in-one test jar">
         <jar jarfile="${icu4jtests.jar.file}"
@@ -723,8 +723,9 @@
     <target name="tools" depends="core, core-tests, collate, translit, translit-tests" description="Build tool classes">
         <ant dir="${icu4j.tools.dir}" inheritAll="false"/>
     </target>
-    <target name="perf" depends="core, charset, collate, tools" description="Build performance test classes">
-        <ant dir="${icu4j.perf.dir}" inheritAll="false"/>
+
+    <target name="perf-tests" if="is.java6.plus" depends="core, charset, collate, tools" description="Build performance test classes">
+        <ant dir="${icu4j.perf-tests.dir}" inheritAll="false"/>
     </target>
 
     <!-- doc targets -->

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
index a8ed9617ba23b3222b03d0762baeaf2b319f6e6d..796c52a40c56795b920000afdc923c992e77c301 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
@@ -1681,7 +1681,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return a Calendar.
      * @stable ICU 2.0
      */
-    public static synchronized Calendar getInstance()
+    public static Calendar getInstance()
     {
         return getInstanceInternal(null, null);
     }
@@ -1692,7 +1692,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return a Calendar.
      * @stable ICU 2.0
      */
-    public static synchronized Calendar getInstance(TimeZone zone)
+    public static Calendar getInstance(TimeZone zone)
     {
         return getInstanceInternal(zone, null);
     }
@@ -1703,7 +1703,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return a Calendar.
      * @stable ICU 2.0
      */
-    public static synchronized Calendar getInstance(Locale aLocale)
+    public static Calendar getInstance(Locale aLocale)
     {
         return getInstanceInternal(null, ULocale.forLocale(aLocale));
     }
@@ -1714,7 +1714,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return a Calendar.
      * @stable ICU 3.2
      */
-    public static synchronized Calendar getInstance(ULocale locale)
+    public static Calendar getInstance(ULocale locale)
     {
         return getInstanceInternal(null, locale);
     }
@@ -1726,8 +1726,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return a Calendar.
      * @stable ICU 2.0
      */
-    public static synchronized Calendar getInstance(TimeZone zone,
-                                                    Locale aLocale) {
+    public static Calendar getInstance(TimeZone zone, Locale aLocale) {
         return getInstanceInternal(zone, ULocale.forLocale(aLocale));
     }
 
@@ -1738,8 +1737,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
      * @return a Calendar.
      * @stable ICU 3.2
      */
-    public static synchronized Calendar getInstance(TimeZone zone,
-                                                    ULocale locale) {
+    public static Calendar getInstance(TimeZone zone, ULocale locale) {
         return getInstanceInternal(zone, locale);
     }
 

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java
index af7804a11ccfcbd63b2986bfc0fb28c9a86f1129..35904b18c7a481d20578bb1e2b2b030f47e1b552 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/TimeZone.java
@@ -1,7 +1,7 @@
 /*
  * @(#)TimeZone.java    1.51 00/01/19
  *
- * Copyright (C) 1996-2013, International Business Machines
+ * Copyright (C) 1996-2014, International Business Machines
  * Corporation and others.  All Rights Reserved.
  */
 
@@ -745,7 +745,7 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
      * @return the specified <code>TimeZone</code> or UNKNOWN_ZONE if the given ID
      * cannot be understood.
      */
-    private static synchronized TimeZone getTimeZone(String ID, int type, boolean frozen) {
+    private static TimeZone getTimeZone(String ID, int type, boolean frozen) {
         TimeZone result;
         if (type == TIMEZONE_JDK) {
             result = JavaTimeZone.createTimeZone(ID);
@@ -919,13 +919,17 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
      * @return a default <code>TimeZone</code>.
      * @stable ICU 2.0
      */
-    public static synchronized TimeZone getDefault() {
+    public static TimeZone getDefault() {
         if (defaultZone == null) {
-            if (TZ_IMPL == TIMEZONE_JDK) {
-                defaultZone = new JavaTimeZone();
-            } else {
-                java.util.TimeZone temp = java.util.TimeZone.getDefault();
-                defaultZone = getFrozenTimeZone(temp.getID());
+            synchronized(TimeZone.class) {
+                if (defaultZone == null) {
+                    if (TZ_IMPL == TIMEZONE_JDK) {
+                        defaultZone = new JavaTimeZone();
+                    } else {
+                        java.util.TimeZone temp = java.util.TimeZone.getDefault();
+                        defaultZone = getFrozenTimeZone(temp.getID());
+                    }
+                }
             }
         }
         return defaultZone.cloneAsThawed();
@@ -1275,7 +1279,7 @@ abstract public class TimeZone implements Serializable, Cloneable, Freezable<Tim
     /**
      * The default time zone, or null if not set.
      */
-    private static TimeZone  defaultZone = null;
+    private static volatile TimeZone  defaultZone = null;
 
     /**
      * The tzdata version

diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml
index 53d4a3f61dba8ff160f14c11bc0eca221d6f72e4..fcac726a882d201608d934b3bf14010c099dc34b 100644 (file)
--- a/icu4j/main/shared/build/common-targets.xml
+++ b/icu4j/main/shared/build/common-targets.xml
@@ -1,6 +1,6 @@
 <!--
 *******************************************************************************
-* Copyright (C) 2009-2013, International Business Machines Corporation and    *
+* Copyright (C) 2009-2014, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 -->
@@ -364,12 +364,15 @@
     </target>
 
     <!-- perf -->
-    <path id="javac.classpathref.perf">
+    <path id="javac.classpathref.perf-tests">
         <pathelement location="${icu4j.core.jar}"/>
         <pathelement location="${icu4j.charset.jar}"/>
         <pathelement location="${icu4j.collate.jar}"/>
         <pathelement location="${icu4j.tools.jar}"/>
     </path>
 
+    <target name="_all.perf-tests" depends="_all.core, _all.charset, _all.collate, _all.tools">
+        <ant dir="${icu4j.perf-tests.dir}" inheritAll="false"/>
+    </target>
 
 </project>

diff --git a/icu4j/main/shared/build/locations-eclipse.properties b/icu4j/main/shared/build/locations-eclipse.properties
index c2812886d048a60603ce7f6fd980739fba396042..ecba731be47dcdfdda2ac9258574bfcd192dc02a 100644 (file)
--- a/icu4j/main/shared/build/locations-eclipse.properties
+++ b/icu4j/main/shared/build/locations-eclipse.properties
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#* Copyright (C) 2009-2013, International Business Machines Corporation and    *
+#* Copyright (C) 2009-2014, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
 shared.dir = ${workspace_loc:/icu4j-shared}
@@ -27,3 +27,5 @@ icu4j.tools.dir = ${workspace_loc:/icu4j-tools}
 
 icu4j.demos.dir = ${workspace_loc:/icu4j-demos}
 icu4j.samples.dir = ${workspace_loc:/icu4j-samples}
+
+icu4j.perf-tests.dir = ${workspace_loc:/icu4j-perf-tests}

diff --git a/icu4j/main/shared/build/locations.properties b/icu4j/main/shared/build/locations.properties
index 7c03d29c8f0b2ce94f5c30f8eef6eab3691f6120..f622b33a73d3f144ade1b8e7c26c5dd0e3261b87 100644 (file)
--- a/icu4j/main/shared/build/locations.properties
+++ b/icu4j/main/shared/build/locations.properties
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#* Copyright (C) 2009-2013, International Business Machines Corporation and         *
+#* Copyright (C) 2009-2014, International Business Machines Corporation and         *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
 
@@ -27,4 +27,4 @@ icu4j.tools.dir = ${shared.dir}/../../tools/misc
 icu4j.demos.dir = ${shared.dir}/../../demos
 icu4j.samples.dir = ${shared.dir}/../../samples
 
-icu4j.perf.dir = ${shared.dir}/../../perf-tests
+icu4j.perf-tests.dir = ${shared.dir}/../../perf-tests

diff --git a/icu4j/perf-tests/.classpath b/icu4j/perf-tests/.classpath
new file mode 100644 (file)
index 0000000..61c7b4a
--- /dev/null
+++ b/icu4j/perf-tests/.classpath
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-charset"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-collate"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-core"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-currdata"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-langdata"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-regiondata"/>\r
+       <classpathentry combineaccessrules="false" kind="src" path="/icu4j-tools"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="output" path="out/bin"/>\r
+</classpath>\r

diff --git a/icu4j/perf-tests/.project b/icu4j/perf-tests/.project
new file mode 100644 (file)
index 0000000..9803fd0
--- /dev/null
+++ b/icu4j/perf-tests/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>icu4j-perf-tests</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/icu4j/perf-tests/.settings/org.eclipse.core.resources.prefs b/icu4j/perf-tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..c62da78
--- /dev/null
+++ b/icu4j/perf-tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Fri Nov 05 14:18:21 EDT 2010\r
+eclipse.preferences.version=1\r
+encoding/<project>=UTF-8\r

diff --git a/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs b/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..0b56883
--- /dev/null
+++ b/icu4j/perf-tests/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,329 @@
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\r
+org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate\r
+org.eclipse.jdt.core.compiler.debug.localVariable=generate\r
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate\r
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning\r
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore\r
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning\r
+org.eclipse.jdt.core.compiler.problem.deadCode=ignore\r
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore\r
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled\r
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled\r
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning\r
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore\r
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore\r
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled\r
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore\r
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore\r
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning\r
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error\r
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning\r
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning\r
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore\r
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore\r
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore\r
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning\r
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore\r
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore\r
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore\r
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning\r
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore\r
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning\r
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning\r
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore\r
+org.eclipse.jdt.core.compiler.problem.nullReference=warning\r
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning\r
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore\r
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore\r
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore\r
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore\r
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore\r
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore\r
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled\r
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning\r
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled\r
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore\r
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning\r
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore\r
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore\r
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning\r
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore\r
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore\r
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore\r
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore\r
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled\r
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled\r
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled\r
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning\r
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning\r
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning\r
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore\r
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled\r
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled\r
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled\r
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning\r
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning\r
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning\r
+org.eclipse.jdt.core.compiler.source=1.6\r
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16\r
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16\r
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0\r
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16\r
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16\r
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80\r
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0\r
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16\r
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16\r
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16\r
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16\r
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16\r
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1\r
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0\r
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0\r
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1\r
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0\r
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1\r
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1\r
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line\r
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line\r
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false\r
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false\r
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true\r
+org.eclipse.jdt.core.formatter.comment.format_header=false\r
+org.eclipse.jdt.core.formatter.comment.format_html=true\r
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true\r
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true\r
+org.eclipse.jdt.core.formatter.comment.format_source_code=true\r
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true\r
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true\r
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert\r
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert\r
+org.eclipse.jdt.core.formatter.comment.line_length=120\r
+org.eclipse.jdt.core.formatter.compact_else_if=true\r
+org.eclipse.jdt.core.formatter.continuation_indentation=2\r
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2\r
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true\r
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true\r
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true\r
+org.eclipse.jdt.core.formatter.indent_empty_lines=false\r
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true\r
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true\r
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true\r
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false\r
+org.eclipse.jdt.core.formatter.indentation.size=4\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert\r
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert\r
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert\r
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false\r
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false\r
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false\r
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false\r
+org.eclipse.jdt.core.formatter.lineSplit=120\r
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false\r
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false\r
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0\r
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1\r
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true\r
+org.eclipse.jdt.core.formatter.tabulation.char=space\r
+org.eclipse.jdt.core.formatter.tabulation.size=4\r
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false\r
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true\r

diff --git a/icu4j/perf-tests/.settings/org.eclipse.jdt.ui.prefs b/icu4j/perf-tests/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644 (file)
index 0000000..5f9b341
--- /dev/null
+++ b/icu4j/perf-tests/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,10 @@
+#Wed Jun 17 11:10:12 EDT 2009\r
+eclipse.preferences.version=1\r
+formatter_profile=_ICU4J Standard\r
+formatter_settings_version=11\r
+org.eclipse.jdt.ui.ignorelowercasenames=true\r
+org.eclipse.jdt.ui.importorder=java;javax;org;com;\r
+org.eclipse.jdt.ui.javadoc=true\r
+org.eclipse.jdt.ui.ondemandthreshold=99\r
+org.eclipse.jdt.ui.staticondemandthreshold=99\r
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\r\n *******************************************************************************\r\n * Copyright (C) ${year}, International Business Machines Corporation and         *\r\n * others. All Rights Reserved.                                                *\r\n *******************************************************************************\r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>\r

diff --git a/icu4j/perf-tests/build.properties b/icu4j/perf-tests/build.properties
index 25729566eb9f4b3f1aeaf2b473c8f4f9a80454c1..5783d03170fda3a041b0454e803fb8d1bebda894 100644 (file)
--- a/icu4j/perf-tests/build.properties
+++ b/icu4j/perf-tests/build.properties
@@ -1,5 +1,8 @@
 #*******************************************************************************
-#* Copyright (C) 2011, International Business Machines Corporation and         *
+#* Copyright (C) 2011-2014, International Business Machines Corporation and    *
 #* others. All Rights Reserved.                                                *
 #*******************************************************************************
 shared.dir = ../main/shared
+
+javac.source = 1.6
+javac.target = 1.6
\ No newline at end of file

diff --git a/icu4j/perf-tests/build.xml b/icu4j/perf-tests/build.xml
index d0bc4a122c1b24c0bda3f2bfb05cd4712f3630bc..8c987a08a0e78010e55326da432a3425a3d14879 100644 (file)
--- a/icu4j/perf-tests/build.xml
+++ b/icu4j/perf-tests/build.xml
@@ -1,10 +1,10 @@
 <!--
 *******************************************************************************
-* Copyright (C) 2012, International Business Machines Corporation and    *
+* Copyright (C) 2012-2014, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 -->
-<project name="perf" default="build" basedir=".">
+<project name="perf-tests" default="build" basedir=".">
     <property file="build-local.properties"/>
     <property file="build.properties"/>
     <import file="${shared.dir}/build/common-targets.xml"/>
@@ -12,15 +12,6 @@
     <path id="javac.classpathref">
         <path refid="javac.classpathref.${ant.project.name}"/>
     </path>
-
-    <!-- Java version check -->
-    <condition property="is.java6.plus">
-        <or>
-            <contains string="${java.version}" substring="1.6."/>
-            <contains string="${java.version}" substring="1.7."/>
-        </or>
-    </condition>
-
     <property name="jar.name" value="icu4j-${ant.project.name}.jar"/>
     <property name="src.jar.name" value="icu4j-${ant.project.name}-src.jar"/>
 
@@ -30,30 +21,7 @@
 
     <target name="clean" depends="@clean" description="Clean up the build outputs"/>
 
-    <target name="compile" description="Compile java source files">
-        <mkdir dir="${bin.dir}"/>
-        <javac
-            srcdir="${src.dir}"
-            destdir="${bin.dir}"
-            classpathref="javac.classpathref"
-            source="${javac.source}"
-            target="${javac.target}"
-            debug="${javac.debug}"
-            encoding="${java.src.encoding}"
-            includeAntRuntime="no">
-            <include name="com/ibm/icu/dev/test/perf/BreakIteratorPerformanceTest.java"/>
-            <include name="com/ibm/icu/dev/test/perf/CollationPerformanceTest.java"/>
-            <include name="com/ibm/icu/dev/test/perf/ConverterPerformanceTest.java"/>
-            <include name="com/ibm/icu/dev/test/perf/DateFormatPerformanceTest.java"/>
-            <include name="com/ibm/icu/dev/test/perf/DecimalFormatPerformanceTest.java"/>
-            <include name="com/ibm/icu/dev/test/perf/NormalizerPerformanceTest.java" if="is.java6.plus"/>
-            <include name="com/ibm/icu/dev/test/perf/PerfTest.java"/>
-            <include name="com/ibm/icu/dev/test/perf/RBBIPerf.java"/>
-            <include name="com/ibm/icu/dev/test/perf/ResourceBundlePerf.java"/>
-            <include name="com/ibm/icu/dev/test/perf/UCharacterPerf.java"/>
-            <include name="com/ibm/icu/dev/test/perf/UnicodeSetPerf.java"/>
-        </javac>
-    </target>
+    <target name="compile" depends="@compile" description="Compile java source files"/>
 
     <target name="copy" depends="@copy" description="Copy non-java runtime files to the project's binary directory"/>
 
@@ -61,10 +29,10 @@
 
     <target name="src-jar" depends="@src-jar" description="Create the project's source jar file"/>
 
-       <target name="continuous-build" description="Run performance tests for continuous build">
-       <property name="perl" value="perl" />
-       <exec executable="${perl}">
-           <arg value="perftests.pl" />
+    <target name="continuous-build" description="Run performance tests for continuous build">
+        <property name="perl" value="perl"/>
+        <exec executable="${perl}">
+            <arg value="perftests.pl"/>
         </exec>
     </target>
 </project>

diff --git a/icu4j/perf-tests/src/com/ibm/icu/dev/test/perf/ServiceObjectCreationPerf.java b/icu4j/perf-tests/src/com/ibm/icu/dev/test/perf/ServiceObjectCreationPerf.java
new file mode 100644 (file)
index 0000000..1cd50c5
--- /dev/null
+++ b/icu4j/perf-tests/src/com/ibm/icu/dev/test/perf/ServiceObjectCreationPerf.java
@@ -0,0 +1,80 @@
+/*\r
+ *******************************************************************************\r
+ * Copyright (C) 2014, International Business Machines Corporation and         *\r
+ * others. All Rights Reserved.                                                *\r
+ *******************************************************************************\r
+ */\r
+package com.ibm.icu.dev.test.perf;\r
+\r
+\r
+/**\r
+ * ICU service object creation performance test cases\r
+ */\r
+public class ServiceObjectCreationPerf extends PerfTest {\r
+    private static final long DEF_COUNT = 1000L;\r
+\r
+    public static void main(String... args) throws Exception {\r
+        new ServiceObjectCreationPerf().run(args);\r
+    }\r
+\r
+    PerfTest.Function TestCalendarJava() {\r
+        return new PerfTest.Function() {\r
+            private long n = DEF_COUNT;\r
+            public void call() {\r
+                for (long i = 0; i < n; i++) {\r
+                    @SuppressWarnings("unused")\r
+                    java.util.Calendar cal = java.util.Calendar.getInstance();\r
+                }\r
+            }\r
+            public long getOperationsPerIteration() {\r
+                return n;\r
+            }\r
+        };\r
+    }\r
+\r
+    PerfTest.Function TestCalendarICU() {\r
+        return new PerfTest.Function() {\r
+            private long n = DEF_COUNT;\r
+            public void call() {\r
+                for (long i = 0; i < n; i++) {\r
+                    @SuppressWarnings("unused")\r
+                    com.ibm.icu.util.Calendar cal = com.ibm.icu.util.Calendar.getInstance();\r
+                }\r
+            }\r
+            public long getOperationsPerIteration() {\r
+                return n;\r
+            }\r
+        };\r
+    }\r
+\r
+    PerfTest.Function TestTimeZoneJava() {\r
+        return new PerfTest.Function() {\r
+            private long n = DEF_COUNT;\r
+            public void call() {\r
+                for (long i = 0; i < n; i++) {\r
+                    @SuppressWarnings("unused")\r
+                    java.util.TimeZone tz = java.util.TimeZone.getDefault();\r
+                }\r
+            }\r
+            public long getOperationsPerIteration() {\r
+                return n;\r
+            }\r
+        };\r
+    }\r
+\r
+    PerfTest.Function TestTimeZoneICU() {\r
+        return new PerfTest.Function() {\r
+            private long n = DEF_COUNT;\r
+            public void call() {\r
+                for (long i = 0; i < n; i++) {\r
+                    @SuppressWarnings("unused")\r
+                    com.ibm.icu.util.TimeZone tz = com.ibm.icu.util.TimeZone.getDefault();\r
+                }\r
+            }\r
+            public long getOperationsPerIteration() {\r
+                return n;\r
+            }\r
+        };\r
+    }\r
+\r
+}\r