diff options
| author | Michael Bien <[email protected]> | 2011-02-09 15:04:48 +0100 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2011-02-09 15:04:48 +0100 |
| commit | e20879b9f124ecca8bc7467013e118d1b7f5782b (patch) | |
| tree | 30b0fe9a9d048a3a55264798a993929c5f848e25 /src | |
| parent | 1f3c9cfe8d1c5890780ad150b23b7cdb0d8e7692 (diff) | |
| parent | 67dfcd32379b50dd451a1e979096e30e24ad0e68 (diff) | |
Merge branch 'master' of github.com:sgothel/gluegen
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/jogamp/common/jvm/JNILibLoaderBase.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/jvm/JVMUtil.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/ReflectionUtil.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/locks/Lock.java | 2 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/locks/RecursiveLock.java | 2 | ||||
| -rw-r--r-- | src/java/jogamp/common/Debug.java (renamed from src/java/com/jogamp/common/impl/Debug.java) | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java index e80c225..cbc5959 100644 --- a/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java +++ b/src/java/com/jogamp/common/jvm/JNILibLoaderBase.java @@ -46,7 +46,7 @@ import java.lang.reflect.Method; import java.security.AccessController; import java.security.AccessControlContext; import java.util.HashSet; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; public class JNILibLoaderBase { public static final boolean DEBUG = Debug.debug("JNILibLoader"); diff --git a/src/java/com/jogamp/common/jvm/JVMUtil.java b/src/java/com/jogamp/common/jvm/JVMUtil.java index 833e907..fda7f74 100644 --- a/src/java/com/jogamp/common/jvm/JVMUtil.java +++ b/src/java/com/jogamp/common/jvm/JVMUtil.java @@ -34,7 +34,7 @@ package com.jogamp.common.jvm; import java.nio.ByteBuffer; import com.jogamp.common.nio.Buffers; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import com.jogamp.gluegen.runtime.NativeLibLoader; /** diff --git a/src/java/com/jogamp/common/util/ReflectionUtil.java b/src/java/com/jogamp/common/util/ReflectionUtil.java index a04a160..c6b1b88 100644 --- a/src/java/com/jogamp/common/util/ReflectionUtil.java +++ b/src/java/com/jogamp/common/util/ReflectionUtil.java @@ -39,7 +39,7 @@ package com.jogamp.common.util; import java.lang.reflect.*; import com.jogamp.common.JogampRuntimeException; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; public final class ReflectionUtil { diff --git a/src/java/com/jogamp/common/util/locks/Lock.java b/src/java/com/jogamp/common/util/locks/Lock.java index 7065ff8..4ea8bf4 100644 --- a/src/java/com/jogamp/common/util/locks/Lock.java +++ b/src/java/com/jogamp/common/util/locks/Lock.java @@ -28,7 +28,7 @@ package com.jogamp.common.util.locks; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import java.security.AccessController; /** diff --git a/src/java/com/jogamp/common/util/locks/RecursiveLock.java b/src/java/com/jogamp/common/util/locks/RecursiveLock.java index de61451..4f8415e 100644 --- a/src/java/com/jogamp/common/util/locks/RecursiveLock.java +++ b/src/java/com/jogamp/common/util/locks/RecursiveLock.java @@ -28,7 +28,7 @@ package com.jogamp.common.util.locks; -import com.jogamp.common.impl.Debug; +import jogamp.common.Debug; import java.security.AccessController; import java.util.LinkedList; diff --git a/src/java/com/jogamp/common/impl/Debug.java b/src/java/jogamp/common/Debug.java index d8412ae..e425e9c 100644 --- a/src/java/com/jogamp/common/impl/Debug.java +++ b/src/java/jogamp/common/Debug.java @@ -37,7 +37,7 @@ * and developed by Kenneth Bradley Russell and Christopher John Kline. */ -package com.jogamp.common.impl; +package jogamp.common; import java.security.*; |