From 3ed09af3cf9322001d959d13672f6446ddaca643 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 8 Feb 2011 20:39:44 +0100 Subject: jdk7 try-with-resource support --- src/com/jogamp/common/AutoCloseable.jtemplate | 36 +++++++++++++++++++++++++++ src/com/jogamp/opencl/AutoCloseable.java | 34 ------------------------- src/com/jogamp/opencl/CLEventList.java | 4 +++ src/com/jogamp/opencl/CLObject.java | 2 ++ 4 files changed, 42 insertions(+), 34 deletions(-) create mode 100644 src/com/jogamp/common/AutoCloseable.jtemplate delete mode 100644 src/com/jogamp/opencl/AutoCloseable.java (limited to 'src/com/jogamp') diff --git a/src/com/jogamp/common/AutoCloseable.jtemplate b/src/com/jogamp/common/AutoCloseable.jtemplate new file mode 100644 index 00000000..a77e3df2 --- /dev/null +++ b/src/com/jogamp/common/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.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.java b/src/com/jogamp/opencl/AutoCloseable.java deleted file mode 100644 index 383f42a4..00000000 --- a/src/com/jogamp/opencl/AutoCloseable.java +++ /dev/null @@ -1,34 +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.opencl; - -// early import of JDK7's ARM interface for JDK6 backwards compatibility. -public interface AutoCloseable { - void close() throws Exception; -} diff --git a/src/com/jogamp/opencl/CLEventList.java b/src/com/jogamp/opencl/CLEventList.java index 33149377..c20a1f82 100644 --- a/src/com/jogamp/opencl/CLEventList.java +++ b/src/com/jogamp/opencl/CLEventList.java @@ -28,6 +28,7 @@ package com.jogamp.opencl; +import com.jogamp.common.AutoCloseable; import com.jogamp.common.nio.PointerBuffer; import java.util.Iterator; @@ -78,6 +79,9 @@ public final class CLEventList implements CLResource, AutoCloseable, Iterable