diff options
author | Sven Gothel <[email protected]> | 2013-10-25 01:50:34 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2013-10-25 01:50:34 +0200 |
commit | 472dae2dd6bafcd1d867b090369c359417db0d8d (patch) | |
tree | 42ff815fba3bac9e5f7ef82d2d208e9851ce603c /src/nativewindow | |
parent | 7b6fe9e4d26b4d3ff2a9ffac12523bcd29196db0 (diff) | |
parent | 445e6117edb0ce3545d01065a067fb7a751db030 (diff) |
Merge remote-tracking branch 'hharrison/master'
Diffstat (limited to 'src/nativewindow')
-rw-r--r-- | src/nativewindow/classes/com/jogamp/nativewindow/awt/DirectDataBufferInt.java | 6 | ||||
-rw-r--r-- | src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java | 5 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/awt/DirectDataBufferInt.java b/src/nativewindow/classes/com/jogamp/nativewindow/awt/DirectDataBufferInt.java index c02fc0a04..eeec66376 100644 --- a/src/nativewindow/classes/com/jogamp/nativewindow/awt/DirectDataBufferInt.java +++ b/src/nativewindow/classes/com/jogamp/nativewindow/awt/DirectDataBufferInt.java @@ -70,9 +70,9 @@ public final class DirectDataBufferInt extends DataBuffer { @Override public String toString() { - return new String("BufferedImageInt@"+Integer.toHexString(hashCode()) - +": custom/internal type = "+customImageType+"/"+getType() - +" "+getColorModel()+" "+getRaster()); + return "BufferedImageInt@"+Integer.toHexString(hashCode()) + +": custom/internal type = "+customImageType+"/"+getType() + +" "+getColorModel()+" "+getRaster(); } } diff --git a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java index 2576c7db1..02e43791c 100644 --- a/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java +++ b/src/nativewindow/classes/jogamp/nativewindow/x11/X11Util.java @@ -326,11 +326,6 @@ public class X11Util implements ToolkitProperties { public final Throwable getCreationStack() { return creationStack; } @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - @Override public String toString() { return "NamedX11Display["+name+", 0x"+Long.toHexString(handle)+", refCount "+refCount+", unCloseable "+unCloseable+"]"; } |