More intelligent version printer

weld · Dec 2, 2009 · bdb420a · bdb420a
1 parent d66fc55
commit bdb420a
Showing 1 changed file with 31 additions and 13 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/util/Names.java b/impl/src/main/java/org/jboss/weld/util/Names.java
@@ -332,22 +332,40 @@ public static String annotationsToString(Annotation[] annotations)
 
    public static String version(Package pkg)
    {
-      if (pkg != null)
+      if (pkg == null)
       {
-         String version = pkg.getImplementationVersion();
-         if (version != null)
+         throw new IllegalArgumentException("Package can not be null");
+      }
+      else
+      {
+         return version(pkg.getImplementationVersion());
+      }
+   }
+
+   public static String version(String version)
+   {  
+      if (version != null)
+      {
+         StringBuilder builder = new StringBuilder();
+         builder.append(version.substring(0, version.indexOf("."))).append(".");
+         version = version.substring(version.indexOf(".") + 1);
+         builder.append(version.substring(0, version.indexOf("."))).append(".");
+         version = version.substring(version.indexOf(".") + 1);
+         if (version.indexOf("-") > 0)
          {
-            String separator = null;
-            if (version.indexOf("-") > 0)
-            {
-               separator = "-";
-            }
-            else
-            {
-               separator = ".";
-            }
-            return new StringBuilder().append(version.substring(0, version.lastIndexOf(separator))).append(" (").append(version.substring(version.lastIndexOf(separator) + 1)).append(")").toString();
+            builder.append(version.substring(0, version.indexOf("-"))).append(" (");
+            builder.append(version.substring(version.indexOf("-") + 1)).append(")");
+         }
+         else if (version.indexOf(".") > 0)
+         {
+            builder.append(version.substring(0, version.indexOf("."))).append(" (");
+            builder.append(version.substring(version.indexOf(".") + 1)).append(")");
+         }
+         else
+         {
+            builder.append(version);              
          }
+         return builder.toString();
       }
       return "SNAPSHOT";
    }