diff options
Diffstat (limited to 'src/nativewindow/classes/javax')
6 files changed, 19 insertions, 14 deletions
diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java index c728c1634..ffa8bfae6 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java @@ -32,8 +32,6 @@ package javax.media.nativewindow; -import com.jogamp.common.util.ReflectionUtil; - public class DefaultGraphicsConfiguration implements Cloneable, AbstractGraphicsConfiguration { private AbstractGraphicsScreen screen; protected CapabilitiesImmutable capabilitiesChosen; @@ -55,6 +53,7 @@ public class DefaultGraphicsConfiguration implements Cloneable, AbstractGraphics this.capabilitiesRequested = capsRequested; } + @Override public Object clone() { try { return super.clone(); @@ -105,8 +104,9 @@ public class DefaultGraphicsConfiguration implements Cloneable, AbstractGraphics this.screen = (AbstractGraphicsScreen) screen.clone(); } + @Override public String toString() { - return ReflectionUtil.getBaseName(getClass())+"[" + screen + + return getClass().getSimpleName()+"[" + screen + ",\n\tchosen " + capabilitiesChosen+ ",\n\trequested " + capabilitiesRequested+ "]"; diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java index bf755d5bc..c2aa6fae9 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java +++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsDevice.java @@ -33,7 +33,6 @@ package javax.media.nativewindow; -import com.jogamp.common.util.ReflectionUtil; import jogamp.nativewindow.NativeWindowFactoryImpl; public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice { @@ -89,6 +88,7 @@ public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice setToolkitLock( locker ); } + @Override public Object clone() { try { return super.clone(); @@ -143,8 +143,9 @@ public class DefaultGraphicsDevice implements Cloneable, AbstractGraphicsDevice return false; } + @Override public String toString() { - return ReflectionUtil.getBaseName(getClass())+"[type "+getType()+", connection "+getConnection()+", unitID "+getUnitID()+", handle 0x"+Long.toHexString(getHandle())+"]"; + return getClass().getSimpleName()+"[type "+getType()+", connection "+getConnection()+", unitID "+getUnitID()+", handle 0x"+Long.toHexString(getHandle())+"]"; } /** diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsScreen.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsScreen.java index 7b7a89bff..f50bd0e14 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsScreen.java +++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsScreen.java @@ -32,8 +32,6 @@ package javax.media.nativewindow; -import com.jogamp.common.util.ReflectionUtil; - public class DefaultGraphicsScreen implements Cloneable, AbstractGraphicsScreen { AbstractGraphicsDevice device; private int idx; @@ -47,6 +45,7 @@ public class DefaultGraphicsScreen implements Cloneable, AbstractGraphicsScreen return new DefaultGraphicsScreen(new DefaultGraphicsDevice(type, AbstractGraphicsDevice.DEFAULT_CONNECTION, AbstractGraphicsDevice.DEFAULT_UNIT), 0); } + @Override public Object clone() { try { return super.clone(); @@ -63,7 +62,8 @@ public class DefaultGraphicsScreen implements Cloneable, AbstractGraphicsScreen return idx; } + @Override public String toString() { - return ReflectionUtil.getBaseName(getClass())+"["+device+", idx "+idx+"]"; + return getClass().getSimpleName()+"["+device+", idx "+idx+"]"; } } diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java index 3915158b0..d83a92a5b 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsConfiguration.java @@ -40,7 +40,6 @@ package javax.media.nativewindow.awt; -import com.jogamp.common.util.ReflectionUtil; import javax.media.nativewindow.*; import java.awt.Component; import java.awt.GraphicsConfiguration; @@ -104,6 +103,7 @@ public class AWTGraphicsConfiguration extends DefaultGraphicsConfiguration imple return new AWTGraphicsConfiguration(awtScreen, capsChosen, capsRequested, awtGfxConfig); } + @Override public Object clone() { return super.clone(); } @@ -112,6 +112,7 @@ public class AWTGraphicsConfiguration extends DefaultGraphicsConfiguration imple return config; } + @Override public AbstractGraphicsConfiguration getNativeGraphicsConfiguration() { return (null!=encapsulated)?encapsulated:this; } @@ -155,8 +156,9 @@ public class AWTGraphicsConfiguration extends DefaultGraphicsConfiguration imple return capabilities; } + @Override public String toString() { - return ReflectionUtil.getBaseName(getClass())+"[" + getScreen() + + return getClass().getSimpleName()+"[" + getScreen() + ",\n\tchosen " + capabilitiesChosen+ ",\n\trequested " + capabilitiesRequested+ ",\n\t" + config + diff --git a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java index 2638ae18a..66a63bfcd 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java +++ b/src/nativewindow/classes/javax/media/nativewindow/awt/AWTGraphicsDevice.java @@ -39,7 +39,6 @@ package javax.media.nativewindow.awt; -import com.jogamp.common.util.ReflectionUtil; import javax.media.nativewindow.*; import java.awt.GraphicsDevice; import java.awt.GraphicsEnvironment; @@ -66,6 +65,7 @@ public class AWTGraphicsDevice extends DefaultGraphicsDevice implements Cloneabl return new AWTGraphicsDevice(awtDevice, unitID); } + @Override public Object clone() { return super.clone(); } @@ -91,8 +91,9 @@ public class AWTGraphicsDevice extends DefaultGraphicsDevice implements Cloneabl return subType; } + @Override public String toString() { - return ReflectionUtil.getBaseName(getClass())+"[type "+getType()+"[subType "+getSubType()+"], connection "+getConnection()+", unitID "+getUnitID()+", awtDevice "+device+", handle 0x"+Long.toHexString(getHandle())+"]"; + return getClass().getSimpleName()+"[type "+getType()+"[subType "+getSubType()+"], connection "+getConnection()+", unitID "+getUnitID()+", awtDevice "+device+", handle 0x"+Long.toHexString(getHandle())+"]"; } } diff --git a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java index dbf06f435..100b6b839 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/x11/X11GraphicsConfiguration.java @@ -34,7 +34,6 @@ package javax.media.nativewindow.x11; import javax.media.nativewindow.*; -import com.jogamp.common.util.ReflectionUtil; import jogamp.nativewindow.x11.XVisualInfo; /** Encapsulates a graphics configuration, or OpenGL pixel format, on @@ -53,6 +52,7 @@ public class X11GraphicsConfiguration extends DefaultGraphicsConfiguration imple this.info = info; } + @Override public Object clone() { return super.clone(); } @@ -69,8 +69,9 @@ public class X11GraphicsConfiguration extends DefaultGraphicsConfiguration imple return (null!=info)?info.getVisualid():0; } + @Override public String toString() { - return ReflectionUtil.getBaseName(getClass())+"["+getScreen()+", visualID 0x" + Long.toHexString(getVisualID()) + + return getClass().getSimpleName()+"["+getScreen()+", visualID 0x" + Long.toHexString(getVisualID()) + ",\n\tchosen " + capabilitiesChosen+ ",\n\trequested " + capabilitiesRequested+ "]"; |