picrate 0.2.0-java → 0.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6df5ee2db467f6c57549b91693984aa44fc53046da0f6f3ca78ea2cf5bfc5ca
-  data.tar.gz: 50bc6c07d8a6dc4e2d4da207444cb7b219a4e73642c628f7a729e93c0f249970
+  metadata.gz: 98912fc6c5238c86d49019bba74ea9c72f89d4e0888d0718400e16da3f57756c
+  data.tar.gz: b0519d1aa9030d1a63c012e3274e34c3908287af72232b687f0a6e6e9d5fa6d3
 SHA512:
-  metadata.gz: a51e91f684e668bb94fb31e6807749895e0d8d1274087979249428dfe379a0b3d4e604425022fcebf7f8bf321a903e437577551bbf2c79f2e894c8961e0ae39f
-  data.tar.gz: e9d54da06f207fcc798bdc0969235915742b05d57d86afe62782cc6dacea1d606c58a0dda9f26a8ace8f32633d529b1910dfb122b4beb8fed6cb27dd2df3f7d6
+  metadata.gz: aa44b2c66509e6348d3a455cb27de46c1a8f004278adb4062a306f0b1da6d7398efa00b5841d3c71b7c9c2f6482b15cc6282fcd668789db518507046a76665bf
+  data.tar.gz: f63e3511db6a033fcce9bf87a691324deebe1329897edf9c74556d9d1da701acbecd2ca7f9b601adf42cc1b2521d8d55b8a996b0115e619affd63160d061a2d7

data/README.md

@@ -1,9 +1,12 @@
-__C6H3N3O7__ [![Build Status](https://travis-ci.org/ruby-processing/PiCrate.svg?branch=master)](https://travis-ci.org/ruby-processing/PiCrate) 
-[![Gem Version](https://badge.fury.io/rb/picrate.svg)](https://badge.fury.io/rb/picrate)
+__C6H3N3O7__ [![Gem Version](https://badge.fury.io/rb/picrate.svg)](https://badge.fury.io/rb/picrate)
 
 # PiCrate
 Create processing sketches in ruby on raspberry-pi and linux (this project is a parallel development of [propane][propane] targetting the raspberry-pi, but will initially be developed on a regular linux box). The aim is to produce a gem installable app that can be run with jruby, with minimal dependencies. Drop the `C` and you get pirate, or and an `e` and get `PiCreate`, a happy coincidence?
 
+### To install from rubygems ###
+
+Unfortunately jgem will not currently download the gem (see #https://github.com/jruby/jruby/issues/5192 issue on raspberrypi) so download the gem and install locally.
+
 ### To Build and Test ###
 
 Clone this repo:-
@@ -12,14 +15,14 @@ Requires maven, [jdk8][oracle] (but could be openjdk), and a jruby install.
 
 ```bash
 cd PiCrate
-rake
-jgem install picrate-0.1.0-java.gem
+rake # assumes an installed version of vanilla processing
+jgem install picrate-0.2.0-java.gem
 ```
 To create a template sketch:-
 ```bash
 picrate -c my_sketch 200 200
 ```
-Edit sketch (vim is good choice):-
+Edit sketch (vim is a good choice):-
 ```ruby
 #!/usr/bin/env jruby
 # frozen_string_literal: false

data/Rakefile

@@ -13,14 +13,22 @@ end
 
 task default: [:init, :compile, :install, :test, :gem]
 
-desc 'Create Manifest'
+# depends on installed processing, with processing on path
+desc 'Create Manifest and Copy Jars'
 task :init do
   create_manifest
+  processing_root = File.dirname(`readlink -f $(which processing)`)
+  jar_dir = File.join(processing_root, 'core', 'library')
+  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'))
+  end
 end
 
 desc 'Install'
 task :install do
-  sh 'mv target/picrate-0.2.0.jar lib'
+  sh 'mv target/picrate-0.3.0.jar lib'
 end
 
 desc 'Gem'

data/docs/_posts/2018-06-26-auto_install_picrate.md

@@ -0,0 +1,15 @@
+---
+layout: post
+title:  "Automated PiCrate Install"
+date:   2018-06-26 07:34:13
+categories: PiCrate update
+permalink: /install_picrate/
+---
+
+For a semi-automated setup and install, download and extract [this gist](https://gist.github.com/monkstone/8f06529790c36f5b7f668015faadcbc5/archive/d8617b32e5b83f33e077d48b862a79b46bcdbbbc.zip)
+
+```bash
+bash gem_environment.sh # sets up a local gem environment
+rake # default is to install jruby to opt, then link using update-alternatives
+```
+Adjust script to suit needs if required, currently downloads gems and installs using downloaded copies (currently there is an issue with jgem downloads from rubygems on raspberryPI).

data/lib/export.txt

@@ -0,0 +1,8 @@
+# If you want to support more platforms, visit jogamp.org to get the 
+# natives libraries for the platform in question (i.e. Solaris). 
+
+name = OpenGL
+
+application.linux64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-amd64.jar,gluegen-rt-natives-linux-amd64.jar
+application.linux-armv6hf=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-armv6hf.jar,gluegen-rt-natives-linux-armv6hf.jar
+application.linux-arm64=core.jar,jogl-all.jar,gluegen-rt.jar,jogl-all-natives-linux-aarch64.jar,gluegen-rt-natives-linux-aarch64.jar

data/lib/picrate/app.rb

@@ -62,6 +62,10 @@ module Processing
       self.class.sketch_class
     end
 
+    def sketch_title(title)
+      surface.set_title(title)
+    end
+
     # Keep track of what inherits from the Processing::App, because we're
     # going to want to instantiate one.
     def self.inherited(subclass)
@@ -133,10 +137,6 @@ module Processing
     def post_initialize(_args)
     end
 
-    def sketch_title(title)
-      surface.set_title(title)
-    end
-
     def data_path(dat)
       dat_root = File.join(SKETCH_ROOT, 'data')
       Dir.mkdir(dat_root) unless File.exist?(dat_root)

data/lib/picrate/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PiCrate
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 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.2.0.jar'
+  gem.files << 'lib/picrate-0.3.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.2.0'
+  id 'ruby-processing:picrate:0.3.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'

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.2.0</version>
+  <version>0.3.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>

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

@@ -60,10 +60,6 @@ public class PGraphicsJava2D extends PGraphics {
 ////  boolean useOffscreen = true;  // ~40fps
 //  boolean useOffscreen = false;
 
-    /**
-     *
-     */
-
   public Graphics2D g2;
 //  protected BufferedImage offscreen;
 
@@ -95,45 +91,16 @@ public class PGraphicsJava2D extends PGraphics {
   Rectangle2D.Float rect = new Rectangle2D.Float();
   Arc2D.Float arc = new Arc2D.Float();
 
-    /**
-     *
-     */
-    protected Color tintColorObject;
-
-    /**
-     *
-     */
-    protected Color fillColorObject;
-
-    /**
-     *
-     */
-    public boolean fillGradient;
-
-    /**
-     *
-     */
-    public Paint fillGradientObject;
-
-    /**
-     *
-     */
-    protected Stroke strokeObject;
-
-    /**
-     *
-     */
-    protected Color strokeColorObject;
+  protected Color tintColorObject;
 
-    /**
-     *
-     */
-    public boolean strokeGradient;
+  protected Color fillColorObject;
+  public boolean fillGradient;
+  public Paint fillGradientObject;
 
-    /**
-     *
-     */
-    public Paint strokeGradientObject;
+  protected Stroke strokeObject;
+  protected Color strokeColorObject;
+  public boolean strokeGradient;
+  public Paint strokeGradientObject;
 
   Font fontObject;
 
@@ -143,10 +110,6 @@ public class PGraphicsJava2D extends PGraphics {
 
   // INTERNAL
 
-    /**
-     *
-     */
-
 
   public PGraphicsJava2D() { }
 
@@ -293,7 +256,6 @@ public class PGraphicsJava2D extends PGraphics {
   /**
    * Still need a means to get the java.awt.Image object, since getNative()
    * is going to return the {@link Graphics2D} object.
-     * @return 
    */
   @Override
   public Image getImage() {
@@ -301,8 +263,7 @@ public class PGraphicsJava2D extends PGraphics {
   }
 
 
-  /** Returns the java.awt.Graphics2D object used by this renderer.
-     * @return  */
+  /** Returns the java.awt.Graphics2D object used by this renderer. */
   @Override
   public Object getNative() {
     return g2;
@@ -332,11 +293,6 @@ public class PGraphicsJava2D extends PGraphics {
 
 //  Graphics2D g2old;
 
-    /**
-     *
-     * @return
-     */
-
   public Graphics2D checkImage() {
     if (image == null ||
       ((BufferedImage) image).getWidth() != width*pixelDensity ||
@@ -1367,11 +1323,6 @@ public class PGraphicsJava2D extends PGraphics {
 
   // JAVA2D SHAPE/PATH HANDLING
 
-    /**
-     *
-     * @param s
-     */
-
 
   protected void fillShape(Shape s) {
     if (fillGradient) {
@@ -1383,11 +1334,8 @@ public class PGraphicsJava2D extends PGraphics {
     }
   }
 
-    /**
-     *
-     * @param s
-     */
-    protected void strokeShape(Shape s) {
+
+  protected void strokeShape(Shape s) {
     if (strokeGradient) {
       g2.setPaint(strokeGradientObject);
       g2.draw(s);
@@ -1397,11 +1345,8 @@ public class PGraphicsJava2D extends PGraphics {
     }
   }
 
-    /**
-     *
-     * @param s
-     */
-    protected void drawShape(Shape s) {
+
+  protected void drawShape(Shape s) {
     if (fillGradient) {
       g2.setPaint(fillGradientObject);
       g2.fill(s);
@@ -1614,7 +1559,6 @@ public class PGraphicsJava2D extends PGraphics {
 
   /**
    * Handle renderer-specific image drawing.
-     * @param who
    */
   @Override
   protected void imageImpl(PImage who,
@@ -2486,10 +2430,8 @@ public class PGraphicsJava2D extends PGraphics {
     strokeImpl();
   }
 
-    /**
-     *
-     */
-    protected void strokeImpl() {
+
+  protected void strokeImpl() {
     int cap = BasicStroke.CAP_BUTT;
     if (strokeCap == ROUND) {
       cap = BasicStroke.CAP_ROUND;
@@ -2611,11 +2553,7 @@ public class PGraphicsJava2D extends PGraphics {
 
   int[] clearPixels;
 
-    /**
-     *
-     * @param color
-     */
-    protected void clearPixels(int color) {
+  protected void clearPixels(int color) {
     // On a hi-res display, image may be larger than width/height
     int imageWidth = image.getWidth(null);
     int imageHeight = image.getHeight(null);
@@ -2772,11 +2710,6 @@ public class PGraphicsJava2D extends PGraphics {
 
   // getImage, setCache, getCache, removeCache, isModified, setModified
 
-    /**
-     *
-     * @return
-     */
-
 
   protected WritableRaster getRaster() {
     WritableRaster raster = null;
@@ -2850,8 +2783,6 @@ public class PGraphicsJava2D extends PGraphics {
    * <P>
    * Unlike in PImage, where updatePixels() only requests that the
    * update happens, in PGraphicsJava2D, this will happen immediately.
-     * @param c
-     * @param d
    */
   @Override
   public void updatePixels(int x, int y, int c, int d) {

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

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

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

@@ -57,10 +57,7 @@ import processing.core.PSurfaceNone;
 import processing.event.KeyEvent;
 import processing.event.MouseEvent;
 
-/**
- *
- * @author tux
- */
+
 public class PSurfaceAWT extends PSurfaceNone {
   GraphicsDevice displayDevice;
 
@@ -95,11 +92,8 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   int windowScaleFactor;
 
-    /**
-     *
-     * @param graphics
-     */
-    public PSurfaceAWT(PGraphics graphics) {
+
+  public PSurfaceAWT(PGraphics graphics) {
     //this.graphics = graphics;
     super(graphics);
 
@@ -189,10 +183,6 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-    /**
-     *
-     */
-
 
   public class SmoothCanvas extends Canvas {
     private Dimension oldSize = new Dimension(0, 0);
@@ -200,47 +190,31 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
     // Turns out getParent() returns a JPanel on a JFrame. Yech.
-
-      /**
-       *
-       * @return
-       */
     public Frame getFrame() {
       return frame;
     }
 
-      /**
-       *
-       * @return
-       */
-      @Override
+
+    @Override
     public Dimension getPreferredSize() {
       return new Dimension(sketchWidth, sketchHeight);
     }
 
-      /**
-       *
-       * @return
-       */
-      @Override
+
+    @Override
     public Dimension getMinimumSize() {
       return getPreferredSize();
     }
 
-      /**
-       *
-       * @return
-       */
-      @Override
+
+    @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();
@@ -261,21 +235,15 @@ public class PSurfaceAWT extends PSurfaceNone {
       }
     }
 
-      /**
-       *
-       * @param g
-       */
-      @Override
+
+    @Override
     public void update(Graphics g) {
 //      System.out.println("updating");
       paint(g);
     }
 
-      /**
-       *
-       * @param screen
-       */
-      @Override
+
+    @Override
     public void paint(Graphics screen) {
 //      System.out.println("painting");
 //      if (useStrategy) {
@@ -312,10 +280,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
     */
 
-    /**
-     *
-     */
-    synchronized protected void render() {
+
+  synchronized protected void render() {
     if (canvas.isDisplayable() &&
         graphics.image != null) {
       if (canvas.getBufferStrategy() == null) {
@@ -391,11 +357,6 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   // what needs to happen here?
-
-    /**
-     *
-     * @param sketch
-     */
   @Override
   public void initOffscreen(PApplet sketch) {
     this.sketch = sketch;
@@ -423,11 +384,8 @@ public class PSurfaceAWT extends PSurfaceNone {
   }
   */
 
-    /**
-     *
-     * @param sketch
-     */
-    @Override
+
+  @Override
   public void initFrame(final PApplet sketch) {/*, int backgroundColor,
                         int deviceIndex, boolean fullScreen, boolean spanDisplays) {*/
     this.sketch = sketch;
@@ -600,8 +558,7 @@ public class PSurfaceAWT extends PSurfaceNone {
 //  }
 
 
-  /** Set the window (and dock, or whatever necessary) title.
-     * @param title */
+  /** Set the window (and dock, or whatever necessary) title. */
   @Override
   public void setTitle(String title) {
     frame.setTitle(title);
@@ -616,8 +573,7 @@ public class PSurfaceAWT extends PSurfaceNone {
   }
 
 
-  /** Set true if we want to resize things (default is not resizable)
-     * @param resizable */
+  /** Set true if we want to resize things (default is not resizable) */
   @Override
   public void setResizable(boolean resizable) {
     //this.resizable = resizable;  // really only used for canvas
@@ -627,29 +583,26 @@ public class PSurfaceAWT extends PSurfaceNone {
     }
   }
 
-    /**
-     *
-     * @param image
-     */
-    @Override
+
+  @Override
   public void setIcon(PImage image) {
     Image awtImage = (Image) image.getNative();
-    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
-    //   }
-    // }
+
+    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
+      }
+    }
   }
 
 
@@ -658,12 +611,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     frame.setAlwaysOnTop(always);
   }
 
-    /**
-     *
-     * @param x
-     * @param y
-     */
-    @Override
+
+  @Override
   public void setLocation(int x, int y) {
     frame.setLocation(x, y);
   }
@@ -671,14 +620,10 @@ public class PSurfaceAWT extends PSurfaceNone {
 
   List<Image> iconImages;
 
-    /**
-     *
-     * @param frame
-     */
-    protected void setProcessingIcon(Frame 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 {
@@ -698,25 +643,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
+        }
+      }
+    }
   }
 
 
@@ -767,11 +712,6 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   //public void placeFullScreen(boolean hideStop) {
-
-    /**
-     *
-     * @param stopColor
-     */
   @Override
   public void placePresent(int stopColor) {
     setFullFrame();
@@ -919,12 +859,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     //frame.setVisible(true);  // re-add native resources
   }
 
-    /**
-     *
-     * @param location
-     * @param editorLocation
-     */
-    @Override
+
+  @Override
   public void placeWindow(int[] location, int[] editorLocation) {
     //Dimension window = setFrameSize(sketchWidth, sketchHeight);
     Dimension window = setFrameSize(); //sketchWidth, sketchHeight);
@@ -1007,12 +943,6 @@ 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),
@@ -1305,7 +1235,6 @@ 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,
@@ -1405,11 +1334,8 @@ public class PSurfaceAWT extends PSurfaceNone {
                                     peCount));
   }
 
-    /**
-     *
-     * @param event
-     */
-    protected void nativeKeyEvent(java.awt.event.KeyEvent event) {
+
+  protected void nativeKeyEvent(java.awt.event.KeyEvent event) {
     int peAction = 0;
     switch (event.getID()) {
     case java.awt.event.KeyEvent.KEY_PRESSED:
@@ -1441,10 +1367,6 @@ public class PSurfaceAWT extends PSurfaceNone {
 
 
   // listeners, for all my men!
-
-    /**
-     *
-     */
   protected void addListeners() {
 
     canvas.addMouseListener(new MouseListener() {
@@ -1558,11 +1480,8 @@ public class PSurfaceAWT extends PSurfaceNone {
   boolean cursorVisible = true;
   Cursor invisibleCursor;
 
-    /**
-     *
-     * @param kind
-     */
-    @Override
+
+  @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
@@ -1574,13 +1493,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     this.cursorType = kind;
   }
 
-    /**
-     *
-     * @param img
-     * @param x
-     * @param y
-     */
-    @Override
+
+  @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.
@@ -1600,10 +1514,8 @@ 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
@@ -1614,10 +1526,8 @@ 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]
@@ -1638,11 +1548,8 @@ public class PSurfaceAWT extends PSurfaceNone {
     cursorVisible = false;
   }
 
-    /**
-     *
-     * @return
-     */
-    @Override
+
+  @Override
   public Thread createThread() {
     return new AnimationThread() {
       @Override