propane 3.5.0-java → 3.6.0-java

data/src/main/java/processing/data/XML.java

@@ -1127,7 +1127,7 @@ public class XML implements Serializable {
       }
 
     } catch (Exception e) {
-
+      e.printStackTrace();
     }
     return null;
   }

data/src/main/java/processing/event/Event.java

@@ -31,7 +31,7 @@ public class Event {
 
   // These correspond to the java.awt.Event modifiers (not to be confused with
   // the newer getModifiersEx), though they're not guaranteed to in the future.
-  static public final int SHIFT = 1;
+  static public final int SHIFT = 1 << 0;
   static public final int CTRL  = 1 << 1;
   static public final int META  = 1 << 2;
   static public final int ALT   = 1 << 3;

data/src/main/java/processing/event/MouseEvent.java

@@ -62,7 +62,8 @@ public class MouseEvent extends Event {
   }
 
 
-  /** Which button was pressed, either LEFT, CENTER, or RIGHT. */
+  /** Which button was pressed, either LEFT, CENTER, or RIGHT.
+   * @return  */
   public int getButton() {
     return button;
   }
@@ -70,12 +71,12 @@ public class MouseEvent extends Event {
 
   /**
    * Number of clicks for mouse button events, or the number of steps (positive
-   * or negative depending on direction) for a mouse wheel event.
-   * Wheel events follow Java (see <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>), so
-   * getAmount() will return "negative values if the mouse wheel was rotated
-   * up or away from the user" and positive values in the other direction.
+   * or negative depending on direction) for a mouse wheel event.Wheel events follow Java (see <a href="http://docs.oracle.com/javase/6/docs/api/java/awt/event/MouseWheelEvent.html#getWheelRotation()">here</a>), so
+ getAmount() will return "negative values if the mouse wheel was rotated
+ up or away from the user" and positive values in the other direction.
    * On Mac OS X, this will be reversed when "natural" scrolling is enabled
-   * in System Preferences &rarr Mouse.
+ in System Preferences &rarr Mouse.
+   * @return 
    */
   public int getCount() {
     return count;

data/src/main/java/processing/javafx/PGraphicsFX2D.java

@@ -1,357 +1,32 @@
-package processing.javafx;
-
-import processing.core.PGraphics;
-import processing.core.PImage;
-import processing.core.PMatrix;
-import processing.core.PMatrix2D;
-import processing.core.PMatrix3D;
-import processing.core.PShape;
-import processing.core.PSurface;
-
-public class PGraphicsFX2D extends PGraphics {
-
-    final String message = "FX2D renderer not supported in this version of propane";
-
-    public PGraphicsFX2D() {
-    }
-
-    @Override
-    public void applyMatrix(float n00, float n01, float n02, float n10, float n11, float n12) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void applyMatrix(float n00, float n01, float n02, float n03, float n10, float n11, float n12, float n13, float n20, float n21, float n22, float n23, float n30, float n31, float n32, float n33) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    protected void backgroundImpl() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void beginContour() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void beginDraw() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void beginShape(int kind) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void bezierDetail(int detail) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void bezierVertex(float x1, float y1, float x2, float y2, float x3, float y3) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void bezierVertex(float x2, float y2, float z2, float x3, float y3, float z3, float x4, float y4, float z4) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void box(float w, float h, float d) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public PSurface createSurface() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void curveDetail(int detail) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void curveVertex(float x, float y, float z) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void endContour() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void endDraw() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void endShape(int mode) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void flush() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public int get(int x, int y) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public PMatrix getMatrix() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public PMatrix2D getMatrix(PMatrix2D target) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public PMatrix3D getMatrix(PMatrix3D target) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public Object getNative() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void line(float x1, float y1, float x2, float y2) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void loadPixels() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public PShape loadShape(String filename) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public PShape loadShape(String filename, String options) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void mask(PImage alpha) {
-        throw new UnsupportedOperationException(message);
-    }
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
-    @Override
-    public void noClip() {
-        throw new UnsupportedOperationException(message);
-    }
+/*
+  Part of the Processing project - http://processing.org
 
-    @Override
-    public void point(float x, float y) {
-        throw new UnsupportedOperationException(message);
-    }
+  Copyright (c) 2015 The Processing Foundation
 
-    @Override
-    public void popMatrix() {
-        throw new UnsupportedOperationException(message);
-    }
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation, version 2.1.
 
-    @Override
-    public void printMatrix() {
-        throw new UnsupportedOperationException(message);
-    }
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
 
-    @Override
-    public void pushMatrix() {
-        throw new UnsupportedOperationException(message);
-    }
+  You should have received a copy of the GNU Lesser General
+  Public License along with this library; if not, write to the
+  Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+*/
 
-    @Override
-    public void quad(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void quadraticVertex(float ctrlX, float ctrlY, float endX, float endY) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void quadraticVertex(float x2, float y2, float z2, float x4, float y4, float z4) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void resetMatrix() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void rotate(float angle) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void rotate(float angle, float vx, float vy, float vz) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void rotateX(float angle) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void rotateY(float angle) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void rotateZ(float angle) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void scale(float s) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void scale(float sx, float sy) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void scale(float sx, float sy, float sz) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float screenX(float x, float y) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float screenX(float x, float y, float z) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float screenY(float x, float y) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float screenY(float x, float y, float z) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float screenZ(float x, float y, float z) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void set(int x, int y, int argb) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setMatrix(PMatrix2D source) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setMatrix(PMatrix3D source) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void shearX(float angle) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void shearY(float angle) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void sphere(float r) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void strokeCap(int cap) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void strokeJoin(int join) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void strokeWeight(float weight) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float textAscent() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public float textDescent() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void texture(PImage image) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void translate(float tx, float ty) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void triangle(float x1, float y1, float x2, float y2, float x3, float y3) {
-        throw new UnsupportedOperationException(message);
-    }
+package processing.javafx;
 
-    @Override
-    public void vertex(float x, float y) {
-        throw new UnsupportedOperationException(message);
-    }
 
-    @Override
-    public void vertex(float x, float y, float z) {
-        throw new UnsupportedOperationException(message);
-    }
 
-    @Override
-    public void vertex(float[] v) {
-        throw new UnsupportedOperationException(message);
-    }
+import processing.core.*;
 
-    @Override
-    public void vertex(float x, float y, float u, float v) {
-        throw new UnsupportedOperationException(message);
-    }
 
-    @Override
-    public void vertex(float x, float y, float z, float u, float v) {
-        throw new UnsupportedOperationException(message);
-    }
+public class PGraphicsFX2D extends PGraphics {
+  
 }

data/src/main/java/processing/javafx/PSurfaceFX.java

@@ -1,3 +1,5 @@
+/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
+
 /*
   Part of the Processing project - http://processing.org
 
@@ -16,156 +18,156 @@
   Public License along with this library; if not, write to the
   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
   Boston, MA  02111-1307  USA
- */
+*/
+
 package processing.javafx;
 
+
 import java.io.File;
-import processing.core.PApplet;
-import processing.core.PImage;
-import processing.core.PSurface;
+import processing.core.*;
+
 
 public class PSurfaceFX implements PSurface {
+  final String MESSAGE = "Not implemented by ruby-processing projects";
 
-    final String message = "FX2D renderer not supported in this version of propane";
-
-    @Override
-    public void initOffscreen(PApplet sketch) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void initFrame(PApplet sketch) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public Object getNative() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setTitle(String title) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setVisible(boolean visible) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setResizable(boolean resizable) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setAlwaysOnTop(boolean always) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setIcon(PImage icon) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void placeWindow(int[] location, int[] editorLocation) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void placePresent(int stopColor) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setupExternalMessages() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setLocation(int x, int y) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setSize(int width, int height) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setFrameRate(float fps) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setCursor(int kind) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void setCursor(PImage image, int hotspotX, int hotspotY) {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void showCursor() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void hideCursor() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void startThread() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void pauseThread() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public void resumeThread() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public boolean stopThread() {
-        throw new UnsupportedOperationException(message);
-    }
-
-    @Override
-    public boolean isStopped() {
-        throw new UnsupportedOperationException(message);
-    }
+  @Override
+  public void initOffscreen(PApplet sketch) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void initFrame(PApplet sketch) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
 
   @Override
   public PImage loadImage(String path, Object... args) {
-    throw new UnsupportedOperationException(message); 
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
   }
 
   @Override
   public void selectInput(String prompt, String callback, File file, Object callbackObject) {
-    throw new UnsupportedOperationException(message); 
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
   }
 
   @Override
   public void selectOutput(String prompt, String callback, File file, Object callbackObject) {
-    throw new UnsupportedOperationException(message); 
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
   }
 
   @Override
   public void selectFolder(String prompt, String callback, File file, Object callbackObject) {
-    throw new UnsupportedOperationException(message); 
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public Object getNative() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setTitle(String title) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setVisible(boolean visible) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setResizable(boolean resizable) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setAlwaysOnTop(boolean always) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setIcon(PImage icon) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void placeWindow(int[] location, int[] editorLocation) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void placePresent(int stopColor) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setupExternalMessages() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setLocation(int x, int y) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setSize(int width, int height) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setFrameRate(float fps) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setCursor(int kind) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void setCursor(PImage image, int hotspotX, int hotspotY) {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void showCursor() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void hideCursor() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
   }
 
   @Override
   public boolean openLink(String url) {
-    throw new UnsupportedOperationException(message); 
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void startThread() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public void pauseThread() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
   }
 
+  @Override
+  public void resumeThread() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public boolean stopThread() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+
+  @Override
+  public boolean isStopped() {
+    throw new UnsupportedOperationException(MESSAGE); //To change body of generated methods, choose Tools | Templates.
+  }
+  
 }