com.jogamp.common.util.GlueGenVersion -> com.jogamp.common.GlueGenVersion

5 files changed, 4 insertions, 60 deletions

diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index 996bb3d..4a1fea3 100644
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -38,7 +38,7 @@ function onetest() {
     echo
 }
 
-onetest com.jogamp.common.util.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
diff --git a/src/java/com/jogamp/common/util/GlueGenVersion.java b/src/java/com/jogamp/common/util/GlueGenVersion.java
deleted file mode 100644
index 09cd671..0000000
--- a/src/java/com/jogamp/common/util/GlueGenVersion.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- * 
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- * 
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
- 
-package com.jogamp.common.util;
-
-import java.util.jar.Manifest;
-
-public class GlueGenVersion extends JogampVersion {
-
-    protected static GlueGenVersion jogampCommonVersionInfo;
-
-    protected GlueGenVersion(String packageName, Manifest mf) {
-        super(packageName, mf);
-    }
-
-    public static GlueGenVersion getInstance() {
-        if(null == jogampCommonVersionInfo) {
-            synchronized(GlueGenVersion.class) {
-                if( null == jogampCommonVersionInfo ) {
-                    final String packageName = "com.jogamp.common";
-                    final String fullClazzName = GlueGenVersion.class.getName();
-                    final Manifest mf = VersionUtil.getManifest(GlueGenVersion.class.getClassLoader(), fullClazzName);
-                    jogampCommonVersionInfo = new GlueGenVersion(packageName, mf);
-                }
-            }
-        }
-        return jogampCommonVersionInfo;
-    }
-
-    public static void main(String args[]) {
-        System.err.println(GlueGenVersion.getInstance().getInfo(null));
-    }
-}
diff --git a/src/java/com/jogamp/common/util/JogampVersion.java b/src/java/com/jogamp/common/util/JogampVersion.java
index 229fd13..c169d13 100644
--- a/src/java/com/jogamp/common/util/JogampVersion.java
+++ b/src/java/com/jogamp/common/util/JogampVersion.java
@@ -28,6 +28,7 @@
 
 package com.jogamp.common.util;
 
+import com.jogamp.common.GlueGenVersion;
 import com.jogamp.common.os.Platform;
 import java.util.Iterator;
 import java.util.Set;
diff --git a/src/java/com/jogamp/gluegen/GlueGen.java b/src/java/com/jogamp/gluegen/GlueGen.java
index eccd1ca..d43f2b5 100644
--- a/src/java/com/jogamp/gluegen/GlueGen.java
+++ b/src/java/com/jogamp/gluegen/GlueGen.java
@@ -39,7 +39,7 @@
  */
 package com.jogamp.gluegen;
 
-import com.jogamp.common.util.GlueGenVersion;
+import com.jogamp.common.GlueGenVersion;
 import java.io.*;
 import java.util.*;
 
diff --git a/src/junit/com/jogamp/common/util/TestVersionInfo.java b/src/junit/com/jogamp/common/util/TestVersionInfo.java
index da05e6b..0ed6678 100644
--- a/src/junit/com/jogamp/common/util/TestVersionInfo.java
+++ b/src/junit/com/jogamp/common/util/TestVersionInfo.java
@@ -28,6 +28,7 @@
  
 package com.jogamp.common.util;
 
+import com.jogamp.common.GlueGenVersion;
 import java.io.IOException;
 
 import org.junit.Test;