Refined VersionInfo (seperator/new-line)

3 files changed, 13 insertions, 16 deletions

diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index b563f74..cfc3928 100644
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -33,18 +33,17 @@ D_ARGS="-Djogamp.debug.TraceLock"
 function onetest() {
     clazz=$1
     shift
-    echo $clazz
     java $D_ARGS -Djava.library.path=$builddir/obj:$builddir/test/build/natives -classpath lib/junit.jar:$ANT_JARS:$builddir/gluegen-rt.jar:$builddir/gluegen.jar:$builddir/test/build/classes $clazz
     echo
 }
 
-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
-onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
-onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.test.TestPointerBufferEndian 2>&1 | tee -a $LOG
diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index aae6d77..2c218ce 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -40,8 +40,6 @@ public class JogampVersion {
     public static Attributes.Name IMPLEMENTATION_BRANCH = new Attributes.Name("Implementation-Branch");
     public static Attributes.Name IMPLEMENTATION_COMMIT = new Attributes.Name("Implementation-Commit");
     
-    protected static final String SEPERATOR = "-----------------------------------------------------------------------------------------------------";
-
     private String packageName;
     private Manifest mf;
     private int hash;
@@ -145,10 +143,6 @@ public class JogampVersion {
         return VersionUtil.getFullManifestInfo(getManifest(), sb);
     }
 
-    public StringBuffer getPlatformInfo(StringBuffer sb) {
-        return VersionUtil.getPlatformInfo(sb);
-    }
-
     public StringBuffer getManifestInfo(StringBuffer sb) {
         if(null==sb) {
             sb = new StringBuffer();
@@ -174,10 +168,9 @@ public class JogampVersion {
             sb = new StringBuffer();
         }
 
-        String nl = Platform.getNewline();
-        sb.append(SEPERATOR).append(nl);
+        sb.append(VersionUtil.SEPERATOR).append(Platform.getNewline());
         getManifestInfo(sb);
-        sb.append(SEPERATOR).append(nl);
+        sb.append(VersionUtil.SEPERATOR);
 
         return sb;
     }
diff --git a/src/java/com/jogamp/common/util/VersionUtil.java b/src/java/com/jogamp/common/util/VersionUtil.java
index 123d1e5..6868175 100644
--- a/src/java/com/jogamp/common/util/VersionUtil.java
+++ b/src/java/com/jogamp/common/util/VersionUtil.java
@@ -40,6 +40,8 @@ import java.util.jar.Manifest;
 
 public class VersionUtil {
 
+    public static final String SEPERATOR = "-----------------------------------------------------------------------------------------------------";
+
     /**
      * Appends environment information like OS, JVM and CPU architecture properties to the StringBuffer.
      */
@@ -48,6 +50,8 @@ public class VersionUtil {
             sb = new StringBuffer();
         }
 
+        sb.append(SEPERATOR).append(Platform.getNewline());
+
         // environment
         sb.append("Platform: ").append(Platform.getOS()).append(' ').append(Platform.getOSVersion()).append(" (os), ");
         sb.append(Platform.getArch()).append(" (arch) ").append(Runtime.getRuntime().availableProcessors()).append(" cores");
@@ -61,14 +65,15 @@ public class VersionUtil {
         // JVM/JRE
         sb.append("Platform: Java ").append(Platform.getJavaVersion()).append(", ").append(System.getProperty("java.vm.name")).append(", ");
         sb.append(Platform.getJavaVendor()).append(", ").append(Platform.getJavaVendorURL()).append(", is JavaSE: ").append(Platform.isJavaSE());
-        sb.append(Platform.getNewline());
+        
+        sb.append(Platform.getNewline()).append(SEPERATOR);
 
         return sb;
     }
 
     /**
-     * Prints platfomr info.
-     * @see #getPlatformInfo(java.lang.StringBuffer) 
+     * Prints platform info.
+     * @see #getPlatformInfo(java.lang.StringBuffer)
      */
     public static String getPlatformInfo() {
         return getPlatformInfo(null).toString();