propane 3.9.0-java → 3.10.0-java

data/src/main/java/monkstone/slider/WheelHandler.java

@@ -31,5 +31,5 @@ public interface WheelHandler {
      *
      * @param amount int
      */
-    public void handleWheel(final short amount);
+    void handleWheel(final short amount);
 }

data/src/main/java/monkstone/vecmath/JRender.java

@@ -11,14 +11,14 @@ public interface JRender {
      * @param x double
      * @param y double
      */
-    public void vertex(double x, double y);
+    void vertex(double x, double y);
 
     /**
      *
      * @param x double
      * @param y double
      */
-    public void curveVertex(double x, double y);
+    void curveVertex(double x, double y);
 
     /**
      *
@@ -26,7 +26,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void vertex(double x, double y, double z);
+    void vertex(double x, double y, double z);
 
     /**
      *
@@ -36,7 +36,7 @@ public interface JRender {
      * @param u double
      * @param v double
      */
-    public void vertex(double x, double y, double z, double u, double v);
+    void vertex(double x, double y, double z, double u, double v);
 
     /**
      *
@@ -44,7 +44,7 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void curveVertex(double x, double y, double z);
+    void curveVertex(double x, double y, double z);
 
     /**
      *
@@ -52,5 +52,5 @@ public interface JRender {
      * @param y double
      * @param z double
      */
-    public void normal(double x, double y, double z);
+    void normal(double x, double y, double z);
 }

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

@@ -40,7 +40,7 @@ import monkstone.vecmath.JRender;
  * @author Martin Prout
  */
 @JRubyClass(name = "Vec2D")
-public class Vec2 extends RubyObject {
+public final class Vec2 extends RubyObject {
 
     static final double EPSILON = 9.999999747378752e-05; // matches processing.org EPSILON
     private static final long serialVersionUID = -2950154560223211646L;
@@ -73,7 +73,7 @@ public class Vec2 extends RubyObject {
      * @return new Vec2 object (ruby)
      */
     @JRubyMethod(name = "new", meta = true, rest = true)
-    public static final IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
         Vec2 vec2 = (Vec2) ((RubyClass) klazz).allocate();
         vec2.init(context, args);
         return vec2;
@@ -91,16 +91,16 @@ public class Vec2 extends RubyObject {
     void init(ThreadContext context, IRubyObject... args) {
         int count = args.length;
         if (count == 2) {
-            jx = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+            jx = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+            jy = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         }   // allow ruby ducktyping in constructor
         if (count == 1) {
             if (!(args[0].respondsTo("x"))) {
                 throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
             }
-            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+            jx = args[0].callMethod(context, "x") instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+            jy = args[0].callMethod(context, "y") instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
         }
     }
@@ -162,10 +162,10 @@ public class Vec2 extends RubyObject {
         Ruby runtime = context.runtime;
         if (key instanceof RubySymbol) {
             if (key == RubySymbol.newSymbol(runtime, "x")) {
-                jx = (value instanceof RubyFloat)
+                jx = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             } else if (key == RubySymbol.newSymbol(runtime, "y")) {
-                jy = (value instanceof RubyFloat)
+                jy = value instanceof RubyFloat
                         ? ((RubyFloat) value).getValue() : ((RubyFixnum) value).getDoubleValue();
             }
         } else {
@@ -224,7 +224,7 @@ public class Vec2 extends RubyObject {
         } else {
             throw runtime.newTypeError("argument should be Vec2D");
         }
-        double result = Math.hypot((jx - b.jx), (jy - b.jy));
+        double result = Math.hypot(jx - b.jx, jy - b.jy);
         return runtime.newFloat(result);
     }
 
@@ -318,7 +318,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_mul(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
+        double scalar = other instanceof RubyFloat
                 ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
         return Vec2.rbNew(context, this.getMetaClass(),
                 new IRubyObject[]{runtime.newFloat(jx * scalar),
@@ -335,7 +335,7 @@ public class Vec2 extends RubyObject {
 
     public IRubyObject op_div(ThreadContext context, IRubyObject other) {
         Ruby runtime = context.runtime;
-        double scalar = (other instanceof RubyFloat)
+        double scalar = other instanceof RubyFloat
                 ? ((RubyFloat) other).getValue() : ((RubyFixnum) other).getDoubleValue();
         if (Math.abs(scalar) < Vec2.EPSILON) {
             return this;
@@ -489,7 +489,7 @@ public class Vec2 extends RubyObject {
     @JRubyMethod(name = "from_angle", meta = true)
     public static IRubyObject from_angle(ThreadContext context, IRubyObject klazz, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double angle = (scalar instanceof RubyFloat)
+        double angle = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         return Vec2.rbNew(context, klazz, new IRubyObject[]{
             runtime.newFloat(Math.cos(angle)),
@@ -520,10 +520,10 @@ public class Vec2 extends RubyObject {
      */
     @JRubyMethod(name = "rotate!")
     public IRubyObject rotate_bang(ThreadContext context, IRubyObject scalar) {
-        double theta = (scalar instanceof RubyFloat)
+        double theta = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
-        double x = (jx * Math.cos(theta) - jy * Math.sin(theta));
-        double y = (jx * Math.sin(theta) + jy * Math.cos(theta));
+        double x = jx * Math.cos(theta) - jy * Math.sin(theta);
+        double y = jx * Math.sin(theta) + jy * Math.cos(theta);
         jx = x;
         jy = y;
         return this;
@@ -538,7 +538,7 @@ public class Vec2 extends RubyObject {
     @JRubyMethod(name = "rotate")
     public IRubyObject rotate(ThreadContext context, IRubyObject scalar) {
         Ruby runtime = context.runtime;
-        double theta = (scalar instanceof RubyFloat)
+        double theta = scalar instanceof RubyFloat
                 ? ((RubyFloat) scalar).getValue() : ((RubyFixnum) scalar).getDoubleValue();
         IRubyObject[] ary = new IRubyObject[]{
             runtime.newFloat(jx * Math.cos(theta) - jy * Math.sin(theta)),
@@ -581,7 +581,7 @@ public class Vec2 extends RubyObject {
             throw runtime.newSyntaxError("Check syntax");
         }
         Vec2 vec = (Vec2) args[0].toJava(Vec2.class);
-        double scalar = (args[1] instanceof RubyFloat)
+        double scalar = args[1] instanceof RubyFloat
                 ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         assert (scalar >= 0 && scalar < 1.0) :
                 "Lerp value " + scalar + " out of range 0..1.0";
@@ -766,8 +766,8 @@ public class Vec2 extends RubyObject {
         }
         if (other instanceof Vec2) {
             Vec2 v = (Vec2) other.toJava(Vec2.class);
-            if ((Double.compare(jx, (Double) v.jx) == 0)
-                    && (Double.compare(jy, (Double) v.jy) == 0)) {
+            if (Double.compare(jx, (Double) v.jx) == 0
+                    && Double.compare(jy, (Double) v.jy) == 0) {
                 return runtime.newBoolean(true);
             }
         }
@@ -793,6 +793,7 @@ public class Vec2 extends RubyObject {
             double diff = jx - v.jx;
             if ((diff < 0 ? -diff : diff) > Vec2.EPSILON) {
                 return runtime.newBoolean(false);
+            } else {
             }
             diff = jy - v.jy;
             return runtime.newBoolean((diff < 0 ? -diff : diff) < Vec2.EPSILON);

data/src/main/java/monkstone/vecmath/vec3/Vec3.java

@@ -65,7 +65,7 @@ public final class Vec3 extends RubyObject {
      * @return new Vec3 object (ruby)
      */
     @JRubyMethod(name = "new", meta = true, rest = true)
-    public final static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject... args) {
         Vec3 vec = (Vec3) ((RubyClass) klazz).allocate();
         vec.init(context, args);
         return vec;
@@ -83,27 +83,27 @@ public final class Vec3 extends RubyObject {
     void init(ThreadContext context, IRubyObject... args) {
         int count = args.length;
         if (count >= 2) {
-            jx = (args[0] instanceof RubyFloat)
+            jx = args[0] instanceof RubyFloat
                     ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-            jy = (args[1] instanceof RubyFloat)
+            jy = args[1] instanceof RubyFloat
                     ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
         }
         if (count == 3) {
-            jz = (args[2] instanceof RubyFloat)
+            jz = args[2] instanceof RubyFloat
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
         } // allow ruby ducktyping in constructor
         if (count == 1) {
             if (!(args[0].respondsTo("x"))) {
                 throw context.runtime.newTypeError(args[0].getType() + " doesn't respond_to :x & :y");
             }
-            jx = ((args[0].callMethod(context, "x")) instanceof RubyFloat)
+            jx = (args[0].callMethod(context, "x")) instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "x")).getValue() : ((RubyFixnum) args[0].callMethod(context, "x")).getDoubleValue();
-            jy = ((args[0].callMethod(context, "y")) instanceof RubyFloat)
+            jy = (args[0].callMethod(context, "y")) instanceof RubyFloat
                     ? ((RubyFloat) args[0].callMethod(context, "y")).getValue() : ((RubyFixnum) args[0].callMethod(context, "y")).getDoubleValue();
             if (!(args[0].respondsTo("z"))) {
                 return;
             } // allow promotion from 2D to 3D, sets jz = 0
-            jz = ((args[0].callMethod(context, "z")) instanceof RubyFloat) ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
+            jz = (args[0].callMethod(context, "z")) instanceof RubyFloat ? ((RubyFloat) args[0].callMethod(context, "z")).getValue() : ((RubyFixnum) args[0].callMethod(context, "z")).getDoubleValue();
         }
     }
 
@@ -598,9 +598,9 @@ public final class Vec3 extends RubyObject {
         double u = 0;
         double v = 0;
         if (count == 3) {
-            u = (args[1] instanceof RubyFloat)
+            u = args[1] instanceof RubyFloat
                     ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-            v = (args[2] instanceof RubyFloat)
+            v = args[2] instanceof RubyFloat
                     ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
         }
         if (count == 2) {
@@ -662,9 +662,9 @@ public final class Vec3 extends RubyObject {
         }
         if (obj instanceof Vec3) {
             final Vec3 other = (Vec3) obj;
-            if ((Double.compare(jx, (Double) other.jx) == 0)
-                    && (Double.compare(jy, (Double) other.jy) == 0)
-                    && (Double.compare(jz, (Double) other.jz) == 0)) {
+            if (Double.compare(jx, (Double) other.jx) == 0
+                    && Double.compare(jy, (Double) other.jy) == 0
+                    && Double.compare(jz, (Double) other.jz) == 0) {
                 return true;
             }
 

data/src/main/java/processing/awt/PGraphicsJava2D.java

@@ -1564,6 +1564,15 @@ public class PGraphicsJava2D extends PGraphics {
 
   /**
    * Handle renderer-specific image drawing.
+     * @param who
+     * @param x1
+     * @param y1
+     * @param x2
+     * @param y2
+     * @param u1
+     * @param v1
+     * @param u2
+     * @param v2
    */
   @Override
   protected void imageImpl(PImage who,
@@ -2575,7 +2584,7 @@ public class PGraphicsJava2D extends PGraphics {
 //    WritableRaster raster = ((BufferedImage) image).getRaster();
 //    WritableRaster raster = image.getRaster();
     WritableRaster raster = getRaster();
-    if ((clearPixels == null) || (clearPixels.length < imageWidth)) {
+    if (clearPixels == null || clearPixels.length < imageWidth) {
       clearPixels = new int[imageWidth];
     }
     Arrays.fill(clearPixels, 0, imageWidth, backgroundColor);
@@ -2595,7 +2604,6 @@ public class PGraphicsJava2D extends PGraphics {
   public void backgroundImpl() {
     if (backgroundAlpha) {
       clearPixels(backgroundColor);
-
     } else {
       Color bgColor = new Color(backgroundColor);
       // seems to fire an additional event that causes flickering,
@@ -2798,7 +2806,7 @@ public class PGraphicsJava2D extends PGraphics {
   public void updatePixels(int x, int y, int c, int d) {
     //if ((x == 0) && (y == 0) && (c == width) && (d == height)) {
 //    System.err.format("%d %d %d %d .. w/h = %d %d .. pw/ph = %d %d %n", x, y, c, d, width, height, pixelWidth, pixelHeight);
-    if ((x != 0) || (y != 0) || (c != pixelWidth) || (d != pixelHeight)) {
+    if (x != 0 || y != 0 || c != pixelWidth || d != pixelHeight) {
       // Show a warning message, but continue anyway.
       showVariationWarning("updatePixels(x, y, w, h)");
 //      new Exception().printStackTrace(System.out);

data/src/main/java/processing/core/PApplet.java

@@ -39,8 +39,8 @@ import java.util.zip.*;
 
 // loadXML() error handling
 import javax.xml.parsers.ParserConfigurationException;
-import monkstone.noise.NoiseMode;
-import monkstone.noise.Noise;
+// import monkstone.noise.NoiseMode;
+// import monkstone.noise.Noise;
 import org.xml.sax.SAXException;
 
 // TODO have this removed by 4.0 final
@@ -49,7 +49,7 @@ import processing.awt.ShimAWT;
 import processing.data.*;
 import processing.event.*;
 import processing.opengl.*;
-import monkstone.noise.NoiseGenerator;
+// import monkstone.noise.NoiseGenerator;
 
 /**
  * Base class for all sketches that use processing.core.
@@ -119,7 +119,7 @@ public class PApplet implements PConstants {
      */
     static public boolean useNativeSelect = true;
 
-    Noise noiseGenerator = new NoiseGenerator();
+  //  Noise noiseGenerator = new NoiseGenerator();
 
     /**
      * The PGraphics renderer associated with this PApplet
@@ -1000,7 +1000,7 @@ public class PApplet implements PConstants {
     /**
      * @param display the display number to check (1-indexed to match the
      * Preferences dialog box)
-     * @return 
+     * @return
      */
     public int displayDensity(int display) {
         if (!disableAWT) {
@@ -1962,7 +1962,7 @@ public class PApplet implements PConstants {
      * <A HREF="http://dev.processing.org/reference/core/javadoc/processing/core/PImage.html#save(java.lang.String)">PImage.save()</A>.
      * </UL>
      *
-     * @return 
+     * @return
      * @webref rendering
      * @param w width in pixels
      * @param h height in pixels
@@ -1982,7 +1982,7 @@ public class PApplet implements PConstants {
      * @param path the name of the file (can be an absolute or relative path)
      * @param renderer
      * @param h
-     * @return 
+     * @return
      */
     public PGraphics createGraphics(int w, int h,
             String renderer, String path) {
@@ -2011,7 +2011,7 @@ public class PApplet implements PConstants {
      * @param path A path (or null if none), can be absolute or relative
      * ({@link PApplet#savePath} will be called)
      * @param primary
-     * @return 
+     * @return
      */
     protected PGraphics makeGraphics(int w, int h,
             String renderer, String path,
@@ -2956,7 +2956,7 @@ public class PApplet implements PConstants {
      * This is a function, rather than a variable, because it may change
      * multiple times per frame.
      *
-     * @return 
+     * @return
      * @webref input:time_date
      * @see PApplet#second()
      * @see PApplet#minute()
@@ -4916,83 +4916,83 @@ public class PApplet implements PConstants {
      * @see PApplet#noise(float, float, float)
      * @see PApplet#noiseSeed(long)
      */
-    public final void randomSeed(long seed) {
-        if (internalRandom == null) {
-            internalRandom = new Random();
-        }
-        internalRandom.setSeed(seed);
-    }
-
-    public void noiseMode(NoiseMode mode) {
-        noiseGenerator.noiseMode(mode);
-    }
-
-    /**
-     * @param x
-     * @return 
-     */
-    public float noise(float x) {
-        return noiseGenerator.noise(x);
-    }
-
-     /**
-     * @param x
-     * @param y
-     * @return 
-     */
-    public float noise(float x, float y) {
-        return noiseGenerator.noise(x, y);
-    }
-
-    /**
-     * ( begin auto-generated from noise.xml )
-     *
-     * Returns the Perlin noise value at specified coordinates. Perlin noise is
-     * a random sequence generator producing a more natural ordered, harmonic
-     * succession of numbers compared to the standard <b>random()</b> function.
-     * It was invented by Ken Perlin in the 1980s and been used since in
-     * graphical applications to produce procedural textures, natural motion,
-     * shapes, terrains etc. The main difference to the
-     * <b>random()</b> function is that Perlin noise is defined in an infinite
-     * n-dimensional space where each pair of coordinates corresponds to a fixed
-     * semi-random value (fixed only for the lifespan of the program). The
-     * resulting value will always be between 0.0 and 1.0. Processing can
-     * compute 1D, 2D and 3D noise, depending on the number of coordinates
-     * given. The noise value can be animated by moving through the noise space
-     * as demonstrated in the example above. The 2nd and 3rd dimension can also
-     * be interpreted as time.The actual noise is structured similar to an audio
-     * signal, in respect to the function's use of frequencies. Similar to the
-     * concept of harmonics in physics, perlin noise is computed over several
-     * octaves which are added together for the final result. Another way to
-     * adjust the character of the resulting sequence is the scale of the input
-     * coordinates. As the function works within an infinite space the value of
-     * the coordinates doesn't matter as such, only the distance between
-     * successive coordinates does (eg. when using <b>noise()</b> within a
-     * loop). As a general rule the smaller the difference between coordinates,
-     * the smoother the resulting noise sequence will be. Steps of 0.005-0.03
-     * work best for most applications, but this will differ depending on use.
-     *
-     * ( end auto-generated )
-     *
-     * @webref math:random
-     * @param x x-coordinate in noise space
-     * @param y y-coordinate in noise space
-     * @param z z-coordinate in noise space
-     */
-    public float noise(float x, float y, float z) {
-        return noiseGenerator.noise(x, y, z);
-    }
-    /**
-     * 4D noise where typically w is time
-     * @param x
-     * @param y
-     * @param z
-     * @param w
-     * @return 
-     */
-    public float noise(float x, float y, float z, float w) {
-        return noiseGenerator.noise(x, y, z, w);
-    }
+    // public final void randomSeed(long seed) {
+    //     if (internalRandom == null) {
+    //         internalRandom = new Random();
+    //     }
+    //     internalRandom.setSeed(seed);
+    // }
+    //
+    // public void noiseMode(NoiseMode mode) {
+    //     noiseGenerator.noiseMode(mode);
+    // }
+    //
+    // /**
+    //  * @param x
+    //  * @return
+    //  */
+    // public float noise(float x) {
+    //     return noiseGenerator.noise(x);
+    // }
+    //
+    //  /**
+    //  * @param x
+    //  * @param y
+    //  * @return
+    //  */
+    // public float noise(float x, float y) {
+    //     return noiseGenerator.noise(x, y);
+    // }
+    //
+    // /**
+    //  * ( begin auto-generated from noise.xml )
+    //  *
+    //  * Returns the Perlin noise value at specified coordinates. Perlin noise is
+    //  * a random sequence generator producing a more natural ordered, harmonic
+    //  * succession of numbers compared to the standard <b>random()</b> function.
+    //  * It was invented by Ken Perlin in the 1980s and been used since in
+    //  * graphical applications to produce procedural textures, natural motion,
+    //  * shapes, terrains etc. The main difference to the
+    //  * <b>random()</b> function is that Perlin noise is defined in an infinite
+    //  * n-dimensional space where each pair of coordinates corresponds to a fixed
+    //  * semi-random value (fixed only for the lifespan of the program). The
+    //  * resulting value will always be between 0.0 and 1.0. Processing can
+    //  * compute 1D, 2D and 3D noise, depending on the number of coordinates
+    //  * given. The noise value can be animated by moving through the noise space
+    //  * as demonstrated in the example above. The 2nd and 3rd dimension can also
+    //  * be interpreted as time.The actual noise is structured similar to an audio
+    //  * signal, in respect to the function's use of frequencies. Similar to the
+    //  * concept of harmonics in physics, perlin noise is computed over several
+    //  * octaves which are added together for the final result. Another way to
+    //  * adjust the character of the resulting sequence is the scale of the input
+    //  * coordinates. As the function works within an infinite space the value of
+    //  * the coordinates doesn't matter as such, only the distance between
+    //  * successive coordinates does (eg. when using <b>noise()</b> within a
+    //  * loop). As a general rule the smaller the difference between coordinates,
+    //  * the smoother the resulting noise sequence will be. Steps of 0.005-0.03
+    //  * work best for most applications, but this will differ depending on use.
+    //  *
+    //  * ( end auto-generated )
+    //  *
+    //  * @webref math:random
+    //  * @param x x-coordinate in noise space
+    //  * @param y y-coordinate in noise space
+    //  * @param z z-coordinate in noise space
+    //  */
+    // public float noise(float x, float y, float z) {
+    //     return noiseGenerator.noise(x, y, z);
+    // }
+    // /**
+    //  * 4D noise where typically w is time
+    //  * @param x
+    //  * @param y
+    //  * @param z
+    //  * @param w
+    //  * @return
+    //  */
+    // public float noise(float x, float y, float z, float w) {
+    //     return noiseGenerator.noise(x, y, z, w);
+    // }
 
     /**
      *
@@ -5030,9 +5030,9 @@ public class PApplet implements PConstants {
      * @see PApplet#random(float,float)
      * @see PApplet#randomSeed(long)
      */
-    public void noiseSeed(long seed) {
-        noiseGenerator.noiseSeed(seed);
-    }
+  //  public void noiseSeed(long seed) {
+  //      noiseGenerator.noiseSeed(seed);
+  //  }
 
     // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
     /**