From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Thu, 26 Apr 2012 18:12:00 +0000 (+0000)
Subject: ICU-9289 Updated jar main to print out correct display name of ICU library with the... 
X-Git-Tag: milestone-59-0-1~3845
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15f6dfa65f0ff8947fb2a544ea8882089091a837;p=icu

ICU-9289 Updated jar main to print out correct display name of ICU library with the new versioning scheme.

X-SVN-Rev: 31777
---

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
index f303ba375c7..25ba2afdc85 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/VersionInfo.java
@@ -535,19 +535,29 @@ public final class VersionInfo implements Comparable<VersionInfo>
     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("");