More cleanups

Author: monkstone

src/main/java/monkstone/noise/OpenSimplex2F.java

@@ -68,14 +68,14 @@ public void barWidth(int w) {
         if (w < MIN_BAR_WIDTH) {
             pH = MIN_BAR_WIDTH;
         } else {
-            pH = (w > MAX_BAR_WIDTH) ? MAX_BAR_WIDTH : w;
+            pH = w > MAX_BAR_WIDTH ? MAX_BAR_WIDTH : w;
         }
     }
 
     final void limits(float iv, float fv) {
         vMin = iv;
         vMax = fv;
-        SliderBar.this.setValue(iv);
+        setValue(iv);
     }
 
     /**
@@ -139,7 +139,7 @@ public void showBackground() {
      */
     @Override
     public void labelSize(int s) {
-        labelSize = (s < 4) ? 4 : s;
+        labelSize = s < 4 ? 4 : s;
     }
 
     /**
@@ -179,10 +179,9 @@ public void draw() {
     }
 
     public void mouseEvent(MouseEvent evt) {
-        if (evt.getAction() == MouseEvent.WHEEL) {
-            if (scrollWheelHandler != null) {
-                scrollWheelHandler.handleWheel((short) evt.getCount());
-            }
+        if (evt.getAction() == MouseEvent.WHEEL && scrollWheelHandler != null) {
+            scrollWheelHandler.handleWheel((short) evt.getCount());
+
         }
     }
 
@@ -222,7 +221,7 @@ void deBounce(int n) {
     }
 
     protected float map(float val, float begIn, float endIn, float beginOut, float endOut) {
-        return (beginOut + (endOut - beginOut) * ((val - begIn) / (endIn - begIn)));
+        return beginOut + (endOut - beginOut) * (val - begIn) / (endIn - begIn);
     }
 
     protected int constrainMap(double val, double begIn, double endIn, double beginOut, double endOut) {

src/main/java/monkstone/slider/SliderBar.java

@@ -106,7 +106,7 @@ public void barWidth(int length) {
     private void limits(float iv, float fv) {
         vMin = iv;
         vMax = fv;
-        SliderBar.this.initialValue(iv);
+        initialValue(iv);
     }
 
     /**
@@ -178,7 +178,7 @@ public void showBackground() {
      * @param s
      */
     public void labelSize(int s) {
-        labelSize = (s < 4) ? 4 : s;
+        labelSize = s < 4 ? 4 : s;
     }
 
     /**
@@ -301,11 +301,10 @@ public void initialValue(float value) {
 
     private void checkMouse() {
         if (debug) {
-            if (mouseOver() && applet.keyPressed && applet.mouseButton == PConstants.LEFT && applet.mousePressed) {
-                if (applet.keyCode == PConstants.CONTROL) {
+            if (mouseOver() && applet.keyPressed && applet.mouseButton == PConstants.LEFT && applet.mousePressed
+                    && applet.keyCode == PConstants.CONTROL) {
                     pX = pX + applet.mouseX - applet.pmouseX;
                     pY = pY + applet.mouseY - applet.pmouseY;
-                }
                 if (applet.keyCode == PConstants.SHIFT && pressOnlyOnce) {
                     System.out.println(toString());
                     pressOnlyOnce = false;
@@ -377,12 +376,11 @@ public void changeWithWheel(int delta) {
         if (applet.keyPressed && applet.keyCode == PConstants.CONTROL) {
             delta = delta * (int) (vMax / 4);
         }
-        SliderBar.this.initialValue(pValue + delta);
+        initialValue(pValue + delta);
     }
 
     private void deBounce(int n) {
-        if (pressOnlyOnce) {
-        } else if (deb++ > n) {
+        if (!pressOnlyOnce && deb++ > n) {
             deb = 0;
             pressOnlyOnce = true;
         }

src/main/java/monkstone/sliders/SliderBar.java

@@ -742,10 +742,8 @@ public boolean equals(Object obj) {
         }
         if (obj instanceof Vec2) {
             final Vec2 other = (Vec2) obj;
-            if ((Double.compare(jx, (Double) other.jx) == 0)
-                    && (Double.compare(jy, (Double) other.jy) == 0)) {
-                return true;
-            }
+            return Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0;
         }
         return false;
     }

src/main/java/monkstone/vecmath/vec2/Vec2.java

@@ -672,9 +672,9 @@ public IRubyObject eql_p(ThreadContext context, IRubyObject other) {
         }
         if (other instanceof Vec3) {
             Vec3 v = (Vec3) other.toJava(Vec3.class);
-            if ((Double.compare(jx, (Double) v.jx) == 0)
-                    && (Double.compare(jy, (Double) v.jy) == 0)
-                    && (Double.compare(jz, (Double) v.jz) == 0)) {
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0
+                    && Double.compare(jz, (Double) v.jz) == 0) {
                 return runtime.newBoolean(true);
             }