picrate 0.3.0-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98912fc6c5238c86d49019bba74ea9c72f89d4e0888d0718400e16da3f57756c
-  data.tar.gz: b0519d1aa9030d1a63c012e3274e34c3908287af72232b687f0a6e6e9d5fa6d3
+  metadata.gz: 1d0093cb47f7b3da255af047a82056efb9ea6d3c4173c13c8336b98c7f4b3cfb
+  data.tar.gz: ea5b1e00ee24ca51bc0625ab261a6914b2c67624f5026a06a4c0283a31b07da0
 SHA512:
-  metadata.gz: aa44b2c66509e6348d3a455cb27de46c1a8f004278adb4062a306f0b1da6d7398efa00b5841d3c71b7c9c2f6482b15cc6282fcd668789db518507046a76665bf
-  data.tar.gz: f63e3511db6a033fcce9bf87a691324deebe1329897edf9c74556d9d1da701acbecd2ca7f9b601adf42cc1b2521d8d55b8a996b0115e619affd63160d061a2d7
+  metadata.gz: 50417839ec672bf61d8fc21f707612959ce3856dd7c85c4d6263308f00e09e209f9cfea4fa94a065232c41fa3a80f6bd715d2cf182a8f0d518e549a8f0ac4ec1
+  data.tar.gz: c852f333c965a5ec7152d312939fbfce171048079838e2e69e46984daa740a19c64e9a789a912f097fd110807864141f8104b0239ad82fce81e5212163cdeae2

data/.mvn/extensions.xml

@@ -3,7 +3,7 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.3.0
+    <version>0.3.1
     </version>
   </extension>
 </extensions>

data/CHANGELOG.md

@@ -1,5 +1,4 @@
-v0.1.0.pre
-Hack to get library loader to work (will need revision), convert P2D samples to JAVA2D until opengl issue fixed
+v0.0.4 LSystem examples
 v0.0.3
 Extended Samples
 v0.0.2

data/README.md

@@ -16,7 +16,7 @@ Requires maven, [jdk8][oracle] (but could be openjdk), and a jruby install.
 ```bash
 cd PiCrate
 rake # assumes an installed version of vanilla processing
-jgem install picrate-0.2.0-java.gem
+jgem install picrate-0.4.0-java.gem
 ```
 To create a template sketch:-
 ```bash

data/Rakefile

@@ -22,13 +22,13 @@ task :init do
   opengl = Dir.entries(jar_dir).grep(/amd64|armv6hf/).select { |jar| jar =~ /linux/ }
   opengl.concat %w[jogl-all.jar gluegen-rt.jar]
   opengl.each do |gl|
-	  FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
+    FileUtils.cp(File.join(jar_dir, gl), File.join('.', 'lib'))
   end
 end
 
 desc 'Install'
 task :install do
-  sh 'mv target/picrate-0.3.0.jar lib'
+  sh 'mv target/picrate-0.4.0.jar lib'
 end
 
 desc 'Gem'

data/lib/picrate.rb

@@ -4,6 +4,7 @@ unless defined? PICRATE_ROOT
   $LOAD_PATH << File.expand_path(File.dirname(__FILE__))
   PICRATE_ROOT = File.absolute_path(File.dirname(__dir__))
 end
+
 Dir["#{PICRATE_ROOT}/lib/*.jar"].each do |jar|
   require jar
 end

data/lib/picrate/app.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: false
 require_relative 'helper_methods'
 require_relative 'library_loader'
-
+require 'jruby'
 # A wrapper module for the processing App
 module Processing
   include_package 'processing.core' # imports the processing jar.
   # Load vecmath, fastmath and mathtool modules
   Java::Monkstone::PicrateLibrary.load(JRuby.runtime)
-  SKETCH_ROOT = File.absolute_path('.')
-
-  # A utility to facillitate rendering of Vec2D and Vec3D as vertex
+  SKETCH_ROOT ||= Dir.pwd
+  # JRuby::Util.load_ext('monkstone.PicrateLibrary')
+  # A utility to facilitate rendering of Vec2D and Vec3D as vertex
   module Render
     java_import 'monkstone.vecmath.AppRender'
     java_import 'monkstone.vecmath.ShapeRender'

data/lib/picrate/helper_methods.rb

@@ -55,10 +55,6 @@ module Processing
       super(hex_color(args[0]))
     end
 
-    def web_to_color_array(web)
-      Java::Monkstone::ColorUtil.webArray(web)
-    end
-
     def int_to_ruby_colors(hex)
       Java::Monkstone::ColorUtil.rubyString(hex)
     end

data/lib/picrate/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PiCrate
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/library/color_group/color_group.rb

@@ -0,0 +1,27 @@
+java_import Java::Monkstone::ColorUtil
+
+# class wraps a java color array (of signed int), supports shuffle!, last and
+# ruby_code (string for use in ruby code). As well as ability to initialize
+# with an ruby array of "web" color string
+class ColorGroup
+  attr_reader :colors
+  def initialize(p5cols)
+    @colors = p5cols
+  end
+
+  def self.from_web_array(web)
+    ColorGroup.new(ColorUtil.web_array(web))
+  end
+
+  def shuffle!
+    @colors = ColorUtil.shuffle(colors)
+  end
+
+  def ruby_code
+    ColorUtil.rubyString(colors)
+  end
+
+  def last
+    colors[0]
+  end
+end

data/picrate.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{ruby wrapper for processing-3.3.7 on raspberrypi and linux64}
   gem.homepage      = 'https://ruby-processing.github.io/PiCrate/'
   gem.files         = `git ls-files`.split($/)
-  gem.files << 'lib/picrate-0.3.0.jar'
+  gem.files << 'lib/picrate-0.4.0.jar'
   gem.files << 'lib/gluegen-rt.jar'
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'

data/pom.rb

@@ -1,7 +1,7 @@
 project 'picrate', 'http://maven.apache.org' do
 
   model_version '4.0.0'
-  id 'ruby-processing:picrate:0.3.0'
+  id 'ruby-processing:picrate:0.4.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -24,7 +24,7 @@ project 'picrate', 'http://maven.apache.org' do
 
   properties( 'jogl.version' => '2.3.2',
     'jruby.api' => 'http://jruby.org/apidocs/',
-    'source.directory' => 'src',
+    'source.directory' => 'src/main',
     'maven.compiler.target' => '1.8',
     'processing.api' => 'http://processing.github.io/processing-javadocs/core/',
     'picrate.basedir' => '${project.basedir}',
@@ -39,7 +39,7 @@ project 'picrate', 'http://maven.apache.org' do
 
   plugin( :resources, '2.7',
     'encoding' =>  'UTF-8' )
-    plugin( :compiler, '3.7.0',
+    plugin( :compiler, '3.8.0',
       'source' =>  '1.8',
       'target' =>  '1.8' )
       plugin( :pmd, '3.3',
@@ -48,12 +48,12 @@ project 'picrate', 'http://maven.apache.org' do
         'targetJdk' =>  '${compileSource}' )
         build do
           resource do
-            directory '${source.directory}/main/java'
+            directory '${source.directory}/java'
             includes ['**/**/*.glsl', '**/*.jnilib']
             excludes '**/**/*.java'
           end
           resource do
-            directory '${source.directory}/main/resources'
+            directory '${source.directory}/resources'
             includes ['**/*.png', '*.txt']
           end
         end

data/pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>picrate</artifactId>
-  <version>0.3.0</version>
+  <version>0.4.0</version>
   <name>picrate</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>http://maven.apache.org</url>
@@ -66,7 +66,7 @@ DO NOT MODIFIY - GENERATED CODE
   <properties>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
-    <source.directory>src</source.directory>
+    <source.directory>src/main</source.directory>
     <maven.compiler.target>1.8</maven.compiler.target>
     <processing.api>http://processing.github.io/processing-javadocs/core/</processing.api>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
@@ -100,7 +100,7 @@ DO NOT MODIFIY - GENERATED CODE
   <build>
     <resources>
       <resource>
-        <directory>${source.directory}/main/java</directory>
+        <directory>${source.directory}/java</directory>
         <includes>
           <include>**/**/*.glsl</include>
           <include>**/*.jnilib</include>
@@ -110,7 +110,7 @@ DO NOT MODIFIY - GENERATED CODE
         </excludes>
       </resource>
       <resource>
-        <directory>${source.directory}/main/resources</directory>
+        <directory>${source.directory}/resources</directory>
         <includes>
           <include>**/*.png</include>
           <include>*.txt</include>
@@ -127,7 +127,7 @@ DO NOT MODIFIY - GENERATED CODE
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.8.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>

data/src/main/java/monkstone/ColorUtil.java

@@ -1,24 +1,30 @@
 /**
- * This utility allows PiCrate users to use the processing.org color method
- * in their sketches. Includes a method to efficiently convert an array of web
- * strings to an array of color int, and another to convert an array of color
- * int to a string that can be used in ruby code (to generate web color array).
- * Copyright (c) 2018 Martin Prout.
+ * This utility allows JRubyArt users to use the processing.org color method
+ * in their sketches. Includes a method to efficiently convert an cols of web
+ * strings to an cols of color int, and another to convert an cols of p5 color
+ * (int) to a string that can be used in ruby code (to generate web color cols).
+ * Copyright (c) 2015-18 Martin Prout.
  * This utility is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3.0 of the License, or (at
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or (at
  * your option) any later version.
  *
- * Obtain a copy of the license at http://www.gnu.org/licenses/gpl-3.0-standalone.html
+ * Obtain a copy of the license at http://www.gnu.org/licenses/lgpl-2.1.html
  */
 package monkstone;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
 /**
  *
- *
+ * @author Martin Prout
  */
 public class ColorUtil {
 
+    static final String TOO_BIG = "produces a line too long a line for code";
+
     /**
      * Returns hex long as a positive int unless greater than Integer.MAX_VALUE
      * else return the complement as a negative integer or something like that
@@ -43,36 +49,55 @@ public class ColorUtil {
         return java.awt.Color.decode(hexstring).getRGB();
     }
 
-    /**
-     *
-     * @param web Array of web (hex) String
-     * @return array of color int according to java
-     */
-    static public int[] webArray(String[] web) {
-        int[] result = new int[web.length];
-        for (int i = 0; i < web.length; i++) {
-            result[i] = java.awt.Color.decode(web[i]).getRGB();
-        }
-        return result;
-    }
+     /**
+      *
+      * @param web Array of web (hex) String
+      * @return cols of p5 color (int)
+      */
+     static public int[] webArray(String... web) {
+         int[] result = new int[web.length];
+         for (int i = 0; i < web.length; i++) {
+             result[i] = java.awt.Color.decode(web[i]).getRGB();
+         }
+         return result;
+     }
 
     /**
-     * Return a ruby string of the form "%w(a b c)" where a, b, c are raw web
+     * Return a ruby string of the form "%w[a b c]" where a, b, c are raw web
      * strings. This string can be used in ruby code.
      *
-     * @param hex int array
+     * @param p5colors cols of p5 colors (int)
      * @return String for use in ruby
      */
-    static public String rubyString(int[] hex) {
-        StringBuilder result = new StringBuilder("%w(");
-        for (int i = 0; i < hex.length; i++) {
-            result.append(String.format("#%06X", (0xFFFFFF & hex[i])));
-            if (i < hex.length - 1) {
-                result.append(' ');
-            }
+    static public String rubyString(int[] p5colors) {
+        if (p5colors.length > 8){ return TOO_BIG;}
+        StringBuilder sb = new StringBuilder("%w[");
+        for (int p5color : p5colors) {
+            sb.append(String.format("#%06X", (0xFFFFFF & p5color)));
+            sb.append(' ');
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        sb.append("]\n");
+        return sb.toString();
+    }
+
+    static public String[] p5ToWeb(int[] p5colors) {
+        List<String> list = new ArrayList<>();
+        for (int p5color : p5colors) {
+            list.add(String.format("#%06X", (0xFFFFFF & p5color)));
+        }
+        return list.toArray(new String[0]);
+    }
+
+    static public int[] shuffle(int[] cols) {
+        Random rgen = new Random();  // Random number generator
+        for (int i = 0; i < cols.length; i++) {
+            int randomPosition = rgen.nextInt(cols.length);
+            int temp = cols[i];
+            cols[i] = cols[randomPosition];
+            cols[randomPosition] = temp;
         }
-        result.append(")\n");
-        return result.toString();
+        return cols;
     }
 
     /**

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

@@ -47,18 +47,29 @@ public class PShapeJava2D extends PShapeSVG {
   Paint strokeGradientPaint;
   Paint fillGradientPaint;
 
-
-  public PShapeJava2D(XML svg) {
+    /**
+     *
+     * @param svg
+     */
+    public PShapeJava2D(XML svg) {
     super(svg);
   }
 
-
-  public PShapeJava2D(PShapeSVG parent, XML properties, boolean parseKids) {
+    /**
+     *
+     * @param parent
+     * @param properties
+     * @param parseKids
+     */
+    public PShapeJava2D(PShapeSVG parent, XML properties, boolean parseKids) {
     super(parent, properties, parseKids);
   }
 
-
-  @Override
+    /**
+     *
+     * @param parent
+     */
+    @Override
   protected void setParent(PShapeSVG parent) {
     super.setParent(parent);
 
@@ -74,7 +85,11 @@ public class PShapeJava2D extends PShapeSVG {
   }
 
 
-  /** Factory method for subclasses. */
+  /** Factory method for subclasses.
+     * @param parent
+     * @param properties
+     * @param parseKids
+     * @return  */
   @Override
   protected PShapeSVG createShape(PShapeSVG parent, XML properties, boolean parseKids) {
     return new PShapeJava2D(parent, properties, parseKids);
@@ -298,8 +313,12 @@ public class PShapeJava2D extends PShapeSVG {
     }
   }
 
-
-  protected Paint calcGradientPaint(Gradient gradient) {
+    /**
+     *
+     * @param gradient
+     * @return
+     */
+    protected Paint calcGradientPaint(Gradient gradient) {
     if (gradient instanceof LinearGradient) {
 //      System.out.println("creating linear gradient");
       LinearGradient grad = (LinearGradient) gradient;
@@ -344,6 +363,11 @@ public class PShapeJava2D extends PShapeSVG {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
+    /**
+     *
+     * @param g
+     */
+
 
   @Override
   protected void styles(PGraphics g) {

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

@@ -57,7 +57,10 @@ import processing.core.PSurfaceNone;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
 
-
+/**
+ *
+ * @author tux
+ */
 public class PSurfaceAWT extends PSurfaceNone {
   GraphicsDevice displayDevice;
 
@@ -92,8 +95,11 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   int windowScaleFactor;
 
-
-  public PSurfaceAWT(PGraphics graphics) {
+    /**
+     *
+     * @param graphics
+     */
+    public PSurfaceAWT(PGraphics graphics) {
     //this.graphics = graphics;
     super(graphics);
 
@@ -183,6 +189,10 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
+    /**
+     *
+     */
+
 
   public class SmoothCanvas extends Canvas {
     private Dimension oldSize = new Dimension(0, 0);
@@ -190,31 +200,47 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
     // Turns out getParent() returns a JPanel on a JFrame. Yech.
+
+      /**
+       *
+       * @return
+       */
     public Frame getFrame() {
       return frame;
     }
 
-
-    @Override
+      /**
+       *
+       * @return
+       */
+      @Override
     public Dimension getPreferredSize() {
       return new Dimension(sketchWidth, sketchHeight);
     }
 
-
-    @Override
+      /**
+       *
+       * @return
+       */
+      @Override
     public Dimension getMinimumSize() {
       return getPreferredSize();
     }
 
-
-    @Override
+      /**
+       *
+       * @return
+       */
+      @Override
     public Dimension getMaximumSize() {
       //return resizable ? super.getMaximumSize() : getPreferredSize();
       return frame.isResizable() ? super.getMaximumSize() : getPreferredSize();
     }
 
-
-    @Override
+      /**
+       *
+       */
+      @Override
     public void validate() {
       super.validate();
       newSize.width = getWidth();
@@ -235,15 +261,21 @@ public class PSurfaceAWT extends PSurfaceNone {
       }
     }
 
-
-    @Override
+      /**
+       *
+       * @param g
+       */
+      @Override
     public void update(Graphics g) {
 //      System.out.println("updating");
       paint(g);
     }
 
-
-    @Override
+      /**
+       *
+       * @param screen
+       */
+      @Override
     public void paint(Graphics screen) {
 //      System.out.println("painting");
 //      if (useStrategy) {
@@ -280,8 +312,10 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
     */
 
-
-  synchronized protected void render() {
+    /**
+     *
+     */
+    synchronized protected void render() {
     if (canvas.isDisplayable() &&
         graphics.image != null) {
       if (canvas.getBufferStrategy() == null) {
@@ -357,6 +391,11 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   // what needs to happen here?
+
+    /**
+     *
+     * @param sketch
+     */
   @Override
   public void initOffscreen(PApplet sketch) {
     this.sketch = sketch;
@@ -384,8 +423,11 @@ public class PSurfaceAWT extends PSurfaceNone {
   }
   */
 
-
-  @Override
+    /**
+     *
+     * @param sketch
+     */
+    @Override
   public void initFrame(final PApplet sketch) {/*, int backgroundColor,
                         int deviceIndex, boolean fullScreen, boolean spanDisplays) {*/
     this.sketch = sketch;
@@ -558,7 +600,8 @@ public class PSurfaceAWT extends PSurfaceNone {
 //  }
 
 
-  /** Set the window (and dock, or whatever necessary) title. */
+  /** Set the window (and dock, or whatever necessary) title.
+     * @param title */
   @Override
   public void setTitle(String title) {
     frame.setTitle(title);
@@ -573,7 +616,8 @@ public class PSurfaceAWT extends PSurfaceNone {
   }
 
 
-  /** Set true if we want to resize things (default is not resizable) */
+  /** Set true if we want to resize things (default is not resizable)
+     * @param resizable */
   @Override
   public void setResizable(boolean resizable) {
     //this.resizable = resizable;  // really only used for canvas
@@ -583,26 +627,29 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
   }
 
-
-  @Override
+    /**
+     *
+     * @param image
+     */
+    @Override
   public void setIcon(PImage image) {
     Image awtImage = (Image) image.getNative();
-
-    if (PApplet.platform != PConstants.MACOSX) {
-      frame.setIconImage(awtImage);
-
-    } else {
-      try {
-        final String td = "processing.core.ThinkDifferent";
-        Class<?> thinkDifferent =
-          Thread.currentThread().getContextClassLoader().loadClass(td);
-        Method method =
-          thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
-        method.invoke(null, new Object[] { awtImage });
-      } catch (Exception e) {
-        e.printStackTrace();  // That's unfortunate
-      }
-    }
+    frame.setIconImage(awtImage);
+    // if (PApplet.platform != PConstants.MACOSX) {
+    //   frame.setIconImage(awtImage);
+    //
+    // } else {
+    //   try {
+    //     final String td = "processing.core.ThinkDifferent";
+    //     Class<?> thinkDifferent =
+    //       Thread.currentThread().getContextClassLoader().loadClass(td);
+    //     Method method =
+    //       thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
+    //     method.invoke(null, new Object[] { awtImage });
+    //   } catch (Exception e) {
+    //     e.printStackTrace();  // That's unfortunate
+    //   }
+    // }
   }
 
 
@@ -611,8 +658,12 @@ public class PSurfaceAWT extends PSurfaceNone {
     frame.setAlwaysOnTop(always);
   }
 
-
-  @Override
+    /**
+     *
+     * @param x
+     * @param y
+     */
+    @Override
   public void setLocation(int x, int y) {
     frame.setLocation(x, y);
   }
@@ -620,10 +671,14 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   List<Image> iconImages;
 
-  protected void setProcessingIcon(Frame frame) {
+    /**
+     *
+     * @param frame
+     */
+    protected void setProcessingIcon(Frame frame) {
     // On OS X, this only affects what shows up in the dock when minimized.
     // So replacing it is actually a step backwards. Brilliant.
-    if (PApplet.platform != PConstants.MACOSX) {
+    // if (PApplet.platform != PConstants.MACOSX) {
       //Image image = Toolkit.getDefaultToolkit().createImage(ICON_IMAGE);
       //frame.setIconImage(image);
       try {
@@ -643,25 +698,25 @@ public class PSurfaceAWT extends PSurfaceNone {
 
       } catch (Exception e) { }  // harmless; keep this to ourselves
 
-    } else {  // handle OS X differently
-      if (!dockIconSpecified()) {  // don't override existing -Xdock param
-        // On OS X, set this for AWT surfaces, which handles the dock image
-        // as well as the cmd-tab image that's shown. Just one size, I guess.
-        URL url = PApplet.class.getResource("/icon/icon-512.png");
-        // Seems dangerous to have this in code instead of using reflection, no?
-        //ThinkDifferent.setIconImage(Toolkit.getDefaultToolkit().getImage(url));
-        try {
-          final String td = "processing.core.ThinkDifferent";
-          Class<?> thinkDifferent =
-            Thread.currentThread().getContextClassLoader().loadClass(td);
-          Method method =
-            thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
-          method.invoke(null, new Object[] { Toolkit.getDefaultToolkit().getImage(url) });
-        } catch (Exception e) {
-          e.printStackTrace();  // That's unfortunate
-        }
-      }
-    }
+    // } else {  // handle OS X differently
+    //   if (!dockIconSpecified()) {  // don't override existing -Xdock param
+    //     // On OS X, set this for AWT surfaces, which handles the dock image
+    //     // as well as the cmd-tab image that's shown. Just one size, I guess.
+    //     URL url = PApplet.class.getResource("/icon/icon-512.png");
+    //     // Seems dangerous to have this in code instead of using reflection, no?
+    //     //ThinkDifferent.setIconImage(Toolkit.getDefaultToolkit().getImage(url));
+    //     try {
+    //       final String td = "processing.core.ThinkDifferent";
+    //       Class<?> thinkDifferent =
+    //         Thread.currentThread().getContextClassLoader().loadClass(td);
+    //       Method method =
+    //         thinkDifferent.getMethod("setIconImage", new Class[] { java.awt.Image.class });
+    //       method.invoke(null, new Object[] { Toolkit.getDefaultToolkit().getImage(url) });
+    //     } catch (Exception e) {
+    //       e.printStackTrace();  // That's unfortunate
+    //     }
+    //   }
+    // }
   }
 
 
@@ -712,6 +767,11 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   //public void placeFullScreen(boolean hideStop) {
+
+    /**
+     *
+     * @param stopColor
+     */
   @Override
   public void placePresent(int stopColor) {
     setFullFrame();
@@ -859,8 +919,12 @@ public class PSurfaceAWT extends PSurfaceNone {
     //frame.setVisible(true);  // re-add native resources
   }
 
-
-  @Override
+    /**
+     *
+     * @param location
+     * @param editorLocation
+     */
+    @Override
   public void placeWindow(int[] location, int[] editorLocation) {
     //Dimension window = setFrameSize(sketchWidth, sketchHeight);
     Dimension window = setFrameSize(); //sketchWidth, sketchHeight);
@@ -943,6 +1007,12 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   // needs to resize the frame, which will resize the canvas, and so on...
+
+    /**
+     *
+     * @param wide
+     * @param high
+     */
   @Override
   public void setSize(int wide, int high) {
     // When the surface is set to resizable via surface.setResizable(true),
@@ -1235,6 +1305,7 @@ public class PSurfaceAWT extends PSurfaceNone {
    * Figure out how to process a mouse event. When loop() has been
    * called, the events will be queued up until drawing is complete.
    * If noLoop() has been called, then events will happen immediately.
+     * @param nativeEvent
    */
   protected void nativeMouseEvent(java.awt.event.MouseEvent nativeEvent) {
     // the 'amount' is the number of button clicks for a click event,
@@ -1334,8 +1405,11 @@ public class PSurfaceAWT extends PSurfaceNone {
                                     peCount));
   }
 
-
-  protected void nativeKeyEvent(java.awt.event.KeyEvent event) {
+    /**
+     *
+     * @param event
+     */
+    protected void nativeKeyEvent(java.awt.event.KeyEvent event) {
     int peAction = 0;
     switch (event.getID()) {
     case java.awt.event.KeyEvent.KEY_PRESSED:
@@ -1367,6 +1441,10 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   // listeners, for all my men!
+
+    /**
+     *
+     */
   protected void addListeners() {
 
     canvas.addMouseListener(new MouseListener() {
@@ -1480,8 +1558,11 @@ public class PSurfaceAWT extends PSurfaceNone {
   boolean cursorVisible = true;
   Cursor invisibleCursor;
 
-
-  @Override
+    /**
+     *
+     * @param kind
+     */
+    @Override
   public void setCursor(int kind) {
     // Swap the HAND cursor because MOVE doesn't seem to be available on OS X
     // https://github.com/processing/processing/issues/2358
@@ -1493,8 +1574,13 @@ public class PSurfaceAWT extends PSurfaceNone {
     this.cursorType = kind;
   }
 
-
-  @Override
+    /**
+     *
+     * @param img
+     * @param x
+     * @param y
+     */
+    @Override
   public void setCursor(PImage img, int x, int y) {
     // Don't set cursorType, instead use cursorType to save the last
     // regular cursor type used for when cursor() is called.
@@ -1514,8 +1600,10 @@ public class PSurfaceAWT extends PSurfaceNone {
     cursorVisible = true;
   }
 
-
-  @Override
+    /**
+     *
+     */
+    @Override
   public void showCursor() {
     // Maybe should always set here? Seems dangerous, since it's likely that
     // Java will set the cursor to something else on its own, and the sketch
@@ -1526,8 +1614,10 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
   }
 
-
-  @Override
+    /**
+     *
+     */
+    @Override
   public void hideCursor() {
     // Because the OS may have shown the cursor on its own,
     // don't return if 'cursorVisible' is set to true. [rev 0216]
@@ -1548,8 +1638,11 @@ public class PSurfaceAWT extends PSurfaceNone {
     cursorVisible = false;
   }
 
-
-  @Override
+    /**
+     *
+     * @return
+     */
+    @Override
   public Thread createThread() {
     return new AnimationThread() {
       @Override