Partial merge of contributions from @Otthon, with rebase

core/src/main/java/org/piccolo2d/PCamera.java

@@ -121,7 +121,7 @@ public class PCamera extends PNode {
     private transient PComponent component;
 
     /** List of layers viewed by this camera. */
-    private transient List/*<PLayer>*/ layers;
+    private transient List<PLayer> layers;
 
     /**
      * Transform applied to layers before they are rendered. This transform
@@ -143,7 +143,7 @@ public class PCamera extends PNode {
     public PCamera() {
         super();
         viewTransform = new PAffineTransform();
-        layers = new ArrayList/*<PLayer>*/();
+        layers = new ArrayList<PLayer>();
         viewConstraint = VIEW_CONSTRAINT_NONE;
     }
 
@@ -215,7 +215,7 @@ public void repaintFromLayer(final PBounds viewBounds, final PLayer repaintedLay
      * 
      * @return the list of layers viewed by this camera
      */
-    public List/*<PLayer>*/ getLayersReference() {
+    public List<PLayer> getLayersReference() {
         return layers;
     }
 
@@ -361,7 +361,7 @@ protected void paint(final PPaintContext paintContext) {
     protected void paintCameraView(final PPaintContext paintContext) {
         final int size = layers.size();
         for (int i = 0; i < size; i++) {
-            final PLayer each = (PLayer) layers.get(i);
+            final PLayer each = layers.get(i);
             each.fullPaint(paintContext);
         }
     }
@@ -377,21 +377,21 @@ protected void paintDebugInfo(final PPaintContext paintContext) {
             final Graphics2D g2 = paintContext.getGraphics();
             paintContext.setRenderQuality(PPaintContext.LOW_QUALITY_RENDERING);
             g2.setStroke(new BasicStroke(0));
-            final ArrayList nodes = new ArrayList();
+            final ArrayList<PNode> nodes = new ArrayList<PNode>();
             final PBounds nodeBounds = new PBounds();
 
             final Color boundsColor = Color.red;
             final Color fullBoundsColor = new Color(1.0f, 0f, 0f, 0.2f);
 
             final int size = layers.size();
             for (int i = 0; i < size; i++) {
-                ((PLayer) layers.get(i)).getAllNodes(null, nodes);
+                 layers.get(i).getAllNodes(null, nodes);
             }
 
-            final Iterator i = getAllNodes(null, nodes).iterator();
+            final Iterator<PNode> i = getAllNodes(null, nodes).iterator();
 
             while (i.hasNext()) {
-                final PNode each = (PNode) i.next();
+                final PNode each = i.next();
 
                 if (PDebug.debugBounds) {
                     g2.setPaint(boundsColor);
@@ -953,7 +953,7 @@ private void writeObject(final ObjectOutputStream out) throws IOException {
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
 
-        layers = new ArrayList();
+        layers = new ArrayList<PLayer>();
 
         while (true) {
             final Object each = in.readObject();
@@ -962,7 +962,7 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
                     break;
                 }
                 else {
-                    layers.add(each);
+                    layers.add((PLayer)each);
                 }
             }
         }

core/src/main/java/org/piccolo2d/PCanvas.java

@@ -852,29 +852,29 @@ private MouseEvent copyButtonsFromModifiers(final MouseEvent rawEvent, final int
 
             int newButton = 0;
 
-            if (hasButtonModifier(rawEvent, InputEvent.BUTTON1_MASK)) {
+            if (hasButtonModifier(rawEvent, InputEvent.BUTTON1_DOWN_MASK)) {
                 newButton = MouseEvent.BUTTON1;
             }
-            else if (hasButtonModifier(rawEvent, InputEvent.BUTTON2_MASK)) {
+            else if (hasButtonModifier(rawEvent, InputEvent.BUTTON2_DOWN_MASK)) {
                 newButton = MouseEvent.BUTTON2;
             }
-            else if (hasButtonModifier(rawEvent, InputEvent.BUTTON3_MASK)) {
+            else if (hasButtonModifier(rawEvent, InputEvent.BUTTON3_DOWN_MASK)) {
                 newButton = MouseEvent.BUTTON3;
             }
 
             return buildModifiedMouseEvent(rawEvent, eventType, newButton);
         }
 
         private boolean hasButtonModifier(final MouseEvent event, final int buttonMask) {
-            return (event.getModifiers() & buttonMask) == buttonMask;
+            return (event.getModifiersEx() & buttonMask) == buttonMask;
         }
 
         public MouseEvent buildRetypedMouseEvent(final MouseEvent e, final int newType) {
             return buildModifiedMouseEvent(e, newType, e.getButton());
         }
 
         public MouseEvent buildModifiedMouseEvent(final MouseEvent e, final int newType, final int newButton) {
-            return new MouseEvent((Component) e.getSource(), newType, e.getWhen(), e.getModifiers(), e.getX(),
+            return new MouseEvent((Component) e.getSource(), newType, e.getWhen(), e.getModifiersEx(), e.getX(),
                     e.getY(), e.getClickCount(), e.isPopupTrigger(), newButton);
         }
 

core/src/main/java/org/piccolo2d/PLayer.java

@@ -82,14 +82,14 @@ public class PLayer extends PNode {
     /**
      * Cameras which are registered as viewers of this PLayer.
      */
-    private transient List cameras;
+    private transient List<PCamera> cameras;
 
     /**
      * Creates a PLayer without any cameras attached to it.
      */
     public PLayer() {
         super();
-        cameras = new ArrayList();
+        cameras = new ArrayList<PCamera>();
     }
 
     // ****************************************************************
@@ -102,7 +102,7 @@ public PLayer() {
      * 
      * @return direct reference to registered cameras
      */
-    public List getCamerasReference() {
+    public List<PCamera> getCamerasReference() {
         return cameras;
     }
 
@@ -125,7 +125,7 @@ public int getCameraCount() {
      * @return camera at the given index
      */
     public PCamera getCamera(final int index) {
-        return (PCamera) cameras.get(index);
+        return cameras.get(index);
     }
 
     /**
@@ -174,7 +174,7 @@ public PCamera removeCamera(final PCamera camera) {
      * @return camera that was removed
      */
     public PCamera removeCamera(final int index) {
-        final PCamera result = (PCamera) cameras.remove(index);
+        final PCamera result = cameras.remove(index);
         invalidatePaint();
         firePropertyChange(PROPERTY_CODE_CAMERAS, PROPERTY_CAMERAS, null, cameras);
         return result;
@@ -213,7 +213,7 @@ public void repaintFrom(final PBounds localBounds, final PNode repaintSource) {
     protected void notifyCameras(final PBounds parentBounds) {
         final int count = getCameraCount();
         for (int i = 0; i < count; i++) {
-            final PCamera each = (PCamera) cameras.get(i);
+            final PCamera each = cameras.get(i);
             each.repaintFromLayer(parentBounds, this);
         }
     }
@@ -260,7 +260,7 @@ private void writeObject(final ObjectOutputStream out) throws IOException {
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
 
-        cameras = new ArrayList();
+        cameras = new ArrayList<PCamera>();
 
         while (true) {
             final Object each = in.readObject();
@@ -269,7 +269,7 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
                     break;
                 }
                 else {
-                    cameras.add(each);
+                    cameras.add((PCamera)each);
                 }
             }
         }

core/src/main/java/org/piccolo2d/PNode.java

@@ -289,7 +289,7 @@ public class PNode implements Cloneable, Serializable, Printable {
     private transient PNode parent;
 
     /** Tracks all immediate child nodes. */
-    private List children;
+    private List<PNode> children;
 
     /** Bounds of the PNode. */
     private final PBounds bounds;
@@ -749,7 +749,7 @@ public void addAttribute(final Object key, final Object value) {
      * 
      * @return an Enumeration over attribute keys
      */
-    public Enumeration getClientPropertyKeysEnumeration() {
+    public Enumeration<?> getClientPropertyKeysEnumeration() {
         if (clientProperties == null) {
             return PUtil.NULL_ENUMERATION;
         }
@@ -2772,8 +2772,8 @@ public void setTransparency(final float newTransparency) {
             final float oldTransparency = transparency;
             transparency = newTransparency;
             invalidatePaint();
-            firePropertyChange(PROPERTY_CODE_TRANSPARENCY, PROPERTY_TRANSPARENCY, new Float(oldTransparency),
-                    new Float(newTransparency));
+            firePropertyChange(PROPERTY_CODE_TRANSPARENCY, PROPERTY_TRANSPARENCY, Float.valueOf(oldTransparency),
+                    Float.valueOf(newTransparency));
         }
     }
 
@@ -3159,7 +3159,7 @@ public boolean fullPick(final PPickPath pickPath) {
      * @param fullBounds bounds to compare against
      * @param results array into which to add matches
      */
-    public void findIntersectingNodes(final Rectangle2D fullBounds, final ArrayList results) {
+    public void findIntersectingNodes(final Rectangle2D fullBounds, final ArrayList<PNode> results) {
         if (fullIntersects(fullBounds)) {
             final Rectangle2D localBounds = parentToLocal((Rectangle2D) fullBounds.clone());
 
@@ -3242,8 +3242,8 @@ public void addChild(final int index, final PNode child) {
      * 
      * @param nodes a collection of nodes to be added to this node
      */
-    public void addChildren(final Collection nodes) {
-        final Iterator i = nodes.iterator();
+    public void addChildren(final Collection<PNode> nodes) {
+        final Iterator<PNode> i = nodes.iterator();
         while (i.hasNext()) {
             final PNode each = (PNode) i.next();
             addChild(each);
@@ -3513,8 +3513,8 @@ public PNode removeChild(final int index) {
      * 
      * @param childrenNodes the collection of children to remove
      */
-    public void removeChildren(final Collection childrenNodes) {
-        final Iterator i = childrenNodes.iterator();
+    public void removeChildren(final Collection<PNode> childrenNodes) {
+        final Iterator<PNode> i = childrenNodes.iterator();
         while (i.hasNext()) {
             final PNode each = (PNode) i.next();
             removeChild(each);
@@ -3635,9 +3635,9 @@ public PNode getChild(final int index) {
      * 
      * @return reference to the children list
      */
-    public List getChildrenReference() {
+    public List<PNode> getChildrenReference() {
         if (children == null) {
-            children = new ArrayList();
+            children = new ArrayList<PNode>();
         }
         return children;
     }
@@ -3647,9 +3647,10 @@ public List getChildrenReference() {
      * 
      * @return iterator over this nodes children
      */
-    public ListIterator getChildrenIterator() {
+    public ListIterator<PNode> getChildrenIterator() {
         if (children == null) {
-            return Collections.EMPTY_LIST.listIterator();
+        	List<PNode> list = Collections.emptyList();
+            return list.listIterator();
         }
         return Collections.unmodifiableList(children).listIterator();
     }
@@ -3673,7 +3674,7 @@ public PRoot getRoot() {
      * 
      * @return a new collection containing this node and all descendants
      */
-    public Collection getAllNodes() {
+    public Collection<PNode> getAllNodes() {
         return getAllNodes(null, null);
     }
 
@@ -3688,10 +3689,10 @@ public Collection getAllNodes() {
      * @param resultantNodes where matching nodes should be added
      * @return a collection containing this node and all descendants
      */
-    public Collection getAllNodes(final PNodeFilter filter, final Collection resultantNodes) {
-        Collection results;
+    public Collection<PNode> getAllNodes(final PNodeFilter filter, final Collection<PNode> resultantNodes) {
+        Collection<PNode> results;
         if (resultantNodes == null) {
-            results = new ArrayList();
+            results = new ArrayList<PNode>();
         }
         else {
             results = resultantNodes;

core/src/main/java/org/piccolo2d/PRoot.java

@@ -106,7 +106,7 @@ public class PRoot extends PNode {
     private transient PInputManager defaultInputManager;
 
     /** The Input Sources that are registered to this node. */
-    private final transient List inputSources;
+    private final transient List<InputSource> inputSources;
 
     /**
      * Used to provide a consistent clock time to activities as they are being
@@ -130,7 +130,7 @@ public class PRoot extends PNode {
      */
     public PRoot() {
         super();
-        inputSources = new ArrayList();
+        inputSources = new ArrayList<InputSource>();
         globalTime = System.currentTimeMillis();
         activityScheduler = new PActivityScheduler(this);
     }
@@ -173,7 +173,7 @@ public void waitForActivities() {
 
         while (activityScheduler.getActivitiesReference().size() > 0) {
             processInputs();
-            final Iterator i = getAllNodes(cameraWithCanvas, null).iterator();
+            final Iterator<PNode> i = getAllNodes(cameraWithCanvas, null).iterator();
             while (i.hasNext()) {
                 final PCamera each = (PCamera) i.next();
                 each.getComponent().paintImmediately();
@@ -323,9 +323,9 @@ public void processInputs() {
 
         globalTime = System.currentTimeMillis();
         if (inputSources.size() > 0) {
-            final Iterator inputSourceIterator = inputSources.iterator();
+            final Iterator<InputSource> inputSourceIterator = inputSources.iterator();
             while (inputSourceIterator.hasNext()) {
-                final InputSource each = (InputSource) inputSourceIterator.next();
+                final InputSource each = inputSourceIterator.next();
                 each.processInput();
             }
         }

core/src/main/java/org/piccolo2d/activities/PActivityScheduler.java

@@ -58,10 +58,10 @@ public class PActivityScheduler implements Serializable {
     private static final long serialVersionUID = 1L;
     private transient Timer activityTimer = null;
     private final PRoot root;
-    private final List activities;    
+    private final List<PActivity> activities;    
     private boolean activitiesChanged;
     private boolean animating;
-    private final ArrayList processingActivities;
+    private final ArrayList<PActivity> processingActivities;
 
     /**
      * Constructs an instance of PActivityScheduler. All activities it will
@@ -72,8 +72,8 @@ public class PActivityScheduler implements Serializable {
      */
     public PActivityScheduler(final PRoot rootNode) {        
         root = rootNode;
-        activities = new ArrayList();
-        processingActivities = new ArrayList();
+        activities = new ArrayList<PActivity>();
+        processingActivities = new ArrayList<PActivity>();
     }
 
     /**
@@ -157,7 +157,7 @@ public void removeAllActivities() {
      * 
      * @return reference to the current activities list.
      */
-    public List getActivitiesReference() {
+    public List<PActivity> getActivitiesReference() {
         return activities;
     }
 

core/src/main/java/org/piccolo2d/event/PDragEventHandler.java

@@ -54,7 +54,7 @@ public PDragEventHandler() {
         draggedNode = null;
         raiseToTopOnPress = false;
 
-        setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK));
+        setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK));
     }
 
     /**

core/src/main/java/org/piccolo2d/event/PInputEvent.java

@@ -252,12 +252,14 @@ public boolean isActionKey() {
      * 
      * @return modifier flags for the input event
      */
-    public int getModifiers() {
+    /*
+    private int getModifiers() {
         if (!isFocusEvent()) {
             return inputEvent.getModifiers();
         }
         throw new IllegalStateException("Can't get modifiers from focus event");
     }
+    */
 
     /**
      * Returns the extended modifiers provided for the input event by swing.