propane 3.1.0.pre-java → 3.2.0-java

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

@@ -1,5 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
 /*
   Part of the Processing project - http://processing.org
 
@@ -18,108 +16,89 @@
   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.event;
 
-
 public class Event {
-  protected Object nativeObject;
-
-  protected long millis;
-  protected int action;
-
-  // 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 << 0;
-  static public final int CTRL  = 1 << 1;
-  static public final int META  = 1 << 2;
-  static public final int ALT   = 1 << 3;
-  protected int modifiers;
-
-  // Types of events. As with all constants in Processing, brevity's preferred.
-  static public final int KEY = 1;
-  static public final int MOUSE = 2;
-  static public final int TOUCH = 3;
-  protected int flavor;
-
-
-  public Event(Object nativeObject, long millis, int action, int modifiers) {
-    this.nativeObject = nativeObject;
-    this.millis = millis;
-    this.action = action;
-    this.modifiers = modifiers;
-  }
-
-
-  public int getFlavor() {
-    return flavor;
-  }
-
-
-  /**
-   * Get the platform-native event object. This might be the java.awt event
-   * on the desktop, though if you're using OpenGL on the desktop it'll be a
-   * NEWT event that JOGL uses. Android events are something else altogether.
-   * Bottom line, use this only if you know what you're doing, and don't make
-   * assumptions about the class type.
-   */
-  public Object getNative() {
-    return nativeObject;
-  }
 
+    protected Object nativeObject;
+
+    protected long millis;
+    protected int action;
+
+    // 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 << 0;
+    static public final int CTRL = 1 << 1;
+    static public final int META = 1 << 2;
+    static public final int ALT = 1 << 3;
+    protected int modifiers;
+
+    // Types of events. As with all constants in Processing, brevity's preferred.
+    static public final int KEY = 1;
+    static public final int MOUSE = 2;
+    static public final int TOUCH = 3;
+    protected int flavor;
+
+    public Event(Object nativeObject, long millis, int action, int modifiers) {
+        this.nativeObject = nativeObject;
+        this.millis = millis;
+        this.action = action;
+        this.modifiers = modifiers;
+    }
+
+    public int getFlavor() {
+        return flavor;
+    }
+
+    /**
+     * Get the platform-native event object. This might be the java.awt event on
+     * the desktop, though if you're using OpenGL on the desktop it'll be a NEWT
+     * event that JOGL uses. Android events are something else altogether.
+     * Bottom line, use this only if you know what you're doing, and don't make
+     * assumptions about the class type.
+     */
+    public Object getNative() {
+        return nativeObject;
+    }
 
 //  public void setNative(Object nativeObject) {
 //    this.nativeObject = nativeObject;
 //  }
-
-
-  public long getMillis() {
-    return millis;
-  }
-
+    public long getMillis() {
+        return millis;
+    }
 
 //  public void setMillis(long millis) {
 //    this.millis = millis;
 //  }
-
-
-  public int getAction() {
-    return action;
-  }
-
+    public int getAction() {
+        return action;
+    }
 
 //  public void setAction(int action) {
 //    this.action = action;
 //  }
-
-
-  public int getModifiers() {
-    return modifiers;
-  }
-
+    public int getModifiers() {
+        return modifiers;
+    }
 
 //  public void setModifiers(int modifiers) {
 //    this.modifiers = modifiers;
 //  }
-
-
-  public boolean isShiftDown() {
-    return (modifiers & SHIFT) != 0;
-  }
-
-
-  public boolean isControlDown() {
-    return (modifiers & CTRL) != 0;
-  }
-
-
-  public boolean isMetaDown() {
-    return (modifiers & META) != 0;
-  }
-
-
-  public boolean isAltDown() {
-    return (modifiers & ALT) != 0;
-  }
-}
+    public boolean isShiftDown() {
+        return (modifiers & SHIFT) != 0;
+    }
+
+    public boolean isControlDown() {
+        return (modifiers & CTRL) != 0;
+    }
+
+    public boolean isMetaDown() {
+        return (modifiers & META) != 0;
+    }
+
+    public boolean isAltDown() {
+        return (modifiers & ALT) != 0;
+    }
+}

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

@@ -1,5 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
 /*
   Part of the Processing project - http://processing.org
 
@@ -18,53 +16,48 @@
   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.event;
 
-
 public class KeyEvent extends Event {
-  static public final int PRESS = 1;
-  static public final int RELEASE = 2;
-  static public final int TYPE = 3;
-
-  char key;
-  int keyCode;
-
-  boolean isAutoRepeat;
-
-
-  public KeyEvent(Object nativeObject,
-                  long millis, int action, int modifiers,
-                  char key, int keyCode) {
-    super(nativeObject, millis, action, modifiers);
-    this.flavor = KEY;
-    this.key = key;
-    this.keyCode = keyCode;
-  }
-
-  public KeyEvent(Object nativeObject,
-                  long millis, int action, int modifiers,
-                  char key, int keyCode, boolean isAutoRepeat) {
-    super(nativeObject, millis, action, modifiers);
-    this.flavor = KEY;
-    this.key = key;
-    this.keyCode = keyCode;
-    this.isAutoRepeat = isAutoRepeat;
-  }
-
-
-  public char getKey() {
-    return key;
-  }
-
-
-  public int getKeyCode() {
-    return keyCode;
-  }
-
 
-  public boolean isAutoRepeat() {
-    return isAutoRepeat;
-  }
-}
+    static public final int PRESS = 1;
+    static public final int RELEASE = 2;
+    static public final int TYPE = 3;
+
+    char key;
+    int keyCode;
+
+    boolean isAutoRepeat;
+
+    public KeyEvent(Object nativeObject,
+            long millis, int action, int modifiers,
+            char key, int keyCode) {
+        super(nativeObject, millis, action, modifiers);
+        this.flavor = KEY;
+        this.key = key;
+        this.keyCode = keyCode;
+    }
+
+    public KeyEvent(Object nativeObject,
+            long millis, int action, int modifiers,
+            char key, int keyCode, boolean isAutoRepeat) {
+        super(nativeObject, millis, action, modifiers);
+        this.flavor = KEY;
+        this.key = key;
+        this.keyCode = keyCode;
+        this.isAutoRepeat = isAutoRepeat;
+    }
+
+    public char getKey() {
+        return key;
+    }
+
+    public int getKeyCode() {
+        return keyCode;
+    }
+
+    public boolean isAutoRepeat() {
+        return isAutoRepeat;
+    }
+}

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

@@ -1,5 +1,3 @@
-/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
-
 /*
   Part of the Processing project - http://processing.org
 
@@ -18,132 +16,124 @@
   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.event;
 
 //import processing.core.PConstants;
-
-
 public class MouseEvent extends Event {
-  static public final int PRESS = 1;
-  static public final int RELEASE = 2;
-  static public final int CLICK = 3;
-  static public final int DRAG = 4;
-  static public final int MOVE = 5;
-  static public final int ENTER = 6;
-  static public final int EXIT = 7;
-  static public final int WHEEL = 8;
-
-  protected int x, y;
-  protected int button;
+
+    static public final int PRESS = 1;
+    static public final int RELEASE = 2;
+    static public final int CLICK = 3;
+    static public final int DRAG = 4;
+    static public final int MOVE = 5;
+    static public final int ENTER = 6;
+    static public final int EXIT = 7;
+    static public final int WHEEL = 8;
+
+    protected int x, y;
+    protected int button;
 //  protected int clickCount;
 //  protected float amount;
-  protected int count;
-
+    protected int count;
 
 //  public MouseEvent(int x, int y) {
 //    this(null,
 //         System.currentTimeMillis(), PRESSED, 0,
 //         x, y, PConstants.LEFT, 1);
 //  }
+    public MouseEvent(Object nativeObject,
+            long millis, int action, int modifiers,
+            int x, int y, int button, int count) {  //float amount) {  //int clickCount) {
+        super(nativeObject, millis, action, modifiers);
+        this.flavor = MOUSE;
+        this.x = x;
+        this.y = y;
+        this.button = button;
+        //this.clickCount = clickCount;
+        //this.amount = amount;
+        this.count = count;
+    }
 
+    public int getX() {
+        return x;
+    }
 
-  public MouseEvent(Object nativeObject,
-                    long millis, int action, int modifiers,
-                    int x, int y, int button, int count) {  //float amount) {  //int clickCount) {
-    super(nativeObject, millis, action, modifiers);
-    this.flavor = MOUSE;
-    this.x = x;
-    this.y = y;
-    this.button = button;
-    //this.clickCount = clickCount;
-    //this.amount = amount;
-    this.count = count;
-  }
-
-
-  public int getX() {
-    return x;
-  }
-
-
-  public int getY() {
-    return y;
-  }
-
-
-  /** Which button was pressed, either LEFT, CENTER, or RIGHT. */
-  public int getButton() {
-    return button;
-  }
+    public int getY() {
+        return y;
+    }
 
+    /**
+     * Which button was pressed, either LEFT, CENTER, or RIGHT.
+     */
+    public int getButton() {
+        return button;
+    }
 
 //  public void setButton(int button) {
 //    this.button = button;
 //  }
+    /**
+     * Do not use, getCount() is the correct method.
+     */
+    @Deprecated
+    public int getClickCount() {
+        //return (int) amount; //clickCount;
+        return count;
+    }
 
+    /**
+     * Do not use, getCount() is the correct method.
+     */
+    @Deprecated
+    public float getAmount() {
+        //return amount;
+        return count;
+    }
 
-  /** Do not use, getCount() is the correct method. */
-  @Deprecated
-  public int getClickCount() {
-    //return (int) amount; //clickCount;
-    return count;
-  }
-
-
-  /** Do not use, getCount() is the correct method. */
-  @Deprecated
-  public float getAmount() {
-    //return amount;
-    return count;
-  }
-
-
-  /**
-   * 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.
-   * On Mac OS X, this will be reversed when "natural" scrolling is enabled
-   * in System Preferences &rarr Mouse.
-   */
-  public int getCount() {
-    return count;
-  }
-
+    /**
+     * 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. On Mac OS X, this will be reversed when "natural" scrolling is
+     * enabled in System Preferences &rarr Mouse.
+     */
+    public int getCount() {
+        return count;
+    }
 
 //  public void setClickCount(int clickCount) {
 //    this.clickCount = clickCount;
 //  }
-
-  private String actionString() {
-    switch (action) {
-    default:
-      return "UNKNOWN";
-    case CLICK:
-      return "CLICK";
-    case DRAG:
-      return "DRAG";
-    case ENTER:
-      return "ENTER";
-    case EXIT:
-      return "EXIT";
-    case MOVE:
-      return "MOVE";
-    case PRESS:
-      return "PRESS";
-    case RELEASE:
-      return "RELEASE";
-    case WHEEL:
-      return "WHEEL";
+    private String actionString() {
+        switch (action) {
+            default:
+                return "UNKNOWN";
+            case CLICK:
+                return "CLICK";
+            case DRAG:
+                return "DRAG";
+            case ENTER:
+                return "ENTER";
+            case EXIT:
+                return "EXIT";
+            case MOVE:
+                return "MOVE";
+            case PRESS:
+                return "PRESS";
+            case RELEASE:
+                return "RELEASE";
+            case WHEEL:
+                return "WHEEL";
+        }
     }
-  }
 
-  @Override
-  public String toString() {
-    return String.format("<MouseEvent %s@%d,%d count:%d button:%d>",
-                         actionString(), x, y, count, button);
-  }
+    @Override
+    public String toString() {
+        return String.format("<MouseEvent %s@%d,%d count:%d button:%d>",
+                actionString(), x, y, count, button);
+    }
 }