Avoid sealed package violation: Move AutoCloseable to com.jogamp.opencl

6 files changed, 7 insertions, 8 deletions

diff --git a/make/build.xml b/make/build.xml
index 887c257b..2e5126de 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -280,8 +280,8 @@
 
     <target name="generate.jdk7.autocloseable" if="${enable.jdk7.features}">
         <echo message="Generating JDK7+ AutoCloseable"/>
-        <copy file="${project.root}/src/com/jogamp/common/AutoCloseable.jtemplate"
-            tofile="${build}/gensrc/java/com/jogamp/common/AutoCloseable.java" overwrite="true">
+        <copy file="${project.root}/src/com/jogamp/opencl/AutoCloseable.jtemplate"
+            tofile="${build}/gensrc/java/com/jogamp/opencl/AutoCloseable.java" overwrite="true">
             <filterchain>
                 <replaceregex pattern="/\*extends java.lang.AutoCloseable\*/" replace="extends java.lang.AutoCloseable"/>
             </filterchain>
@@ -290,8 +290,8 @@
 
     <target name="generate.jdk6.autocloseable" unless="${enable.jdk7.features}">
         <echo message="Generating JDK6 AutoCloseable"/>
-        <copy file="${project.root}/src/com/jogamp/common/AutoCloseable.jtemplate"
-            tofile="${build}/gensrc/java/com/jogamp/common/AutoCloseable.java" overwrite="true">
+        <copy file="${project.root}/src/com/jogamp/opencl/AutoCloseable.jtemplate"
+            tofile="${build}/gensrc/java/com/jogamp/opencl/AutoCloseable.java" overwrite="true">
         </copy>      
     </target>
 
diff --git a/make/joclversion-test b/make/joclversion-test
index ed11ebe6..b43b3927 100644
--- a/make/joclversion-test
+++ b/make/joclversion-test
@@ -12,3 +12,4 @@ Implementation-Vendor: JogAmp Community
 Implementation-URL: http://jogamp.org/
 Extension-Name: com.jogamp.opencl.test
 Implementation-Vendor-Id: com.jogamp
+
diff --git a/make/joclversion-test-android b/make/joclversion-test-android
index ed11ebe6..b43b3927 100644
--- a/make/joclversion-test-android
+++ b/make/joclversion-test-android
@@ -12,3 +12,4 @@ Implementation-Vendor: JogAmp Community
 Implementation-URL: http://jogamp.org/
 Extension-Name: com.jogamp.opencl.test
 Implementation-Vendor-Id: com.jogamp
+
diff --git a/src/com/jogamp/common/AutoCloseable.jtemplate b/src/com/jogamp/opencl/AutoCloseable.jtemplate
index a77e3df2..d9f4f57a 100644
--- a/src/com/jogamp/common/AutoCloseable.jtemplate
+++ b/src/com/jogamp/opencl/AutoCloseable.jtemplate
@@ -26,7 +26,7 @@
  * or implied, of JogAmp Community.
  */
 
-package com.jogamp.common;
+package com.jogamp.opencl;
 
 /**
  * import of JDK7's ARM interface allowing JDK6 backwards compatibility.
diff --git a/src/com/jogamp/opencl/CLEventList.java b/src/com/jogamp/opencl/CLEventList.java
index debebc4e..56181cfa 100644
--- a/src/com/jogamp/opencl/CLEventList.java
+++ b/src/com/jogamp/opencl/CLEventList.java
@@ -28,7 +28,6 @@
 
 package com.jogamp.opencl;
 
-import com.jogamp.common.AutoCloseable;
 import com.jogamp.common.nio.CachedBufferFactory;
 import com.jogamp.common.nio.PointerBuffer;
 import java.util.Iterator;
diff --git a/src/com/jogamp/opencl/CLObjectResource.java b/src/com/jogamp/opencl/CLObjectResource.java
index 031199e8..d4686fde 100644
--- a/src/com/jogamp/opencl/CLObjectResource.java
+++ b/src/com/jogamp/opencl/CLObjectResource.java
@@ -31,8 +31,6 @@
  */
 package com.jogamp.opencl;
 
-import com.jogamp.common.AutoCloseable;
-
 /**
  * Releasable resource with an CL object ID.
  * @author Michael Bien, et al.