Merge remote-tracking branch 'hharrison/master'

10 files changed, 10 insertions, 12 deletions

diff --git a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
index 78cbb18cf..52a59c599 100644
--- a/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
+++ b/src/jogl/classes/com/jogamp/opengl/math/Quaternion.java
@@ -361,7 +361,7 @@ public class Quaternion {
             y = (m[6] - m[2]) * S;
             z = (m[1] - m[3]) * S;
         } else {
-            if ((m[0] > m[4]) & (m[0] > m[8])) {
+            if ((m[0] > m[4]) && (m[0] > m[8])) {
                 final float S = FloatUtil.sqrt(1.0f + m[0] - m[4] - m[8]) * 2f; // S=4*qx
                 w = (m[7] - m[5]) / S;
                 x = 0.25f * S;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
index 418d7fa81..b9903ac6d 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/GLBuffers.java
@@ -619,8 +619,6 @@ public class GLBuffers extends Buffers {
             case GL2GL3.GL_UNSIGNED_SHORT_4_4_4_4_REV:
             case GL2GL3.GL_UNSIGNED_SHORT_5_5_5_1:
             case GL2GL3.GL_UNSIGNED_SHORT_1_5_5_5_REV:
-              compSize = 2;
-              compCount = 1;
             case GL2.GL_UNSIGNED_SHORT_8_8_APPLE:
             case GL2.GL_UNSIGNED_SHORT_8_8_REV_APPLE:
               compSize = 2;
diff --git a/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java
index b00866dd9..1c87dad4e 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/RandomTileRenderer.java
@@ -76,7 +76,7 @@ public class RandomTileRenderer extends TileRendererBase {
      * @throws IllegalArgumentException is tile x/y are < 0 or tile size is <= 0x0
      */
     public void setTileRect(int tX, int tY, int tWidth, int tHeight) throws IllegalStateException, IllegalArgumentException {
-        if( 0 > tX || 0 > tX ) {
+        if( 0 > tX || 0 > tY ) {
             throw new IllegalArgumentException("Tile pos must be >= 0/0");
         }
         if( 0 >= tWidth || 0 >= tHeight ) {
diff --git a/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java b/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java
index 364a7f198..d2c0db61e 100644
--- a/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java
+++ b/src/jogl/classes/jogamp/opengl/glu/tessellator/Sweep.java
@@ -742,7 +742,7 @@ class Sweep {
         eUp.Org.s = isect.s;
         eUp.Org.t = isect.t;
         eUp.Org.pqHandle = tess.pq.pqInsert(eUp.Org); /* __gl_pqSortInsert */
-        if (eUp.Org.pqHandle == Long.MAX_VALUE) {
+        if (eUp.Org.pqHandle == Integer.MAX_VALUE) {
             tess.pq.pqDeletePriorityQ();    /* __gl_pqSortDeletePriorityQ */
             tess.pq = null;
             throw new RuntimeException();
@@ -1242,7 +1242,7 @@ class Sweep {
         vHead = tess.mesh.vHead;
         for (v = vHead.next; v != vHead; v = v.next) {
             v.pqHandle = pq.pqInsert(v); /* __gl_pqSortInsert */
-            if (v.pqHandle == Long.MAX_VALUE) break;
+            if (v.pqHandle == Integer.MAX_VALUE) break;
         }
         if (v != vHead || !pq.pqInit()) { /* __gl_pqSortInit */
             tess.pq.pqDeletePriorityQ();    /* __gl_pqSortDeletePriorityQ */
diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java b/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java
index b8dc53c83..24ccc836a 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java
@@ -87,7 +87,7 @@ public class Dimension implements Cloneable, DimensionImmutable {
 
     @Override
     public String toString() {
-        return new String(width+" x "+height);
+        return width + " x " + height;
     }
 
     @Override
diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Insets.java b/src/nativewindow/classes/javax/media/nativewindow/util/Insets.java
index c84359dcd..3644916fe 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/util/Insets.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/util/Insets.java
@@ -103,7 +103,7 @@ public class Insets implements Cloneable, InsetsImmutable {
 
     @Override
     public String toString() {
-        return new String("[ l "+l+", r "+r+" - t "+t+", b "+b+" - "+getTotalWidth()+"x"+getTotalHeight()+"]");
+        return "[ l "+l+", r "+r+" - t "+t+", b "+b+" - "+getTotalWidth()+"x"+getTotalHeight()+"]";
     }
 }
 
diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Point.java b/src/nativewindow/classes/javax/media/nativewindow/util/Point.java
index 57c6fb716..331c1388e 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/util/Point.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/util/Point.java
@@ -99,7 +99,7 @@ public class Point implements Cloneable, PointImmutable {
 
     @Override
     public String toString() {
-        return new String( x + " / " + y );
+        return x + " / " + y;
     }
 
     public final void set(int x, int y) { this.x = x; this.y = y; }
diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java b/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java
index 8dc8f4562..d0d8bfb13 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java
@@ -195,7 +195,7 @@ public class Rectangle implements Cloneable, RectangleImmutable {
 
     @Override
     public String toString() {
-        return new String("[ "+x+" / "+y+"  "+width+" x "+height+" ]");
+        return "[ "+x+" / "+y+"  "+width+" x "+height+" ]";
     }
 }
 
diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java b/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java
index f1749dfa6..77619731f 100644
--- a/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java
+++ b/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java
@@ -58,7 +58,7 @@ public class SurfaceSize implements Comparable<SurfaceSize> {
 
     @Override
     public final String toString() {
-        return new String("[ "+resolution+" x "+bitsPerPixel+" bpp ]");
+        return "[ "+resolution+" x "+bitsPerPixel+" bpp ]";
     }
 
     /**
diff --git a/src/newt/classes/com/jogamp/newt/MonitorMode.java b/src/newt/classes/com/jogamp/newt/MonitorMode.java
index 59f28e791..9690f18db 100644
--- a/src/newt/classes/com/jogamp/newt/MonitorMode.java
+++ b/src/newt/classes/com/jogamp/newt/MonitorMode.java
@@ -176,7 +176,7 @@ public class MonitorMode implements Comparable<MonitorMode> {
         }
         @Override
         public final String toString() {
-            return new String(surfaceSize+" @ "+refreshRate+" Hz, flags ["+flags2String(flags).toString()+"]");
+            return surfaceSize+" @ "+refreshRate+" Hz, flags ["+flags2String(flags).toString()+"]";
         }
 
         /**