diff options
author | Sven Gothel <[email protected]> | 2014-07-08 12:37:14 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2014-07-08 12:37:14 +0200 |
commit | b388a572c8ef9c971dbc16b89069429cc67c0928 (patch) | |
tree | 2e55e550c567f97c5936e3f593a9e8451a3e823c | |
parent | 109e162a78ef5bab0a7481a8499ad1da48cea094 (diff) |
Findbugs: Remove redundant instanceof checks
4 files changed, 9 insertions, 17 deletions
diff --git a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java index 57239ac48..a9978abe5 100644 --- a/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java +++ b/src/jogl/classes/jogamp/graph/geom/plane/AffineTransform.java @@ -534,13 +534,14 @@ public class AffineTransform implements Cloneable { if (src == null) { return null; } - if (src instanceof Path2D) { - return src.createTransformedShape(this); - } - final PathIterator path = src.iterator(this); - final Path2D dst = new Path2D(path.getWindingRule()); - dst.append(path, false); - return dst; + return src.createTransformedShape(this); + /** + * If !(src instanceof Path2D): (but here it always is) + final PathIterator path = src.iterator(this); + final Path2D dst = new Path2D(path.getWindingRule()); + dst.append(path, false); + return dst; + */ } @Override diff --git a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java index 7912832c1..cae37c36c 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java +++ b/src/nativewindow/classes/javax/media/nativewindow/DefaultGraphicsConfiguration.java @@ -52,9 +52,6 @@ public class DefaultGraphicsConfiguration implements Cloneable, AbstractGraphics if(null == capsRequested) { throw new IllegalArgumentException("Null requested caps"); } - if( ! ( capsChosen instanceof VisualIDHolder ) ) { - throw new IllegalArgumentException("Chosen caps is not implementing NativeVisualID"); - } this.screen = screen; this.capabilitiesChosen = capsChosen; this.capabilitiesRequested = capsRequested; diff --git a/src/newt/classes/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.java b/src/newt/classes/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.java index 45db95520..72b3e43f3 100644 --- a/src/newt/classes/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.java +++ b/src/newt/classes/com/jogamp/newt/awt/applet/JOGLNewtApplet1Run.java @@ -111,9 +111,6 @@ public class JOGLNewtApplet1Run extends Applet { if(DEBUG) { System.err.println("JOGLNewtApplet1Run.init() START - "+currentThreadName()); } - if(!(this instanceof Container)) { - throw new RuntimeException("This Applet is not a AWT Container"); - } final Container container = this; String glEventListenerClazzName=null; diff --git a/src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java b/src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java index 65d927157..a8105403d 100644 --- a/src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java +++ b/src/newt/classes/com/jogamp/newt/event/awt/AWTWindowAdapter.java @@ -94,10 +94,7 @@ public class AWTWindowAdapter while( null != comp && !(comp instanceof java.awt.Window) ) { comp = comp.getParent(); } - if(comp instanceof java.awt.Window) { - return (java.awt.Window) comp; - } - return null; + return (java.awt.Window) comp; // either null or a 'java.awt.Window' } @Override |