commit 39ca6ba799eda09c30454eda1b3c4e56906d3231
author Yoshito Umaoka <y.umaoka@gmail.com> Wed May 23 21:27:07 2012 +0000
committer Yoshito Umaoka <y.umaoka@gmail.com> Wed May 23 21:27:07 2012 +0000
tree e2fb8c9490f023ce73b1264357ecc86b2dcff2ac
parent 1bbfab5a2065455d0b774aad4c83679bd1ade1bc

ICU-9231 Merge the fix for ICU4J jar main problem (#9289 - r31777, r31795) to ICU4J 49 maintenance stream.

X-SVN-Rev: 31850

main/classes/core/src/com/ibm/icu/util/VersionInfo.java

diff --git a/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
index 9e665c5..170aa82 100644
--- a/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -535,20 +535,30 @@
     public static void main(String[] args) {
         String icuApiVer;
 
-        if (ICU_VERSION.getMinor() % 2 != 0) {
-            // Development mile stone
-            int major = ICU_VERSION.getMajor();
-            int minor = ICU_VERSION.getMinor() + 1;
-            if (minor >= 10) {
-                minor -= 10;
-                major++;
+        if (ICU_VERSION.getMajor() <= 4) {
+            if (ICU_VERSION.getMinor() % 2 != 0) {
+                // Development mile stone
+                int major = ICU_VERSION.getMajor();
+                int minor = ICU_VERSION.getMinor() + 1;
+                if (minor >= 10) {
+                    minor -= 10;
+                    major++;
+                }
+                icuApiVer = "" + major + "." + minor + "M" + ICU_VERSION.getMilli();
+            } else {
+                icuApiVer = ICU_VERSION.getVersionString(2, 2);
             }
-            icuApiVer = "" + major + "." + minor + "M" + ICU_VERSION.getMilli();
         } else {
-            icuApiVer = ICU_VERSION.getVersionString(2, 2);
+            if (ICU_VERSION.getMinor() == 0) {
+                // Development mile stone
+                icuApiVer = "" + ICU_VERSION.getMajor() + "M" + ICU_VERSION.getMilli();
+            } else {
+                icuApiVer = ICU_VERSION.getVersionString(2, 2);
+            }
         }
 
-        System.out.println("International Component for Unicode for Java " + icuApiVer);
+
+        System.out.println("International Components for Unicode for Java " + icuApiVer);
 
         System.out.println("");
         System.out.println("Implementation Version: " + ICU_VERSION.getVersionString(2, 4));