From f9214217defbcc2a640e80a68f1270ee1e428cf2 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 25 Jan 2014 16:20:30 +0100
Subject: Avoid sealed package violation: Move AutoCloseable to
com.jogamp.opencl
---
make/build.xml | 8 +++---
make/joclversion-test | 1 +
make/joclversion-test-android | 1 +
src/com/jogamp/common/AutoCloseable.jtemplate | 36 ---------------------------
src/com/jogamp/opencl/AutoCloseable.jtemplate | 36 +++++++++++++++++++++++++++
src/com/jogamp/opencl/CLEventList.java | 1 -
src/com/jogamp/opencl/CLObjectResource.java | 2 --
7 files changed, 42 insertions(+), 43 deletions(-)
delete mode 100644 src/com/jogamp/common/AutoCloseable.jtemplate
create mode 100644 src/com/jogamp/opencl/AutoCloseable.jtemplate
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/common/AutoCloseable.jtemplate
deleted file mode 100644
index a77e3df2..00000000
--- a/src/com/jogamp/common/AutoCloseable.jtemplate
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2009 - 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;
-
-/**
- * import of JDK7's ARM interface allowing JDK6 backwards compatibility.
- */
-public interface AutoCloseable /*extends java.lang.AutoCloseable*/ {
- void close() throws Exception;
-}
diff --git a/src/com/jogamp/opencl/AutoCloseable.jtemplate b/src/com/jogamp/opencl/AutoCloseable.jtemplate
new file mode 100644
index 00000000..d9f4f57a
--- /dev/null
+++ b/src/com/jogamp/opencl/AutoCloseable.jtemplate
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2009 - 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.opencl;
+
+/**
+ * import of JDK7's ARM interface allowing JDK6 backwards compatibility.
+ */
+public interface AutoCloseable /*extends java.lang.AutoCloseable*/ {
+ void close() throws Exception;
+}
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.
--
cgit v1.2.3