diff --git a/core/src/main/java/org/piccolo2d/PCamera.java b/core/src/main/java/org/piccolo2d/PCamera.java index 548b8d51..be0f5d2a 100644 --- a/core/src/main/java/org/piccolo2d/PCamera.java +++ b/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/**/ layers; + private transient List 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/**/(); + layers = new ArrayList(); 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/**/ getLayersReference() { + public List 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,7 +377,7 @@ 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 nodes = new ArrayList(); final PBounds nodeBounds = new PBounds(); final Color boundsColor = Color.red; @@ -385,13 +385,13 @@ protected void paintDebugInfo(final PPaintContext paintContext) { 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 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(); 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); } } } diff --git a/core/src/main/java/org/piccolo2d/PCanvas.java b/core/src/main/java/org/piccolo2d/PCanvas.java index 583af54c..c01eaac3 100644 --- a/core/src/main/java/org/piccolo2d/PCanvas.java +++ b/core/src/main/java/org/piccolo2d/PCanvas.java @@ -852,13 +852,13 @@ 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; } @@ -866,7 +866,7 @@ else if (hasButtonModifier(rawEvent, InputEvent.BUTTON3_MASK)) { } 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) { @@ -874,7 +874,7 @@ public MouseEvent buildRetypedMouseEvent(final MouseEvent e, final int newType) } 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); } diff --git a/core/src/main/java/org/piccolo2d/PLayer.java b/core/src/main/java/org/piccolo2d/PLayer.java index 07b9680e..5d7fc3cb 100644 --- a/core/src/main/java/org/piccolo2d/PLayer.java +++ b/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 cameras; /** * Creates a PLayer without any cameras attached to it. */ public PLayer() { super(); - cameras = new ArrayList(); + cameras = new ArrayList(); } // **************************************************************** @@ -102,7 +102,7 @@ public PLayer() { * * @return direct reference to registered cameras */ - public List getCamerasReference() { + public List 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(); 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); } } } diff --git a/core/src/main/java/org/piccolo2d/PNode.java b/core/src/main/java/org/piccolo2d/PNode.java index 873c0e86..a6424516 100644 --- a/core/src/main/java/org/piccolo2d/PNode.java +++ b/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 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 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 nodes) { + final Iterator 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 childrenNodes) { + final Iterator 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 getChildrenReference() { if (children == null) { - children = new ArrayList(); + children = new ArrayList(); } return children; } @@ -3647,9 +3647,10 @@ public List getChildrenReference() { * * @return iterator over this nodes children */ - public ListIterator getChildrenIterator() { + public ListIterator getChildrenIterator() { if (children == null) { - return Collections.EMPTY_LIST.listIterator(); + List 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 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 getAllNodes(final PNodeFilter filter, final Collection resultantNodes) { + Collection results; if (resultantNodes == null) { - results = new ArrayList(); + results = new ArrayList(); } else { results = resultantNodes; diff --git a/core/src/main/java/org/piccolo2d/PRoot.java b/core/src/main/java/org/piccolo2d/PRoot.java index e16d3d75..f8e59d0b 100644 --- a/core/src/main/java/org/piccolo2d/PRoot.java +++ b/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 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(); 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 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 inputSourceIterator = inputSources.iterator(); while (inputSourceIterator.hasNext()) { - final InputSource each = (InputSource) inputSourceIterator.next(); + final InputSource each = inputSourceIterator.next(); each.processInput(); } } diff --git a/core/src/main/java/org/piccolo2d/activities/PActivityScheduler.java b/core/src/main/java/org/piccolo2d/activities/PActivityScheduler.java index 5b840801..dff261ea 100644 --- a/core/src/main/java/org/piccolo2d/activities/PActivityScheduler.java +++ b/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 activities; private boolean activitiesChanged; private boolean animating; - private final ArrayList processingActivities; + private final ArrayList 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(); + processingActivities = new ArrayList(); } /** @@ -157,7 +157,7 @@ public void removeAllActivities() { * * @return reference to the current activities list. */ - public List getActivitiesReference() { + public List getActivitiesReference() { return activities; } diff --git a/core/src/main/java/org/piccolo2d/event/PDragEventHandler.java b/core/src/main/java/org/piccolo2d/event/PDragEventHandler.java index d63e1bca..29a08164 100644 --- a/core/src/main/java/org/piccolo2d/event/PDragEventHandler.java +++ b/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)); } /** diff --git a/core/src/main/java/org/piccolo2d/event/PInputEvent.java b/core/src/main/java/org/piccolo2d/event/PInputEvent.java index dd89e649..cdede747 100644 --- a/core/src/main/java/org/piccolo2d/event/PInputEvent.java +++ b/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. diff --git a/core/src/main/java/org/piccolo2d/event/PInputEventFilter.java b/core/src/main/java/org/piccolo2d/event/PInputEventFilter.java index 88a6fb1c..72e23574 100644 --- a/core/src/main/java/org/piccolo2d/event/PInputEventFilter.java +++ b/core/src/main/java/org/piccolo2d/event/PInputEventFilter.java @@ -53,9 +53,9 @@ */ public class PInputEventFilter { /** Mask representing all possible modifiers. */ - public static final int ALL_MODIFIERS_MASK = InputEvent.BUTTON1_MASK | InputEvent.BUTTON2_MASK | InputEvent.BUTTON3_MASK - | InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK | InputEvent.ALT_MASK | InputEvent.ALT_GRAPH_MASK - | InputEvent.META_MASK; + public static final int ALL_MODIFIERS_MASK = InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON2_DOWN_MASK | InputEvent.BUTTON3_DOWN_MASK + | InputEvent.SHIFT_DOWN_MASK | InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.ALT_GRAPH_DOWN_MASK + | InputEvent.META_DOWN_MASK; /** If event modifiers don't match this exactly, event it filtered. */ private int andMask; @@ -153,7 +153,7 @@ public boolean acceptsEvent(final PInputEvent event, final int type) { int modifiers = 0; if (!event.isFocusEvent()) { - modifiers = event.getModifiers(); + modifiers = event.getModifiersEx(); } if (event.isHandled() && !acceptsAlreadyHandledEvents) { diff --git a/core/src/main/java/org/piccolo2d/event/PPanEventHandler.java b/core/src/main/java/org/piccolo2d/event/PPanEventHandler.java index 157b5ae3..95794ddf 100644 --- a/core/src/main/java/org/piccolo2d/event/PPanEventHandler.java +++ b/core/src/main/java/org/piccolo2d/event/PPanEventHandler.java @@ -61,7 +61,7 @@ public class PPanEventHandler extends PDragSequenceEventHandler { */ public PPanEventHandler() { super(); - setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); setAutopan(true); } diff --git a/core/src/main/java/org/piccolo2d/event/PZoomEventHandler.java b/core/src/main/java/org/piccolo2d/event/PZoomEventHandler.java index 057d379a..1d137418 100644 --- a/core/src/main/java/org/piccolo2d/event/PZoomEventHandler.java +++ b/core/src/main/java/org/piccolo2d/event/PZoomEventHandler.java @@ -72,7 +72,7 @@ public class PZoomEventHandler extends PDragSequenceEventHandler { */ public PZoomEventHandler() { super(); - setEventFilter(new PInputEventFilter(InputEvent.BUTTON3_MASK)); + setEventFilter(new PInputEventFilter(InputEvent.BUTTON3_DOWN_MASK)); } // **************************************************************** diff --git a/core/src/main/java/org/piccolo2d/nodes/PArea.java b/core/src/main/java/org/piccolo2d/nodes/PArea.java index 6a511253..a7f1a823 100644 --- a/core/src/main/java/org/piccolo2d/nodes/PArea.java +++ b/core/src/main/java/org/piccolo2d/nodes/PArea.java @@ -38,6 +38,8 @@ * Area node. */ public final class PArea extends PShape { + + private static final long serialVersionUID = 1L; /** Area for this area node. */ private final transient Area area; diff --git a/core/src/main/java/org/piccolo2d/nodes/PPath.java b/core/src/main/java/org/piccolo2d/nodes/PPath.java index db8bda06..979a755c 100644 --- a/core/src/main/java/org/piccolo2d/nodes/PPath.java +++ b/core/src/main/java/org/piccolo2d/nodes/PPath.java @@ -47,6 +47,8 @@ * Abstract path node. */ public abstract class PPath extends PShape { + + private static final long serialVersionUID = 1L; /** Path for this path node. */ private final Path2D path; @@ -78,6 +80,8 @@ private PPath(final Path2D path, final Stroke stroke) { * Path node with coordinates stored in single precision floating point. */ public static class Float extends PPath { + + private static final long serialVersionUID = 1L; /** * Create a new empty path node. @@ -142,6 +146,8 @@ public Float(final Path2D.Float path, final Stroke stroke) { * Path node with coordinates stored in double precision floating point. */ public static class Double extends PPath { + + private static final long serialVersionUID = 1L; /** * Create a new empty path node. diff --git a/core/src/main/java/org/piccolo2d/nodes/PShape.java b/core/src/main/java/org/piccolo2d/nodes/PShape.java index f69d46bf..bd300022 100644 --- a/core/src/main/java/org/piccolo2d/nodes/PShape.java +++ b/core/src/main/java/org/piccolo2d/nodes/PShape.java @@ -47,7 +47,9 @@ */ public abstract class PShape extends PNode { - /** Stroke for this shape node, defaults to {@link #DEFAULT_STROKE}. */ + private static final long serialVersionUID = 1L; + + /** Stroke for this shape node, defaults to {@link #DEFAULT_STROKE}. */ private transient Stroke stroke = DEFAULT_STROKE; /** Stroke paint for this shape node, defaults to {@link #DEFAULT_STROKE_PAINT}. */ diff --git a/core/src/main/java/org/piccolo2d/nodes/PText.java b/core/src/main/java/org/piccolo2d/nodes/PText.java index 13d1bc2d..fe114d0f 100644 --- a/core/src/main/java/org/piccolo2d/nodes/PText.java +++ b/core/src/main/java/org/piccolo2d/nodes/PText.java @@ -425,7 +425,7 @@ public void setFont(final Font font) { * wrapped based on the bounds of this node. */ public void recomputeLayout() { - final ArrayList linesList = new ArrayList(); + final ArrayList linesList = new ArrayList(); double textWidth = 0; double textHeight = 0; diff --git a/core/src/main/java/org/piccolo2d/util/PObjectOutputStream.java b/core/src/main/java/org/piccolo2d/util/PObjectOutputStream.java index 350c31e1..5c9f9324 100644 --- a/core/src/main/java/org/piccolo2d/util/PObjectOutputStream.java +++ b/core/src/main/java/org/piccolo2d/util/PObjectOutputStream.java @@ -68,7 +68,7 @@ public class PObjectOutputStream extends ObjectOutputStream { private boolean writingRoot; - private final HashMap unconditionallyWritten; + private final HashMap unconditionallyWritten; /** * Transform the given object into an array of bytes. @@ -94,7 +94,7 @@ public static byte[] toByteArray(final Object object) throws IOException { */ public PObjectOutputStream(final OutputStream out) throws IOException { super(out); - unconditionallyWritten = new HashMap(); + unconditionallyWritten = new HashMap(); } /** @@ -165,7 +165,9 @@ public Object replaceObject(final Object object) { public void writeConditionalObject(final Object object) throws IOException { } } - new ZMarkObjectOutputStream().writeObject(aRoot); + ZMarkObjectOutputStream zmoos = new ZMarkObjectOutputStream(); + zmoos.writeObject(aRoot); + zmoos.close(); } private static final OutputStream NULL_OUTPUT_STREAM = new OutputStream() { diff --git a/core/src/main/java/org/piccolo2d/util/PPickPath.java b/core/src/main/java/org/piccolo2d/util/PPickPath.java index 8ee5e247..8bf3c343 100644 --- a/core/src/main/java/org/piccolo2d/util/PPickPath.java +++ b/core/src/main/java/org/piccolo2d/util/PPickPath.java @@ -77,7 +77,7 @@ public class PPickPath implements PInputEventListener { private PStack transformStack; private PStack pickBoundsStack; private PCamera bottomCamera; - private HashMap excludedNodes; + private HashMap excludedNodes; /** * Creates a pick pack originating from the provided camera and with the @@ -169,7 +169,7 @@ public PNode nextPickedNode() { return null; } if (excludedNodes == null) { - excludedNodes = new HashMap(); + excludedNodes = new HashMap(); } // exclude current picked node diff --git a/core/src/main/java/org/piccolo2d/util/PStack.java b/core/src/main/java/org/piccolo2d/util/PStack.java index 12b40996..55ddd7b8 100644 --- a/core/src/main/java/org/piccolo2d/util/PStack.java +++ b/core/src/main/java/org/piccolo2d/util/PStack.java @@ -38,7 +38,7 @@ * @version 1.0 * @author Jesse Grosjean */ -public class PStack extends ArrayList { +public class PStack extends ArrayList { /** * Allows for future serialization code to understand versioned binary * formats. diff --git a/core/src/main/java/org/piccolo2d/util/PUtil.java b/core/src/main/java/org/piccolo2d/util/PUtil.java index a9eb8fa5..2b8a9671 100644 --- a/core/src/main/java/org/piccolo2d/util/PUtil.java +++ b/core/src/main/java/org/piccolo2d/util/PUtil.java @@ -63,7 +63,7 @@ public class PUtil { public static final int ACTIVITY_SCHEDULER_FRAME_DELAY = 10; /** An iterator that iterates over an empty collection. */ - public static final Iterator NULL_ITERATOR = Collections.EMPTY_LIST.iterator(); + public static final Iterator NULL_ITERATOR = Collections.EMPTY_LIST.iterator(); /** * Used when persisting paths to an object stream. Used to mark the end of @@ -72,7 +72,7 @@ public class PUtil { private static final int PATH_TERMINATOR = -1; /** A utility enumeration with no elements. */ - public static final Enumeration NULL_ENUMERATION = new Enumeration() { + public static final Enumeration NULL_ENUMERATION = new Enumeration() { public boolean hasMoreElements() { return false; } diff --git a/core/src/test/java/org/piccolo2d/MockPCamera.java b/core/src/test/java/org/piccolo2d/MockPCamera.java index bcfa5b62..8215a047 100644 --- a/core/src/test/java/org/piccolo2d/MockPCamera.java +++ b/core/src/test/java/org/piccolo2d/MockPCamera.java @@ -31,9 +31,6 @@ import java.util.ArrayList; import java.util.List; -import org.piccolo2d.PCamera; -import org.piccolo2d.PLayer; -import org.piccolo2d.PNode; import org.piccolo2d.util.PBounds; @@ -42,7 +39,7 @@ */ class MockPCamera extends PCamera { private static final long serialVersionUID = 1L; - private final List notifications = new ArrayList(); + private final List notifications = new ArrayList(); public void repaintFromLayer(final PBounds bounds, final PLayer layer) { notifications.add(new Notification("repaintFromLayer", bounds, layer)); @@ -68,6 +65,10 @@ public PNode getLayer() { public PBounds getBounds() { return bounds; } + + public String getType() { + return type; + } } public int getNotificationCount() { diff --git a/core/src/test/java/org/piccolo2d/MockPInputEventListener.java b/core/src/test/java/org/piccolo2d/MockPInputEventListener.java index 178a6d99..d67bc258 100644 --- a/core/src/test/java/org/piccolo2d/MockPInputEventListener.java +++ b/core/src/test/java/org/piccolo2d/MockPInputEventListener.java @@ -49,7 +49,7 @@ public Notification(final PInputEvent event, final int type) { } } - private final List notifications = new ArrayList(); + private final List notifications = new ArrayList(); public void processEvent(final PInputEvent aEvent, final int type) { notifications.add(new Notification(aEvent, type)); diff --git a/core/src/test/java/org/piccolo2d/MockPropertyChangeListener.java b/core/src/test/java/org/piccolo2d/MockPropertyChangeListener.java index 453aafb6..a552659c 100644 --- a/core/src/test/java/org/piccolo2d/MockPropertyChangeListener.java +++ b/core/src/test/java/org/piccolo2d/MockPropertyChangeListener.java @@ -37,7 +37,7 @@ * Mock PropertyChangeListener. */ public class MockPropertyChangeListener implements PropertyChangeListener { - private final List changes = new ArrayList(); + private final List changes = new ArrayList(); public void propertyChange(final PropertyChangeEvent evt) { changes.add(evt); diff --git a/core/src/test/java/org/piccolo2d/PCameraTest.java b/core/src/test/java/org/piccolo2d/PCameraTest.java index b7cc29ff..aabbd14c 100644 --- a/core/src/test/java/org/piccolo2d/PCameraTest.java +++ b/core/src/test/java/org/piccolo2d/PCameraTest.java @@ -40,11 +40,6 @@ import java.io.IOException; import java.util.Collection; -import org.piccolo2d.PCamera; -import org.piccolo2d.PCanvas; -import org.piccolo2d.PComponent; -import org.piccolo2d.PLayer; -import org.piccolo2d.PNode; import org.piccolo2d.activities.PActivity; import org.piccolo2d.activities.PTransformActivity; import org.piccolo2d.util.PAffineTransform; @@ -82,7 +77,7 @@ public void testClone() throws CloneNotSupportedException { camera1.addLayer(layer2); - final PCamera cameraCopy = (PCamera) camera1.clone(); + //final PCamera cameraCopy = (PCamera) camera1.clone(); //TODO: assertEquals(2, cameraCopy.getLayerCount()); } @@ -690,7 +685,7 @@ public void fullPaint(final PPaintContext paintContext) { } /** {@inheritDoc} */ - public Collection getAllNodes(final PNodeFilter filter, final Collection nodes) { + public Collection getAllNodes(final PNodeFilter filter, final Collection nodes) { getAllNodesCalled = true; return super.getAllNodes(filter, nodes); } diff --git a/core/src/test/java/org/piccolo2d/PInputManagerTest.java b/core/src/test/java/org/piccolo2d/PInputManagerTest.java index 790d848c..7b07f98a 100644 --- a/core/src/test/java/org/piccolo2d/PInputManagerTest.java +++ b/core/src/test/java/org/piccolo2d/PInputManagerTest.java @@ -32,8 +32,6 @@ import java.awt.event.KeyEvent; import java.awt.geom.Point2D; -import org.piccolo2d.PCamera; -import org.piccolo2d.PInputManager; import org.piccolo2d.event.PInputEvent; import org.piccolo2d.util.PBounds; import org.piccolo2d.util.PPickPath; diff --git a/core/src/test/java/org/piccolo2d/PLayerTest.java b/core/src/test/java/org/piccolo2d/PLayerTest.java index 6956f71c..68d49393 100644 --- a/core/src/test/java/org/piccolo2d/PLayerTest.java +++ b/core/src/test/java/org/piccolo2d/PLayerTest.java @@ -30,8 +30,6 @@ import java.util.Collection; -import org.piccolo2d.PCamera; -import org.piccolo2d.PLayer; import org.piccolo2d.util.PBounds; import junit.framework.TestCase; @@ -47,7 +45,7 @@ public void setUp() { } public void testLayerHasEmptyCamerasCollectionByDefault() { - final Collection cameras = layer.getCamerasReference(); + final Collection cameras = layer.getCamerasReference(); assertNotNull(cameras); assertTrue(cameras.isEmpty()); assertEquals(0, layer.getCameraCount()); diff --git a/core/src/test/java/org/piccolo2d/PNodeTest.java b/core/src/test/java/org/piccolo2d/PNodeTest.java index 811abc9f..b7c601fb 100644 --- a/core/src/test/java/org/piccolo2d/PNodeTest.java +++ b/core/src/test/java/org/piccolo2d/PNodeTest.java @@ -46,14 +46,13 @@ import javax.swing.text.MutableAttributeSet; -import org.piccolo2d.PCanvas; -import org.piccolo2d.PLayer; -import org.piccolo2d.PNode; +import org.junit.Before; +import org.junit.Test; import org.piccolo2d.activities.PActivity; import org.piccolo2d.activities.PColorActivity; +import org.piccolo2d.activities.PColorActivity.Target; import org.piccolo2d.activities.PInterpolatingActivity; import org.piccolo2d.activities.PTransformActivity; -import org.piccolo2d.activities.PColorActivity.Target; import org.piccolo2d.event.PBasicInputEventHandler; import org.piccolo2d.util.PAffineTransform; import org.piccolo2d.util.PAffineTransformException; @@ -78,6 +77,7 @@ public PNodeTest(final String name) { super(name); } + @Before public void setUp() { node = new PNode(); mockListener = new MockPropertyChangeListener(); @@ -90,6 +90,7 @@ public void testCenterBaseBoundsOnPoint() { assertEquals(-40, node.getBoundsReference().getY(), 0); } + @Test public void testClientProperties() { final PNode n = new PNode(); @@ -148,13 +149,13 @@ public void testFindIntersectingNodes() { c.setBounds(0, 0, 100, 100); c.scale(200); - ArrayList found = new ArrayList(); + ArrayList found = new ArrayList(); final Rectangle2D rect2d = new Rectangle2D.Double(50, 50, 10, 10); n.findIntersectingNodes(rect2d, found); assertEquals(found.size(), 2); assertEquals(rect2d.getHeight(), 10, 0); - found = new ArrayList(); + found = new ArrayList(); final PBounds bounds = new PBounds(50, 50, 10, 10); n.findIntersectingNodes(bounds, found); @@ -550,14 +551,14 @@ public void testGetClientPropertiesShouldReturnSameCollectionAlways() { } public void testGetClientPropertyKeysEnumerationShouldReturnEnumarationOnNewNode() { - final Enumeration enumeration = node.getClientPropertyKeysEnumeration(); + final Enumeration enumeration = node.getClientPropertyKeysEnumeration(); assertNotNull(enumeration); assertFalse(enumeration.hasMoreElements()); } public void testGetClientPropertyKeysEnumerationShouldReturnCorrectEnumWhenPropertiesExist() { node.addAttribute("Testing", "Hello"); - final Enumeration enumeration = node.getClientPropertyKeysEnumeration(); + final Enumeration enumeration = node.getClientPropertyKeysEnumeration(); assertNotNull(enumeration); assertTrue(enumeration.hasMoreElements()); assertEquals("Testing", enumeration.nextElement()); @@ -596,7 +597,7 @@ public void testGetIntegerAttributeReturnsDefaultWhenProvided() { } public void testGetIntegerAttributeReturnsValueIfFoundWhenDefaultProvided() { - node.addAttribute("Found", new Integer(5)); + node.addAttribute("Found", Integer.valueOf(5)); assertEquals(5, node.getIntegerAttribute("Found", 10)); } @@ -605,7 +606,7 @@ public void testGetDoubleAttributeReturnsDefaultWhenProvided() { } public void testGetDoubleAttributeReturnsValueIfFoundWhenDefaultProvided() { - node.addAttribute("Found", new Double(5)); + node.addAttribute("Found", Double.valueOf(5)); assertEquals(5, node.getIntegerAttribute("Found", 10), 0.001); } @@ -1199,7 +1200,7 @@ public void testfullPickReturnsFalseWhenNotOverlappingWithChildNode() { } public void testAddChildrenAddsAllChildren() { - final Collection newChildren = new ArrayList(); + final Collection newChildren = new ArrayList(); newChildren.add(new PNode()); newChildren.add(new PNode()); newChildren.add(new PNode()); @@ -1210,7 +1211,7 @@ public void testAddChildrenAddsAllChildren() { } public void testRemoveChildrenWorks() { - final Collection newChildren = new ArrayList(); + final Collection newChildren = new ArrayList(); newChildren.add(new PNode()); newChildren.add(new PNode()); newChildren.add(new PNode()); @@ -1222,7 +1223,7 @@ public void testRemoveChildrenWorks() { } public void testGetAllNodesUnrollsTheNodeGraph() { - final Collection newChildren = new ArrayList(); + final Collection newChildren = new ArrayList(); newChildren.add(new PNode()); newChildren.add(new PNode()); newChildren.add(new PNode()); @@ -1262,7 +1263,7 @@ public void testReplaceWithSwapsParents() { } public void testGetChildrenIteratorReturnsIteratorEvenWithNoChildren() { - final ListIterator iterator = node.getChildrenIterator(); + final ListIterator iterator = node.getChildrenIterator(); assertNotNull(iterator); assertFalse(iterator.hasNext()); } @@ -1271,7 +1272,7 @@ public void testGetChildrenIteratorReturnsValidIteratorWhenHasChildren() { final PNode child = new PNode(); node.addChild(child); - final ListIterator iterator = node.getChildrenIterator(); + final ListIterator iterator = node.getChildrenIterator(); assertNotNull(iterator); assertTrue(iterator.hasNext()); assertEquals(child, iterator.next()); @@ -1293,7 +1294,7 @@ public boolean acceptChildrenOf(final PNode aNode) { node.addChild(new PNode()); node.addChild(new PNode()); node.addChild(new PNode()); - final Collection nodes = node.getAllNodes(nullFilter, null); + final Collection nodes = node.getAllNodes(nullFilter, null); assertNotNull(nodes); assertTrue(nodes.isEmpty()); } diff --git a/core/src/test/java/org/piccolo2d/POffscreenCanvasTest.java b/core/src/test/java/org/piccolo2d/POffscreenCanvasTest.java index 49669684..31a84646 100644 --- a/core/src/test/java/org/piccolo2d/POffscreenCanvasTest.java +++ b/core/src/test/java/org/piccolo2d/POffscreenCanvasTest.java @@ -33,8 +33,6 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; -import org.piccolo2d.PCamera; -import org.piccolo2d.POffscreenCanvas; import org.piccolo2d.nodes.PPath; import org.piccolo2d.util.PBounds; import org.piccolo2d.util.PPaintContext; diff --git a/core/src/test/java/org/piccolo2d/PRootTest.java b/core/src/test/java/org/piccolo2d/PRootTest.java index d65d5b62..6b87607c 100644 --- a/core/src/test/java/org/piccolo2d/PRootTest.java +++ b/core/src/test/java/org/piccolo2d/PRootTest.java @@ -33,7 +33,6 @@ import javax.swing.Timer; -import org.piccolo2d.PRoot; import org.piccolo2d.activities.PActivity; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/PerformanceLog.java b/core/src/test/java/org/piccolo2d/PerformanceLog.java index ed20a6d7..04458ddc 100644 --- a/core/src/test/java/org/piccolo2d/PerformanceLog.java +++ b/core/src/test/java/org/piccolo2d/PerformanceLog.java @@ -36,7 +36,7 @@ */ public class PerformanceLog { - private final ArrayList log = new ArrayList(); + private final ArrayList log = new ArrayList(); private long testTime; @@ -76,7 +76,7 @@ public void writeLog() { System.out.println("Test data for input into spreadsheet:"); System.out.println(); - Iterator i = log.iterator(); + Iterator i = log.iterator(); while (i.hasNext()) { final ZLogEntry each = (ZLogEntry) i.next(); System.out.println(each.time); diff --git a/core/src/test/java/org/piccolo2d/PerformanceTests.java b/core/src/test/java/org/piccolo2d/PerformanceTests.java index 3c36cc00..cc6e47a4 100644 --- a/core/src/test/java/org/piccolo2d/PerformanceTests.java +++ b/core/src/test/java/org/piccolo2d/PerformanceTests.java @@ -40,7 +40,6 @@ import java.util.ArrayList; import java.util.Random; -import org.piccolo2d.PNode; import org.piccolo2d.nodes.PPath; import org.piccolo2d.util.PAffineTransform; import org.piccolo2d.util.PBounds; @@ -60,9 +59,9 @@ public PerformanceTests(final String name) { } public void testRunPerformanceTests() { - if (1 == 1) { - return; - } + //if (1 == 1) { + // return; + //} // three times to warm up JVM for (int i = 0; i < 3; i++) { @@ -126,7 +125,7 @@ public void addNodes() { public void removeNodes() { final PNode parent = new PNode(); final PNode[] nodes = new PNode[NUMBER_NODES]; - final ArrayList list = new ArrayList(); + final ArrayList list = new ArrayList(); for (int i = 0; i < NUMBER_NODES; i++) { nodes[i] = new PNode(); diff --git a/core/src/test/java/org/piccolo2d/PiccoloAsserts.java b/core/src/test/java/org/piccolo2d/PiccoloAsserts.java index 4cac1809..6bdc63f1 100644 --- a/core/src/test/java/org/piccolo2d/PiccoloAsserts.java +++ b/core/src/test/java/org/piccolo2d/PiccoloAsserts.java @@ -36,6 +36,7 @@ import junit.framework.Assert; + /** * This class provides helper methods to help with testing. * diff --git a/core/src/test/java/org/piccolo2d/SerializationTest.java b/core/src/test/java/org/piccolo2d/SerializationTest.java index 8f218613..8d409a81 100644 --- a/core/src/test/java/org/piccolo2d/SerializationTest.java +++ b/core/src/test/java/org/piccolo2d/SerializationTest.java @@ -30,8 +30,6 @@ import java.util.Iterator; -import org.piccolo2d.PLayer; -import org.piccolo2d.PNode; import org.piccolo2d.nodes.PPath; import org.piccolo2d.nodes.PText; @@ -59,7 +57,7 @@ public void test() { l = (PNode) l.clone(); // copy uses serialization internally assertTrue(l.getChildrenCount() == 300); - final Iterator i = l.getChildrenIterator(); + final Iterator i = l.getChildrenIterator(); while (i.hasNext()) { final PNode each = (PNode) i.next(); assertEquals(l, each.getParent()); diff --git a/core/src/test/java/org/piccolo2d/activities/PInterpolatingActivityTest.java b/core/src/test/java/org/piccolo2d/activities/PInterpolatingActivityTest.java index 9cd9fd5b..28e18038 100755 --- a/core/src/test/java/org/piccolo2d/activities/PInterpolatingActivityTest.java +++ b/core/src/test/java/org/piccolo2d/activities/PInterpolatingActivityTest.java @@ -28,7 +28,6 @@ */ package org.piccolo2d.activities; -import org.piccolo2d.activities.PInterpolatingActivity; import org.piccolo2d.util.PUtil; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/activities/PTransformActivityTest.java b/core/src/test/java/org/piccolo2d/activities/PTransformActivityTest.java index 39141d99..7b8cdeb0 100644 --- a/core/src/test/java/org/piccolo2d/activities/PTransformActivityTest.java +++ b/core/src/test/java/org/piccolo2d/activities/PTransformActivityTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.activities; -import org.piccolo2d.activities.PTransformActivity; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/event/MockPBasicInputEventHandler.java b/core/src/test/java/org/piccolo2d/event/MockPBasicInputEventHandler.java index 4bf67c88..f7fe572d 100644 --- a/core/src/test/java/org/piccolo2d/event/MockPBasicInputEventHandler.java +++ b/core/src/test/java/org/piccolo2d/event/MockPBasicInputEventHandler.java @@ -30,14 +30,11 @@ import java.util.ArrayList; -import org.piccolo2d.event.PBasicInputEventHandler; -import org.piccolo2d.event.PInputEvent; - /** * Mock PBasicInputEventHandler. */ public class MockPBasicInputEventHandler extends PBasicInputEventHandler { - private final ArrayList methodCalls = new ArrayList(); + private final ArrayList methodCalls = new ArrayList(); public String[] getMethodCalls() { final String[] result = new String[methodCalls.size()]; diff --git a/core/src/test/java/org/piccolo2d/event/PBasicInputEventListenerTest.java b/core/src/test/java/org/piccolo2d/event/PBasicInputEventListenerTest.java index 695c0781..b8cd0841 100644 --- a/core/src/test/java/org/piccolo2d/event/PBasicInputEventListenerTest.java +++ b/core/src/test/java/org/piccolo2d/event/PBasicInputEventListenerTest.java @@ -35,9 +35,6 @@ import org.piccolo2d.PCanvas; import org.piccolo2d.PiccoloAsserts; -import org.piccolo2d.event.PBasicInputEventHandler; -import org.piccolo2d.event.PInputEvent; -import org.piccolo2d.event.PInputEventFilter; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/event/PDragEventHandlerTest.java b/core/src/test/java/org/piccolo2d/event/PDragEventHandlerTest.java index f6d52adf..53d34f37 100644 --- a/core/src/test/java/org/piccolo2d/event/PDragEventHandlerTest.java +++ b/core/src/test/java/org/piccolo2d/event/PDragEventHandlerTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.event; -import org.piccolo2d.event.PDragEventHandler; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/event/PInputEventFilterTest.java b/core/src/test/java/org/piccolo2d/event/PInputEventFilterTest.java index 89fcf96f..4e3116db 100644 --- a/core/src/test/java/org/piccolo2d/event/PInputEventFilterTest.java +++ b/core/src/test/java/org/piccolo2d/event/PInputEventFilterTest.java @@ -34,8 +34,6 @@ import javax.swing.JPanel; import org.piccolo2d.PInputManager; -import org.piccolo2d.event.PInputEvent; -import org.piccolo2d.event.PInputEventFilter; import junit.framework.TestCase; @@ -175,34 +173,34 @@ public void testRejectsAcceptedEventIfAcceptsHandledEventsIsFalse() { public void testRejectsEventsUnlessModifiersContainAllOfMask() { PInputEvent event = buildTestEvent(); - filter.setAndMask(InputEvent.CTRL_MASK | InputEvent.ALT_MASK); + filter.setAndMask(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK); assertRejectsEvent(event); - event = buildTestEvent(InputEvent.CTRL_MASK | InputEvent.ALT_MASK); + event = buildTestEvent(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK); assertAcceptsEvent(event); - event = buildTestEvent(InputEvent.CTRL_MASK | InputEvent.ALT_MASK | InputEvent.META_MASK); + event = buildTestEvent(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK | InputEvent.META_DOWN_MASK); assertAcceptsEvent(event); } public void testRejectsEventsUnlessModifiersContainOneOfOrMask() { final PInputEvent event = buildTestEvent(); - filter.setOrMask(InputEvent.CTRL_MASK | InputEvent.ALT_MASK); + filter.setOrMask(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK); assertRejectsEvent(event); - assertRejectsEvent(buildTestEvent(InputEvent.META_MASK)); - assertAcceptsEvent(buildTestEvent(InputEvent.CTRL_MASK)); - assertAcceptsEvent(buildTestEvent(InputEvent.ALT_MASK)); - assertAcceptsEvent(buildTestEvent(InputEvent.CTRL_MASK | InputEvent.ALT_MASK)); + assertRejectsEvent(buildTestEvent(InputEvent.META_DOWN_MASK)); + assertAcceptsEvent(buildTestEvent(InputEvent.CTRL_DOWN_MASK)); + assertAcceptsEvent(buildTestEvent(InputEvent.ALT_DOWN_MASK)); + assertAcceptsEvent(buildTestEvent(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK)); } public void testRejectsEventsUnlessTheyMatchOneOfNotMask() { final PInputEvent event = buildTestEvent(); - filter.setNotMask(InputEvent.CTRL_MASK | InputEvent.ALT_MASK); + filter.setNotMask(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK); assertAcceptsEvent(event); - assertAcceptsEvent(buildTestEvent(InputEvent.META_MASK)); - assertRejectsEvent(buildTestEvent(InputEvent.CTRL_MASK)); - assertRejectsEvent(buildTestEvent(InputEvent.ALT_MASK)); - assertRejectsEvent(buildTestEvent(InputEvent.CTRL_MASK | InputEvent.ALT_MASK)); + assertAcceptsEvent(buildTestEvent(InputEvent.META_DOWN_MASK)); + assertRejectsEvent(buildTestEvent(InputEvent.CTRL_DOWN_MASK)); + assertRejectsEvent(buildTestEvent(InputEvent.ALT_DOWN_MASK)); + assertRejectsEvent(buildTestEvent(InputEvent.CTRL_DOWN_MASK | InputEvent.ALT_DOWN_MASK)); } public void testRejectsMouseEventsIfMouseClickFilterSet() { @@ -238,7 +236,7 @@ private void assertAcceptsEvent(final PInputEvent event) { } private PInputEvent buildTestEvent() { - return buildTestEvent(InputEvent.BUTTON1_MASK); + return buildTestEvent(InputEvent.BUTTON1_DOWN_MASK); } private PInputEvent buildTestEvent(final int modifiers) { diff --git a/core/src/test/java/org/piccolo2d/event/PInputEventTest.java b/core/src/test/java/org/piccolo2d/event/PInputEventTest.java index 6108fabe..2334368d 100644 --- a/core/src/test/java/org/piccolo2d/event/PInputEventTest.java +++ b/core/src/test/java/org/piccolo2d/event/PInputEventTest.java @@ -34,7 +34,6 @@ import org.piccolo2d.PCamera; import org.piccolo2d.PCanvas; -import org.piccolo2d.event.PInputEvent; import org.piccolo2d.util.PBounds; import org.piccolo2d.util.PPickPath; @@ -126,7 +125,7 @@ public void testHandledEventCanBeUnHandled() { } public void testReturnsCorrectModifiers() { - assertEquals(InputEvent.BUTTON1_MASK, mouseEvent.getModifiers()); + assertEquals(InputEvent.BUTTON1_DOWN_MASK, mouseEvent.getModifiersEx()); } public void testGetButtonUsesWhatWasPassedToMouseEvent() { @@ -134,7 +133,7 @@ public void testGetButtonUsesWhatWasPassedToMouseEvent() { } private MouseEvent buildSwingClick(final int x, final int y) { - return new MouseEvent(canvas, 1, System.currentTimeMillis(), InputEvent.BUTTON1_MASK, x, y, 1, false, + return new MouseEvent(canvas, 1, System.currentTimeMillis(), InputEvent.BUTTON1_DOWN_MASK, x, y, 1, false, MouseEvent.BUTTON1); } diff --git a/core/src/test/java/org/piccolo2d/event/PPanEventHandlerTest.java b/core/src/test/java/org/piccolo2d/event/PPanEventHandlerTest.java index 0fee1c12..5a0c0e94 100644 --- a/core/src/test/java/org/piccolo2d/event/PPanEventHandlerTest.java +++ b/core/src/test/java/org/piccolo2d/event/PPanEventHandlerTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.event; -import org.piccolo2d.event.PPanEventHandler; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/event/PZoomEventHandlerTest.java b/core/src/test/java/org/piccolo2d/event/PZoomEventHandlerTest.java index 74f5a4c2..ff3ff3af 100644 --- a/core/src/test/java/org/piccolo2d/event/PZoomEventHandlerTest.java +++ b/core/src/test/java/org/piccolo2d/event/PZoomEventHandlerTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.event; -import org.piccolo2d.event.PZoomEventHandler; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/nodes/AbstractPPathTest.java b/core/src/test/java/org/piccolo2d/nodes/AbstractPPathTest.java index 0276a125..0cc27298 100644 --- a/core/src/test/java/org/piccolo2d/nodes/AbstractPPathTest.java +++ b/core/src/test/java/org/piccolo2d/nodes/AbstractPPathTest.java @@ -28,15 +28,12 @@ */ package org.piccolo2d.nodes; -import java.awt.Color; import java.awt.Shape; - import java.awt.geom.AffineTransform; import java.awt.geom.Arc2D; import java.awt.geom.PathIterator; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; - import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -100,7 +97,7 @@ private PPath deserializeFromFile(final PBounds b, final File file) throws FileN final FileInputStream fin = new FileInputStream(file); final ObjectInputStream in = new ObjectInputStream(fin); path = (PPath) in.readObject(); - + in.close(); return path; } diff --git a/core/src/test/java/org/piccolo2d/nodes/MockPropertyChangeListener.java b/core/src/test/java/org/piccolo2d/nodes/MockPropertyChangeListener.java index 70323104..af3b00cb 100644 --- a/core/src/test/java/org/piccolo2d/nodes/MockPropertyChangeListener.java +++ b/core/src/test/java/org/piccolo2d/nodes/MockPropertyChangeListener.java @@ -38,7 +38,7 @@ * Mock PropertyChangeListener. */ public class MockPropertyChangeListener implements PropertyChangeListener { - private final List changes = new ArrayList(); + private final List changes = new ArrayList(); public void propertyChange(final PropertyChangeEvent evt) { changes.add(evt); diff --git a/core/src/test/java/org/piccolo2d/nodes/PHtmlViewTest.java b/core/src/test/java/org/piccolo2d/nodes/PHtmlViewTest.java index 66a4ee73..466e0b5a 100644 --- a/core/src/test/java/org/piccolo2d/nodes/PHtmlViewTest.java +++ b/core/src/test/java/org/piccolo2d/nodes/PHtmlViewTest.java @@ -35,7 +35,6 @@ import org.piccolo2d.MockPropertyChangeListener; import org.piccolo2d.PCanvas; -import org.piccolo2d.nodes.PHtmlView; import org.piccolo2d.util.PBounds; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/nodes/PImageTest.java b/core/src/test/java/org/piccolo2d/nodes/PImageTest.java index 6d7d54d1..e3e719ba 100644 --- a/core/src/test/java/org/piccolo2d/nodes/PImageTest.java +++ b/core/src/test/java/org/piccolo2d/nodes/PImageTest.java @@ -34,7 +34,6 @@ import javax.imageio.ImageIO; -import org.piccolo2d.nodes.PImage; import org.piccolo2d.util.PPaintContext; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/nodes/PTextTest.java b/core/src/test/java/org/piccolo2d/nodes/PTextTest.java index 380ae1cd..a1b7de93 100644 --- a/core/src/test/java/org/piccolo2d/nodes/PTextTest.java +++ b/core/src/test/java/org/piccolo2d/nodes/PTextTest.java @@ -33,7 +33,6 @@ import java.awt.Font; import org.piccolo2d.MockPropertyChangeListener; -import org.piccolo2d.nodes.PText; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/util/PAffineTransformTest.java b/core/src/test/java/org/piccolo2d/util/PAffineTransformTest.java index c4e28ff3..61f0fbd2 100644 --- a/core/src/test/java/org/piccolo2d/util/PAffineTransformTest.java +++ b/core/src/test/java/org/piccolo2d/util/PAffineTransformTest.java @@ -34,10 +34,6 @@ import java.awt.geom.Rectangle2D; import org.piccolo2d.PiccoloAsserts; -import org.piccolo2d.util.PAffineTransform; -import org.piccolo2d.util.PAffineTransformException; -import org.piccolo2d.util.PBounds; -import org.piccolo2d.util.PDimension; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/util/PBoundsTest.java b/core/src/test/java/org/piccolo2d/util/PBoundsTest.java index fcac2702..d77d1c20 100644 --- a/core/src/test/java/org/piccolo2d/util/PBoundsTest.java +++ b/core/src/test/java/org/piccolo2d/util/PBoundsTest.java @@ -31,8 +31,6 @@ import java.awt.geom.Rectangle2D; import org.piccolo2d.PiccoloAsserts; -import org.piccolo2d.util.PBounds; -import org.piccolo2d.util.PDimension; import junit.framework.TestCase; diff --git a/core/src/test/java/org/piccolo2d/util/PDebugTest.java b/core/src/test/java/org/piccolo2d/util/PDebugTest.java index e1fccad0..1ea5059d 100644 --- a/core/src/test/java/org/piccolo2d/util/PDebugTest.java +++ b/core/src/test/java/org/piccolo2d/util/PDebugTest.java @@ -30,8 +30,6 @@ import java.awt.Color; -import org.piccolo2d.util.PDebug; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/util/PDimensionTest.java b/core/src/test/java/org/piccolo2d/util/PDimensionTest.java index 2040b609..86b748c6 100644 --- a/core/src/test/java/org/piccolo2d/util/PDimensionTest.java +++ b/core/src/test/java/org/piccolo2d/util/PDimensionTest.java @@ -32,8 +32,6 @@ import java.awt.geom.Dimension2D; import java.awt.geom.Point2D; -import org.piccolo2d.util.PDimension; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/util/PObjectOutputStreamTest.java b/core/src/test/java/org/piccolo2d/util/PObjectOutputStreamTest.java index 1656c96c..07cf90b9 100644 --- a/core/src/test/java/org/piccolo2d/util/PObjectOutputStreamTest.java +++ b/core/src/test/java/org/piccolo2d/util/PObjectOutputStreamTest.java @@ -31,8 +31,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.piccolo2d.util.PObjectOutputStream; - import junit.framework.TestCase; /** diff --git a/core/src/test/java/org/piccolo2d/util/PPickPathTest.java b/core/src/test/java/org/piccolo2d/util/PPickPathTest.java index 026e65b9..f80a0c81 100644 --- a/core/src/test/java/org/piccolo2d/util/PPickPathTest.java +++ b/core/src/test/java/org/piccolo2d/util/PPickPathTest.java @@ -33,7 +33,6 @@ import org.piccolo2d.PLayer; import org.piccolo2d.PNode; import org.piccolo2d.nodes.PPath; -import org.piccolo2d.util.PPickPath; import junit.framework.TestCase; diff --git a/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java b/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java index d284f3f6..cd487ab9 100644 --- a/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java @@ -94,7 +94,7 @@ public void activityStep(final long currentTime) { } public void rotateNodes() { - final Iterator i = getCanvas().getLayer().getChildrenReference().iterator(); + final Iterator i = getCanvas().getLayer().getChildrenReference().iterator(); while (i.hasNext()) { final PNode each = (PNode) i.next(); each.rotate(Math.toRadians(2)); diff --git a/examples/src/main/java/org/piccolo2d/examples/EventHandlerExample.java b/examples/src/main/java/org/piccolo2d/examples/EventHandlerExample.java index 7073a319..d5753f98 100644 --- a/examples/src/main/java/org/piccolo2d/examples/EventHandlerExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/EventHandlerExample.java @@ -71,7 +71,7 @@ public void initialize() { // Make the event handler only work with BUTTON1 events, so that it does // not conflict with the zoom event handler that is installed by // default. - rectEventHandler.setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + rectEventHandler.setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); // Remove the pan event handler that is installed by default so that it // does not conflict with our new rectangle creation event handler. diff --git a/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java b/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java index 845760c2..15860aa5 100644 --- a/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java +++ b/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java @@ -71,7 +71,7 @@ public void createExampleButtons() { JPanel panel= new JPanel(new GridLayout(0, 2)); c.add(BorderLayout.CENTER, panel); - addExampleButtons(panel, new Class[] { ActivityExample.class, AngleNodeExample.class, + addExampleButtons(panel, new Class[] { ActivityExample.class, AngleNodeExample.class, BirdsEyeViewExample.class, CameraExample.class, CenterExample.class, ChartLabelExample.class, ClipExample.class, CompositeExample.class, DynamicExample.class, EventHandlerExample.class, FullScreenNodeExample.class, GraphEditorExample.class, GridExample.class, GroupExample.class, @@ -93,18 +93,27 @@ private JPanel buildOptions() { optionsPanel.setBorder(new TitledBorder("Display Options")); optionsPanel.add(new JCheckBox(new AbstractAction("Print Frame Rates to Console") { - public void actionPerformed(final ActionEvent e) { + + private static final long serialVersionUID = 1L; + + public void actionPerformed(final ActionEvent e) { PDebug.debugPrintFrameRate = !PDebug.debugPrintFrameRate; } })); optionsPanel.add(new JCheckBox(new AbstractAction("Show Region Managment") { - public void actionPerformed(final ActionEvent e) { + + private static final long serialVersionUID = 1L; + + public void actionPerformed(final ActionEvent e) { PDebug.debugRegionManagement = !PDebug.debugRegionManagement; } })); optionsPanel.add(new JCheckBox(new AbstractAction("Show Full Bounds") { + + private static final long serialVersionUID = 1L; + public void actionPerformed(final ActionEvent e) { PDebug.debugFullBounds = !PDebug.debugFullBounds; } @@ -113,20 +122,23 @@ public void actionPerformed(final ActionEvent e) { return optionsPanel; } - private void addExampleButtons(final JPanel panel, final Class[] exampleClasses) { + private void addExampleButtons(final JPanel panel, final Class[] exampleClasses) { for (int i = 0; i < exampleClasses.length; i++) { panel.add(buildExampleButton(exampleClasses[i])); } } - private JButton buildExampleButton(final Class exampleClass) { + private JButton buildExampleButton(final Class exampleClass) { final String fullClassName = exampleClass.getName(); final String simpleClassName = fullClassName.substring(fullClassName.lastIndexOf('.') + 1); final String exampleLabel = camelToProper(simpleClassName); JButton button = new JButton(new AbstractAction(exampleLabel) { - public void actionPerformed(final ActionEvent event) { + + private static final long serialVersionUID = 1L; + + public void actionPerformed(final ActionEvent event) { try { - final PFrame example = (PFrame) exampleClass.newInstance(); + final PFrame example = (PFrame)exampleClass.getDeclaredConstructor().newInstance(); example.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); } catch (final Exception e) { diff --git a/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java b/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java index d507f20e..44a3e47f 100644 --- a/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2019, Piccolo2D project, http://piccolo2d.org + * Copyright (c) 2008-2011, Piccolo2D project, http://piccolo2d.org * Copyright (c) 1998-2008, University of Maryland * All rights reserved. * @@ -73,12 +73,12 @@ public void initialize() { final PLayer edgeLayer = new PLayer(); getCanvas().getCamera().addLayer(0, edgeLayer); final Random rnd = new Random(); - ArrayList tmp; + ArrayList tmp; for (int i = 0; i < numNodes; i++) { final float x = (float) (300. * rnd.nextDouble()); final float y = (float) (400. * rnd.nextDouble()); final PPath path = PPath.createEllipse(x, y, 20, 20); - tmp = new ArrayList(); + tmp = new ArrayList(); path.addAttribute("edges", tmp); nodeLayer.addChild(path); } @@ -103,7 +103,7 @@ public void initialize() { tmp = (ArrayList) node2.getAttribute("edges"); tmp.add(edge); - tmp = new ArrayList(); + tmp = new ArrayList(); tmp.add(node1); tmp.add(node2); edge.addAttribute("nodes", tmp); @@ -153,12 +153,12 @@ public void drag(final PInputEvent e) { final PNode node = e.getPickedNode(); node.translate(e.getDelta().width, e.getDelta().height); - final ArrayList edges = (ArrayList) e.getPickedNode().getAttribute("edges"); + final ArrayList edges = (ArrayList) e.getPickedNode().getAttribute("edges"); int i; for (i = 0; i < edges.size(); i++) { final PPath edge = (PPath) edges.get(i); - final ArrayList nodes = (ArrayList) edge.getAttribute("nodes"); + final ArrayList nodes = (ArrayList) edge.getAttribute("nodes"); final PNode node1 = (PNode) nodes.get(0); final PNode node2 = (PNode) nodes.get(1); diff --git a/examples/src/main/java/org/piccolo2d/examples/GroupExample.java b/examples/src/main/java/org/piccolo2d/examples/GroupExample.java index 9e051ec6..d2fca0d9 100644 --- a/examples/src/main/java/org/piccolo2d/examples/GroupExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/GroupExample.java @@ -109,7 +109,7 @@ public void initialize() { // Create a selection handler so we can see that the decorator actually // works - final ArrayList selectableParents = new ArrayList(); + final ArrayList selectableParents = new ArrayList(); selectableParents.add(dg); selectableParents.add(vdg); diff --git a/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java b/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java index 0c83c150..61738c75 100644 --- a/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java @@ -44,9 +44,6 @@ */ public class LayoutExample extends PFrame { - /** - * - */ private static final long serialVersionUID = 1L; public LayoutExample() { @@ -71,9 +68,9 @@ public void layoutChildren() { double xOffset = 0; final double yOffset = 0; - final Iterator i = getChildrenIterator(); + final Iterator i = getChildrenIterator(); while (i.hasNext()) { - final PNode each = (PNode) i.next(); + final PNode each = i.next(); each.setOffset(xOffset - each.getX(), yOffset); xOffset += each.getWidth(); } diff --git a/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java b/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java index a67134ce..3c070276 100644 --- a/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java @@ -37,7 +37,9 @@ public class P3DRectExample extends PFrame { - public P3DRectExample() { + private static final long serialVersionUID = 1L; + + public P3DRectExample() { this(null); } diff --git a/examples/src/main/java/org/piccolo2d/examples/PSwingScaleExample.java b/examples/src/main/java/org/piccolo2d/examples/PSwingScaleExample.java index 5d4b5f29..d8d3f036 100644 --- a/examples/src/main/java/org/piccolo2d/examples/PSwingScaleExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/PSwingScaleExample.java @@ -21,7 +21,9 @@ */ public class PSwingScaleExample extends PFrame { - public static void main(String[] args) { + private static final long serialVersionUID = 1L; + + public static void main(String[] args) { new PSwingScaleExample(); } diff --git a/examples/src/main/java/org/piccolo2d/examples/PrintExample.java b/examples/src/main/java/org/piccolo2d/examples/PrintExample.java index 7c6dfb2e..7ce9674a 100644 --- a/examples/src/main/java/org/piccolo2d/examples/PrintExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/PrintExample.java @@ -185,9 +185,9 @@ public Point getViewPosition(final Rectangle2D viewBounds) { if (camera != null) { // First we compute the union of all the layers final PBounds layerBounds = new PBounds(); - final java.util.List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final java.util.List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); layerBounds.add(layer.getFullBoundsReference()); } @@ -233,9 +233,9 @@ public void setViewPosition(final double x, final double y) { // Get the union of all the layers' bounds final PBounds layerBounds = new PBounds(); - final List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); layerBounds.add(layer.getFullBoundsReference()); } diff --git a/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java b/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java index 6e04ee8f..79046a66 100644 --- a/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java @@ -155,9 +155,9 @@ public Point getViewPosition(final Rectangle2D viewBounds) { // First we compute the union of all the layers final PBounds layerBounds = new PBounds(); - final java.util.List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final java.util.List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); layerBounds.add(layer.getFullBoundsReference()); } @@ -202,9 +202,9 @@ public void setViewPosition(final double x, final double y) { // Get the union of all the layers' bounds final PBounds layerBounds = new PBounds(); - final java.util.List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final java.util.List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); layerBounds.add(layer.getFullBoundsReference()); } diff --git a/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java b/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java index 38ad3794..536bbda9 100755 --- a/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java @@ -30,7 +30,6 @@ import java.awt.Color; import java.awt.Graphics2D; -import java.awt.Paint; import java.awt.image.BufferedImage; diff --git a/examples/src/main/java/org/piccolo2d/examples/SquiggleExample.java b/examples/src/main/java/org/piccolo2d/examples/SquiggleExample.java index 3ac56682..b92caa3b 100644 --- a/examples/src/main/java/org/piccolo2d/examples/SquiggleExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/SquiggleExample.java @@ -61,7 +61,7 @@ public SquiggleExample(final PCanvas aCanvas) { public void initialize() { super.initialize(); final PBasicInputEventHandler squiggleEventHandler = createSquiggleEventHandler(); - squiggleEventHandler.setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + squiggleEventHandler.setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); getCanvas().removeInputEventListener(getCanvas().getPanEventHandler()); getCanvas().addInputEventListener(squiggleEventHandler); layer = getCanvas().getLayer(); diff --git a/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java b/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java index 9a6b2ce9..b929532b 100644 --- a/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java @@ -81,9 +81,9 @@ protected void activityStep(final long elapsedTime) { final PRoot root = getActivityScheduler().getRoot(); if (root.getPaintInvalid() || root.getChildPaintInvalid()) { - final Iterator i = getCanvas().getCamera().getChildrenIterator(); + final Iterator i = getCanvas().getCamera().getChildrenIterator(); while (i.hasNext()) { - final PNode each = (PNode) i.next(); + final PNode each = i.next(); if (each instanceof PHandle) { final PHandle handle = (PHandle) each; handle.relocateHandle(); diff --git a/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java b/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java index c7153425..822406f4 100644 --- a/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java @@ -67,7 +67,10 @@ public class SwingLayoutExample { public static class MyPPath extends PPath.Float { - public MyPPath(final Shape shape, final Color color, final Stroke stroke, final Color strokeColor) { + + private static final long serialVersionUID = 1L; + + public MyPPath(final Shape shape, final Color color, final Stroke stroke, final Color strokeColor) { super(shape, stroke); setPaint(color); setStrokePaint(strokeColor); diff --git a/examples/src/main/java/org/piccolo2d/examples/TextWrappingExample.java b/examples/src/main/java/org/piccolo2d/examples/TextWrappingExample.java index 0846b6e9..1ff5b230 100755 --- a/examples/src/main/java/org/piccolo2d/examples/TextWrappingExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/TextWrappingExample.java @@ -32,7 +32,6 @@ import java.awt.Color; import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -70,7 +69,10 @@ public class TextWrappingExample extends PFrame { /** Toggle text action. */ private final AbstractAction toggleText = new AbstractAction("Toggle text") { - /** {@inheritDoc} */ + + private static final long serialVersionUID = 1L; + + /** {@inheritDoc} */ public void actionPerformed(final ActionEvent event) { wide.setText(wide.getText() == "" ? TEXT : ""); narrow.setText(narrow.getText() == "" ? TEXT : ""); @@ -79,6 +81,9 @@ public void actionPerformed(final ActionEvent event) { /** Constrain height action. */ private final AbstractAction constrainHeight = new AbstractAction("Constrain Height") { + + private static final long serialVersionUID = 1L; + /** {@inheritDoc} */ public void actionPerformed(final ActionEvent event) { wide.setConstrainHeightToTextHeight(!wide.isConstrainHeightToTextHeight()); @@ -88,6 +93,9 @@ public void actionPerformed(final ActionEvent event) { /** Constrain width action. */ private final AbstractAction constrainWidth = new AbstractAction("Constrain Width") { + + private static final long serialVersionUID = 1L; + /** {@inheritDoc} */ public void actionPerformed(final ActionEvent event) { wide.setConstrainWidthToTextWidth(!wide.isConstrainWidthToTextWidth()); @@ -97,6 +105,9 @@ public void actionPerformed(final ActionEvent event) { /** Reset bounds action. */ private final AbstractAction resetBoundsAction = new AbstractAction("Reset Bounds") { + + private static final long serialVersionUID = 1L; + /** {@inheritDoc} */ public void actionPerformed(final ActionEvent event) { wide.setBounds(10.0d, 10.0d, 400.0d, 100.0d); diff --git a/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java b/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java index eba879ed..026d80eb 100644 --- a/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java +++ b/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java @@ -36,7 +36,10 @@ class CalendarNode extends PNode { - static int DEFAULT_NUM_DAYS = 7; + + private static final long serialVersionUID = 1L; + + static int DEFAULT_NUM_DAYS = 7; static int DEFAULT_NUM_WEEKS = 12; static int TEXT_X_OFFSET = 1; static int TEXT_Y_OFFSET = 10; diff --git a/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java b/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java index eb87e8d1..c7c4fbb5 100644 --- a/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java +++ b/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java @@ -37,15 +37,18 @@ class DayNode extends PNode { - boolean hasWidthFocus; + + private static final long serialVersionUID = 1L; + + boolean hasWidthFocus; boolean hasHeightFocus; - ArrayList lines; + ArrayList lines; int week; int day; String dayOfMonthString; public DayNode(int week, int day) { - lines = new ArrayList(); + lines = new ArrayList(); lines.add("7:00 AM Walk the dog."); lines.add("9:30 AM Meet John for Breakfast."); lines.add("12:00 PM Lunch with Peter."); diff --git a/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java b/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java index 39f9b08f..dc5ca543 100644 --- a/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java +++ b/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java @@ -36,7 +36,10 @@ public class TabularFisheye extends PCanvas { - private CalendarNode calendarNode; + + private static final long serialVersionUID = 1L; + + private CalendarNode calendarNode; public TabularFisheye() { calendarNode = new CalendarNode(); diff --git a/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java b/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java index 4bd0ad58..6a96a332 100644 --- a/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java +++ b/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java @@ -31,7 +31,10 @@ import javax.swing.JFrame; public class TabularFisheyeFrame extends JFrame { - public TabularFisheyeFrame() { + + private static final long serialVersionUID = 1L; + + public TabularFisheyeFrame() { setTitle("Piccolo2D Tabular Fisheye"); TabularFisheye tabularFisheye = new TabularFisheye(); diff --git a/examples/src/main/java/org/piccolo2d/examples/issues/ActivityMemoryLeakBugExample.java b/examples/src/main/java/org/piccolo2d/examples/issues/ActivityMemoryLeakBugExample.java index 3261558b..aed7d25c 100644 --- a/examples/src/main/java/org/piccolo2d/examples/issues/ActivityMemoryLeakBugExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/issues/ActivityMemoryLeakBugExample.java @@ -49,7 +49,9 @@ */ public class ActivityMemoryLeakBugExample extends PFrame { - public static void main(String[] args) { + private static final long serialVersionUID = 1L; + + public static void main(String[] args) { new ActivityMemoryLeakBugExample(); } @@ -60,7 +62,7 @@ public void initialize() { PNode node = PPath.createEllipse(20, 20, 20, 20); layer.addChild(node); // Create a WeakReference to the node so we can detect if it is gc'd. - final WeakReference ref = new WeakReference(layer.getChild(0)); + final WeakReference ref = new WeakReference(layer.getChild(0)); // Create and execute an activity. ((PNode) ref.get()).animateToPositionScaleRotation(0, 0, 5.0, 0, 1000); // Create a Timer that will start after the activity and repeat. diff --git a/examples/src/main/java/org/piccolo2d/examples/issues/ZeroWidthStrokeBug.java b/examples/src/main/java/org/piccolo2d/examples/issues/ZeroWidthStrokeBug.java index 8006e9bb..37f94dc9 100644 --- a/examples/src/main/java/org/piccolo2d/examples/issues/ZeroWidthStrokeBug.java +++ b/examples/src/main/java/org/piccolo2d/examples/issues/ZeroWidthStrokeBug.java @@ -44,7 +44,9 @@ */ public class ZeroWidthStrokeBug extends PFrame { - public ZeroWidthStrokeBug() { + private static final long serialVersionUID = 1L; + + public ZeroWidthStrokeBug() { this(null); } diff --git a/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java b/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java index e3561f36..60a0bac2 100644 --- a/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java +++ b/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java @@ -46,8 +46,9 @@ public class MultiplePSwingCanvasesExample extends JFrame { - - public static void main(final String[] args) { + private static final long serialVersionUID = 1L; + + public static void main(final String[] args) { JFrame frame = new MultiplePSwingCanvasesExample(); Container container = frame.getContentPane(); @@ -96,7 +97,9 @@ private static PSwing buildTestButton() { button.addActionListener(new AbstractAction() { - public void actionPerformed(ActionEvent arg0) { + private static final long serialVersionUID = 1L; + + public void actionPerformed(ActionEvent arg0) { button.setText("Thanks"); } diff --git a/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java b/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java index 81a34b0d..0b52ff67 100644 --- a/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java +++ b/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java @@ -218,13 +218,13 @@ public PSwingExample2() { panel.setBorder(new TitledBorder(new EtchedBorder(EtchedBorder.RAISED), "A JList", TitledBorder.LEFT, TitledBorder.TOP)); panel.setPreferredSize(new Dimension(200, 200)); - final Vector data = new Vector(); + final Vector data = new Vector(); data.addElement("Choice 1"); data.addElement("Choice 2"); data.addElement("Choice 3"); data.addElement("Choice 4"); data.addElement("Choice 5"); - final JList list = new JList(data); + final JList list = new JList(data); list.setBackground(Color.lightGray); panel.add(list); swing = new PSwing(panel); @@ -298,52 +298,52 @@ public void paintIcon(final Component c, final Graphics g, final int x, final in canvas.getLayer().addChild(transform); // JTable Example - final Vector columns = new Vector(); + final Vector columns = new Vector(); columns.addElement("Check Number"); columns.addElement("Description"); columns.addElement("Amount"); - final Vector rows = new Vector(); - Vector row = new Vector(); + final Vector> rows = new Vector>(); + Vector row = new Vector(); row.addElement("101"); row.addElement("Sandwich"); row.addElement("$20.00"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("102"); row.addElement("Monkey Wrench"); row.addElement("$100.00"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("214"); row.addElement("Ant farm"); row.addElement("$55.00"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("215"); row.addElement("Self-esteem tapes"); row.addElement("$37.99"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("216"); row.addElement("Tube Socks"); row.addElement("$7.45"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("220"); row.addElement("Ab Excerciser"); row.addElement("$56.95"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("319"); row.addElement("Y2K Supplies"); row.addElement("$4624.33"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("332"); row.addElement("Tie Rack"); row.addElement("$15.20"); rows.addElement(row); - row = new Vector(); + row = new Vector(); row.addElement("344"); row.addElement("Swing Set"); row.addElement("$146.59"); diff --git a/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java b/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java index 058d0a17..0a4c3119 100644 --- a/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java +++ b/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java @@ -95,7 +95,9 @@ private ExampleList createSimpleComponentExamples() { JPanel examplePanel = new JPanel() { - protected void paintComponent(Graphics g) { + private static final long serialVersionUID = 1L; + + protected void paintComponent(Graphics g) { super.paintComponent(g); g.setColor(Color.RED); g.fillRect(0, 0, getWidth(), getHeight()); @@ -163,7 +165,10 @@ public static void main(final String[] args) { } class ExampleGrid extends PNode { - private int columns; + + private static final long serialVersionUID = 1L; + + private int columns; public ExampleGrid(int columns) { this.columns = columns; @@ -194,7 +199,10 @@ private double[] calculateColumnWidths() { } class ExampleList extends PText { - ExampleList(String name) { + + private static final long serialVersionUID = 1L; + + ExampleList(String name) { super(name); setScale(2); } @@ -220,7 +228,10 @@ public void addExample(String name, JComponent example) { } class ExampleNode extends PText { - ExampleNode(String name, PNode example) { + + private static final long serialVersionUID = 1L; + + ExampleNode(String name, PNode example) { super(name); addChild(example); diff --git a/examples/src/main/java/org/piccolo2d/tutorial/InterfaceFrame.java b/examples/src/main/java/org/piccolo2d/tutorial/InterfaceFrame.java index b1b9a8f7..7f2e1cc3 100644 --- a/examples/src/main/java/org/piccolo2d/tutorial/InterfaceFrame.java +++ b/examples/src/main/java/org/piccolo2d/tutorial/InterfaceFrame.java @@ -48,9 +48,6 @@ public class InterfaceFrame extends PFrame { - /** - * - */ private static final long serialVersionUID = 1L; public void initialize() { diff --git a/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java b/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java index 886ca160..26b9f840 100644 --- a/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java +++ b/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java @@ -43,14 +43,12 @@ public class PiccoloPresentation extends PFrame { - /** - * - */ private static final long serialVersionUID = 1L; + protected PNode slideBar; protected PNode currentSlide; protected PBasicInputEventHandler eventHandler; - protected ArrayList slides = new ArrayList(); + protected ArrayList slides = new ArrayList(); public PiccoloPresentation() { super(); diff --git a/examples/src/main/java/org/piccolo2d/tutorial/UserInteraction.java b/examples/src/main/java/org/piccolo2d/tutorial/UserInteraction.java index af2440d3..23408ce2 100644 --- a/examples/src/main/java/org/piccolo2d/tutorial/UserInteraction.java +++ b/examples/src/main/java/org/piccolo2d/tutorial/UserInteraction.java @@ -122,7 +122,7 @@ public class SquiggleHandler extends PDragSequenceEventHandler { public SquiggleHandler(final PCanvas aCanvas) { canvas = aCanvas; - setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); } public void startDrag(final PInputEvent e) { diff --git a/extras/src/main/java/org/piccolo2d/extras/PFrame.java b/extras/src/main/java/org/piccolo2d/extras/PFrame.java index e348112e..27f0a2a9 100644 --- a/extras/src/main/java/org/piccolo2d/extras/PFrame.java +++ b/extras/src/main/java/org/piccolo2d/extras/PFrame.java @@ -244,9 +244,9 @@ protected void chooseBestDisplayMode(final GraphicsDevice device) { * @return best display mode the given device supports */ protected DisplayMode getBestDisplayMode(final GraphicsDevice device) { - final Iterator itr = getPreferredDisplayModes(device).iterator(); + final Iterator itr = getPreferredDisplayModes(device).iterator(); while (itr.hasNext()) { - final DisplayMode each = (DisplayMode) itr.next(); + final DisplayMode each = itr.next(); final DisplayMode[] modes = device.getDisplayModes(); for (int i = 0; i < modes.length; i++) { if (modes[i].getWidth() == each.getWidth() && modes[i].getHeight() == each.getHeight() @@ -266,8 +266,8 @@ protected DisplayMode getBestDisplayMode(final GraphicsDevice device) { * @param device the device being inspected * @return preferred display mode */ - protected Collection getPreferredDisplayModes(final GraphicsDevice device) { - final ArrayList result = new ArrayList(); + protected Collection getPreferredDisplayModes(final GraphicsDevice device) { + final Collection result = new ArrayList(); result.add(device.getDisplayMode()); /* diff --git a/extras/src/main/java/org/piccolo2d/extras/activities/PPositionPathActivity.java b/extras/src/main/java/org/piccolo2d/extras/activities/PPositionPathActivity.java index 5c561cc8..10d6febe 100644 --- a/extras/src/main/java/org/piccolo2d/extras/activities/PPositionPathActivity.java +++ b/extras/src/main/java/org/piccolo2d/extras/activities/PPositionPathActivity.java @@ -169,7 +169,7 @@ public void setPosition(final int index, final Point2D position) { */ public void setPositions(final GeneralPath path) { final PathIterator pi = path.getPathIterator(null, 1); - final ArrayList points = new ArrayList(); + final ArrayList points = new ArrayList(); final float[] point = new float[6]; float distanceSum = 0; float lastMoveToX = 0; diff --git a/extras/src/main/java/org/piccolo2d/extras/event/PNavigationEventHandler.java b/extras/src/main/java/org/piccolo2d/extras/event/PNavigationEventHandler.java index d3d5399f..d7dc01b5 100644 --- a/extras/src/main/java/org/piccolo2d/extras/event/PNavigationEventHandler.java +++ b/extras/src/main/java/org/piccolo2d/extras/event/PNavigationEventHandler.java @@ -77,7 +77,7 @@ public class PNavigationEventHandler extends PBasicInputEventHandler { /** The OUT direction on the scene. */ public static final int OUT = 5; - private static Hashtable NODE_TO_GLOBAL_NODE_CENTER_MAPPING = new Hashtable(); + private static Hashtable NODE_TO_GLOBAL_NODE_CENTER_MAPPING = new Hashtable(); private PNode focusNode; private PTransformActivity navigationActivity; @@ -88,7 +88,7 @@ public class PNavigationEventHandler extends PBasicInputEventHandler { */ public PNavigationEventHandler() { super(); - setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); } // **************************************************************** @@ -263,12 +263,12 @@ public PNode getNeighborInDirection(final int direction) { final Point2D highlightCenter = focusNode.getGlobalFullBounds().getCenter2D(); NODE_TO_GLOBAL_NODE_CENTER_MAPPING.put(focusNode, highlightCenter); - final List l = getNeighbors(); + final List l = getNeighbors(); sortNodesByDistanceFromPoint(l, highlightCenter); - final Iterator i = l.iterator(); + final Iterator i = l.iterator(); while (i.hasNext()) { - final PNode each = (PNode) i.next(); + final PNode each = i.next(); if (nodeIsNeighborInDirection(each, direction)) { return each; } @@ -283,15 +283,15 @@ public PNode getNeighborInDirection(final int direction) { * * @return list of nodes that are 1 hop away from the current focusNode */ - public List getNeighbors() { - final ArrayList result = new ArrayList(); + public List getNeighbors() { + final ArrayList result = new ArrayList(); if (focusNode == null || focusNode.getParent() == null) { return result; } final PNode focusParent = focusNode.getParent(); - final Iterator i = focusParent.getChildrenIterator(); + final Iterator i = focusParent.getChildrenIterator(); while (i.hasNext()) { final PNode each = (PNode) i.next(); @@ -363,13 +363,15 @@ public boolean nodeIsNeighborInDirection(final PNode node, final int direction) * @param nodes list of nodes to be sorted * @param point point from which distance is being computed */ - public void sortNodesByDistanceFromPoint(final List nodes, final Point2D point) { - Collections.sort(nodes, new Comparator() { - public int compare(final Object o1, final Object o2) { - return compare((PNode) o1, (PNode) o2); - } - - private int compare(final PNode each1, final PNode each2) { + public void sortNodesByDistanceFromPoint(final List nodes, final Point2D point) { + + Collections.sort(nodes, new Comparator() { + + //public int compare(final Object o1, final Object o2) { + // return compare((PNode) o1, (PNode) o2); + //} + + public int compare(final PNode each1, final PNode each2) { final Point2D center1 = each1.getGlobalFullBounds().getCenter2D(); final Point2D center2 = each2.getGlobalFullBounds().getCenter2D(); diff --git a/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java b/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java index 1fabb7c5..3a9484df 100644 --- a/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java +++ b/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java @@ -54,56 +54,67 @@ * @author Jesse Grosjean */ public class PNotification { - /** Name of the notification. */ - protected String name; - /** The Object associated with this notification. */ - protected Object source; - /** A free form map of properties to attach to this notification. */ - protected Map properties; + /** Name of the notification. */ + protected String name; + /** The Object associated with this notification. */ + protected Object source; + /** A free form map of properties to attach to this notification. */ + protected Map properties; - /** - * Creates a notification. - * - * @param name Arbitrary name of the notification - * @param source object associated with this notification - * @param properties free form map of information about the notification - */ - public PNotification(final String name, final Object source, final Map properties) { - this.name = name; - this.source = source; - this.properties = properties; - } + /** + * Creates a notification. + * + * @param name Arbitrary name of the notification + * @param source object associated with this notification + */ + public PNotification(final String name, final Object source) { + this.name = name; + this.source = source; + } - /** - * Return the name of the notification. This is the same as the name used to - * register with the notification center. - * - * @return name of notification - */ - public String getName() { - return name; - } + /** + * Creates a notification. + * + * @param name Arbitrary name of the notification + * @param source object associated with this notification + * @param properties free form map of information about the notification + */ + protected PNotification(final String name, final Object source, final Map properties) { + this.name = name; + this.source = source; + this.properties = properties; + } - /** - * Return the object associated with this notification. This is most often - * the same object that posted the notification. It may be null. - * - * @return object associated with this notification - */ - public Object getObject() { - return source; - } + /** + * Return the name of the notification. This is the same as the name used to + * register with the notification center. + * + * @return name of notification + */ + public String getName() { + return name; + } - /** - * Return a property associated with the notification, or null if not found. - * - * @param key key used for looking up the property - * @return value associated with the key or null if not found - */ - public Object getProperty(final Object key) { - if (properties != null) { - return properties.get(key); - } - return null; - } + /** + * Return the object associated with this notification. This is most often the + * same object that posted the notification. It may be null. + * + * @return object associated with this notification + */ + public Object getObject() { + return source; + } + + /** + * Return a property associated with the notification, or null if not found. + * + * @param key key used for looking up the property + * @return value associated with the key or null if not found + */ + public Object getProperty(final Object key) { + if (properties != null) { + return properties.get(key); + } + return null; + } } diff --git a/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java b/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java index b10acd08..161a6bd8 100644 --- a/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java +++ b/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java @@ -46,6 +46,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; /** * PNotificationCenter provides a way for objects that don't know about @@ -69,10 +70,10 @@ public final class PNotificationCenter { private static volatile PNotificationCenter DEFAULT_CENTER; /** A map of listeners keyed by NotificationKey objects. */ - private HashMap listenersMap; + private HashMap> listenersMap; /** A queue of NotificationKeys that are available to be garbage collected. */ - private ReferenceQueue keyQueue; + private ReferenceQueue keyQueue; /** * Singleton accessor for the PNotificationCenter. @@ -87,8 +88,8 @@ public synchronized static PNotificationCenter defaultCenter() { } private PNotificationCenter() { - listenersMap = new HashMap(); - keyQueue = new ReferenceQueue(); + listenersMap = new HashMap>(); + keyQueue = new ReferenceQueue(); } /** @@ -122,9 +123,9 @@ public boolean addListener(final Object listener, final String callbackMethodNam final NotificationKey key = new NotificationKey(name, sanitizedObject); final NotificationTarget notificationTarget = new NotificationTarget(listener, method); - List list = (List) listenersMap.get(key); + List list = listenersMap.get(key); if (list == null) { - list = new ArrayList(); + list = new ArrayList(); listenersMap.put(new NotificationKey(name, sanitizedObject, keyQueue), list); } @@ -138,7 +139,7 @@ public boolean addListener(final Object listener, final String callbackMethodNam private Method extractCallbackMethod(final Object listener, final String methodName) { Method method = null; try { - Class[] classes = new Class[1]; + Class[] classes = new Class[1]; classes[0] = PNotification.class; method = listener.getClass().getMethod(methodName, classes); } @@ -183,7 +184,8 @@ private Object nullify(final Object object) { public void removeListener(final Object listener) { processKeyQueue(); - final Iterator i = new LinkedList(listenersMap.keySet()).iterator(); + Set keys = listenersMap.keySet(); + final Iterator i = new LinkedList(keys).iterator(); while (i.hasNext()) { removeListener(listener, i.next()); } @@ -209,8 +211,8 @@ public void removeListener(final Object listener) { public void removeListener(final Object listener, final String notificationName, final Object object) { processKeyQueue(); - final List keys = matchingKeys(notificationName, object); - final Iterator it = keys.iterator(); + final List keys = matchingKeys(notificationName, object); + final Iterator it = keys.iterator(); while (it.hasNext()) { removeListener(listener, it.next()); } @@ -240,7 +242,7 @@ public void postNotification(final String notificationName, final Object object) * @param object source of the notification, may be null * @param properties properties associated with the notification */ - public void postNotification(final String notificationName, final Object object, final Map properties) { + public void postNotification(final String notificationName, final Object object, final Map properties) { postNotification(new PNotification(notificationName, object, properties)); } @@ -253,7 +255,7 @@ public void postNotification(final String notificationName, final Object object, * listeners */ public void postNotification(final PNotification notification) { - final List mergedListeners = new LinkedList(); + final List mergedListeners = new LinkedList<>(); final Object name = notification.getName(); final Object object = notification.getObject(); @@ -283,20 +285,20 @@ else if (object != null) { * @param object source of the notification * @param listeners list to append listeners to */ - private void fillWithMatchingListeners(final Object notificationName, final Object object, final List listeners) { + private void fillWithMatchingListeners(final Object notificationName, final Object object, final List listeners) { final Object key = new NotificationKey(nullify(notificationName), nullify(object)); - final List globalListeners = (List) listenersMap.get(key); + final List globalListeners = listenersMap.get(key); if (globalListeners != null) { listeners.addAll(globalListeners); } } - private void dispatchNotifications(final PNotification notification, final List listeners) { + private void dispatchNotifications(final PNotification notification, final List listeners) { NotificationTarget listener; - final Iterator listenerIterator = listeners.iterator(); + final Iterator listenerIterator = listeners.iterator(); while (listenerIterator.hasNext()) { - listener = (NotificationTarget) listenerIterator.next(); + listener = listenerIterator.next(); if (listener.get() == null) { listenerIterator.remove(); } @@ -328,13 +330,13 @@ private void notifyListener(final PNotification notification, final Notification * * @return list of matching keys */ - private List matchingKeys(final String name, final Object object) { - final List result = new LinkedList(); + private List matchingKeys(final String name, final Object object) { + final List result = new LinkedList(); final NotificationKey searchKey = new NotificationKey(name, object); - final Iterator it = listenersMap.keySet().iterator(); + final Iterator it = listenersMap.keySet().iterator(); while (it.hasNext()) { - final NotificationKey key = (NotificationKey) it.next(); + final NotificationKey key = it.next(); if (searchKey.equals(key)) { result.add(key); } @@ -356,14 +358,14 @@ private void removeListener(final Object listener, final Object key) { return; } - final List list = (List) listenersMap.get(key); + final List list = listenersMap.get(key); if (list == null) { return; } - final Iterator it = list.iterator(); + final Iterator it = list.iterator(); while (it.hasNext()) { - final Object observer = ((NotificationTarget) it.next()).get(); + final Object observer = it.next().get(); if (observer == null || listener == observer) { it.remove(); } diff --git a/extras/src/main/java/org/piccolo2d/extras/event/PSelectionEventHandler.java b/extras/src/main/java/org/piccolo2d/extras/event/PSelectionEventHandler.java index 5ae38766..b96dcac8 100644 --- a/extras/src/main/java/org/piccolo2d/extras/event/PSelectionEventHandler.java +++ b/extras/src/main/java/org/piccolo2d/extras/event/PSelectionEventHandler.java @@ -76,9 +76,9 @@ public class PSelectionEventHandler extends PDragSequenceEventHandler { static final int NUM_STROKES = 10; /** The current selection. */ - private HashMap selection = null; + private HashMap selection = null; /** List of nodes whose children can be selected. */ - private List selectableParents = null; + private List selectableParents = null; private PPath marquee = null; /** Node that marquee is added to as a child. */ @@ -90,11 +90,11 @@ public class PSelectionEventHandler extends PDragSequenceEventHandler { private Stroke[] strokes = null; /** Used within drag handler temporarily. */ - private HashMap allItems = null; + private HashMap allItems = null; /** Used within drag handler temporarily. */ - private ArrayList unselectList = null; - private HashMap marqueeMap = null; + private ArrayList unselectList = null; + private HashMap marqueeMap = null; /** Node pressed on (or null if none). */ private PNode pressNode = null; @@ -118,7 +118,7 @@ public class PSelectionEventHandler extends PDragSequenceEventHandler { */ public PSelectionEventHandler(final PNode marqueeParent, final PNode selectableParent) { this.marqueeParent = marqueeParent; - selectableParents = new ArrayList(); + selectableParents = new ArrayList(); selectableParents.add(selectableParent); init(); } @@ -131,7 +131,7 @@ public PSelectionEventHandler(final PNode marqueeParent, final PNode selectableP * @param selectableParents A list of nodes whose children will be selected * by this event handler. */ - public PSelectionEventHandler(final PNode marqueeParent, final List selectableParents) { + public PSelectionEventHandler(final PNode marqueeParent, final List selectableParents) { this.marqueeParent = marqueeParent; this.selectableParents = selectableParents; init(); @@ -150,10 +150,10 @@ protected void init() { strokes[i] = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, dash, i); } - selection = new HashMap(); - allItems = new HashMap(); - unselectList = new ArrayList(); - marqueeMap = new HashMap(); + selection = new HashMap(); + allItems = new HashMap(); + unselectList = new ArrayList(); + marqueeMap = new HashMap(); } /** @@ -161,11 +161,11 @@ protected void init() { * * @param items collection of items to be selected */ - public void select(final Collection items) { + public void select(final Collection items) { boolean changes = false; - final Iterator itemIt = items.iterator(); + final Iterator itemIt = items.iterator(); while (itemIt.hasNext()) { - final PNode node = (PNode) itemIt.next(); + final PNode node = itemIt.next(); changes |= internalSelect(node); } if (changes) { @@ -178,7 +178,7 @@ public void select(final Collection items) { * * @param items map where keys are to be selected */ - public void select(final Map items) { + public void select(final Map items) { select(items.keySet()); } @@ -230,11 +230,11 @@ public void decorateSelectedNode(final PNode node) { * * @param items items to remove form the selection */ - public void unselect(final Collection items) { + public void unselect(final Collection items) { boolean changes = false; - final Iterator itemIt = items.iterator(); + final Iterator itemIt = items.iterator(); while (itemIt.hasNext()) { - final PNode node = (PNode) itemIt.next(); + final PNode node = itemIt.next(); changes |= internalUnselect(node); } if (changes) { @@ -285,7 +285,7 @@ public void undecorateSelectedNode(final PNode node) { public void unselectAll() { // Because unselect() removes from selection, we need to // take a copy of it first so it isn't changed while we're iterating - final ArrayList sel = new ArrayList(selection.keySet()); + final ArrayList sel = new ArrayList(selection.keySet()); unselect(sel); } @@ -304,8 +304,8 @@ public boolean isSelected(final PNode node) { * * @return copy of selection */ - public Collection getSelection() { - return new ArrayList(selection.keySet()); + public Collection getSelection() { + return new ArrayList(selection.keySet()); } /** @@ -314,7 +314,7 @@ public Collection getSelection() { * * @return direct reference to selection */ - public Collection getSelectionReference() { + public Collection getSelectionReference() { return Collections.unmodifiableCollection(selection.keySet()); } @@ -328,7 +328,7 @@ public Collection getSelectionReference() { protected boolean isSelectable(final PNode node) { boolean selectable = false; - final Iterator parentsIt = selectableParents.iterator(); + final Iterator parentsIt = selectableParents.iterator(); while (parentsIt.hasNext()) { final PNode parent = (PNode) parentsIt.next(); if (parent.getChildrenReference().contains(node)) { @@ -385,7 +385,7 @@ public void setSelectableParent(final PNode node) { * * @param c nodes to become selectable parents. */ - public void setSelectableParents(final Collection c) { + public void setSelectableParents(final Collection c) { selectableParents.clear(); selectableParents.addAll(c); } @@ -395,8 +395,8 @@ public void setSelectableParents(final Collection c) { * * @return selectable parents */ - public Collection getSelectableParents() { - return new ArrayList(selectableParents); + public Collection getSelectableParents() { + return new ArrayList(selectableParents); } // ////////////////////////////////////////////////////// @@ -608,13 +608,13 @@ protected void updateMarquee(final PInputEvent pie) { allItems.clear(); final PNodeFilter filter = createNodeFilter(b); - final Iterator parentsIt = selectableParents.iterator(); + final Iterator parentsIt = selectableParents.iterator(); while (parentsIt.hasNext()) { final PNode parent = (PNode) parentsIt.next(); - Collection items; + Collection items; if (parent instanceof PCamera) { - items = new ArrayList(); + items = new ArrayList(); for (int i = 0; i < ((PCamera) parent).getLayerCount(); i++) { ((PCamera) parent).getLayer(i).getAllNodes(filter, items); } @@ -623,7 +623,7 @@ protected void updateMarquee(final PInputEvent pie) { items = parent.getAllNodes(filter, null); } - final Iterator itemsIt = items.iterator(); + final Iterator itemsIt = items.iterator(); while (itemsIt.hasNext()) { allItems.put(itemsIt.next(), Boolean.TRUE); } @@ -639,9 +639,9 @@ protected void computeMarqueeSelection(final PInputEvent pie) { unselectList.clear(); // Make just the items in the list selected // Do this efficiently by first unselecting things not in the list - Iterator selectionEn = selection.keySet().iterator(); + Iterator selectionEn = selection.keySet().iterator(); while (selectionEn.hasNext()) { - final PNode node = (PNode) selectionEn.next(); + final PNode node = selectionEn.next(); if (!allItems.containsKey(node)) { unselectList.add(node); } @@ -651,7 +651,7 @@ protected void computeMarqueeSelection(final PInputEvent pie) { // Then select the rest selectionEn = allItems.keySet().iterator(); while (selectionEn.hasNext()) { - final PNode node = (PNode) selectionEn.next(); + final PNode node = selectionEn.next(); if (!selection.containsKey(node) && !marqueeMap.containsKey(node) && isSelectable(node)) { marqueeMap.put(node, Boolean.TRUE); } @@ -670,9 +670,9 @@ else if (!isSelectable(node)) { */ protected void computeOptionMarqueeSelection(final PInputEvent pie) { unselectList.clear(); - Iterator selectionEn = selection.keySet().iterator(); + Iterator selectionEn = selection.keySet().iterator(); while (selectionEn.hasNext()) { - final PNode node = (PNode) selectionEn.next(); + final PNode node = selectionEn.next(); if (!allItems.containsKey(node) && marqueeMap.containsKey(node)) { marqueeMap.remove(node); unselectList.add(node); @@ -683,7 +683,7 @@ protected void computeOptionMarqueeSelection(final PInputEvent pie) { // Then select the rest selectionEn = allItems.keySet().iterator(); while (selectionEn.hasNext()) { - final PNode node = (PNode) selectionEn.next(); + final PNode node = selectionEn.next(); if (!selection.containsKey(node) && !marqueeMap.containsKey(node) && isSelectable(node)) { marqueeMap.put(node, Boolean.TRUE); } @@ -730,9 +730,9 @@ protected void dragStandardSelection(final PInputEvent e) { e.getTopCamera().localToView(d); final PDimension gDist = new PDimension(); - final Iterator selectionEn = getSelection().iterator(); + final Iterator selectionEn = getSelection().iterator(); while (selectionEn.hasNext()) { - final PNode node = (PNode) selectionEn.next(); + final PNode node = selectionEn.next(); gDist.setSize(d); node.getParent().globalToLocal(gDist); @@ -787,9 +787,9 @@ protected void dragActivityStep(final PInputEvent aEvent) { */ public void keyPressed(final PInputEvent e) { if (e.getKeyCode() == KeyEvent.VK_DELETE && deleteKeyActive && !selection.isEmpty()) { - final Iterator selectionEn = selection.keySet().iterator(); + final Iterator selectionEn = selection.keySet().iterator(); while (selectionEn.hasNext()) { - final PNode node = (PNode) selectionEn.next(); + final PNode node = selectionEn.next(); node.removeFromParent(); } selection.clear(); @@ -874,8 +874,8 @@ public boolean acceptChildrenOf(final PNode node) { */ public boolean isCameraLayer(final PNode node) { if (node instanceof PLayer) { - for (final Iterator i = selectableParents.iterator(); i.hasNext();) { - final PNode parent = (PNode) i.next(); + for (final Iterator i = selectableParents.iterator(); i.hasNext();) { + final PNode parent = i.next(); if (parent instanceof PCamera && ((PCamera) parent).indexOfLayer((PLayer) node) != -1) { return true; } diff --git a/extras/src/main/java/org/piccolo2d/extras/event/PStyledTextEventHandler.java b/extras/src/main/java/org/piccolo2d/extras/event/PStyledTextEventHandler.java index f99895c9..53c254fc 100644 --- a/extras/src/main/java/org/piccolo2d/extras/event/PStyledTextEventHandler.java +++ b/extras/src/main/java/org/piccolo2d/extras/event/PStyledTextEventHandler.java @@ -89,7 +89,7 @@ public class PStyledTextEventHandler extends PBasicInputEventHandler { */ public PStyledTextEventHandler(final PCanvas canvas) { final PInputEventFilter filter = new PInputEventFilter(); - filter.setOrMask(InputEvent.BUTTON1_MASK | InputEvent.BUTTON3_MASK); + filter.setOrMask(InputEvent.BUTTON1_DOWN_MASK | InputEvent.BUTTON3_DOWN_MASK); setEventFilter(filter); this.canvas = canvas; initEditor(createDefaultEditor()); @@ -173,7 +173,7 @@ public PStyledText createText() { final Font eFont = editor.getFont(); final SimpleAttributeSet sas = new SimpleAttributeSet(); sas.addAttribute(StyleConstants.FontFamily, eFont.getFamily()); - sas.addAttribute(StyleConstants.FontSize, new Integer(eFont.getSize())); + sas.addAttribute(StyleConstants.FontSize, Integer.valueOf(eFont.getSize())); ((StyledDocument) doc).setParagraphAttributes(0, doc.getLength(), sas, false); } @@ -290,8 +290,8 @@ public void run() { SwingUtilities.invokeLater(new Runnable() { public void run() { final MouseEvent me = new MouseEvent(editor, MouseEvent.MOUSE_PRESSED, event.getWhen(), event - .getModifiers() - | InputEvent.BUTTON1_MASK, (int) (event.getCanvasPosition().getX() - editor.getX()), + .getModifiersEx() + | InputEvent.BUTTON1_DOWN_MASK, (int) (event.getCanvasPosition().getX() - editor.getX()), (int) (event.getCanvasPosition().getY() - editor.getY()), 1, false); editor.dispatchEvent(me); } diff --git a/extras/src/main/java/org/piccolo2d/extras/event/PZoomToEventHandler.java b/extras/src/main/java/org/piccolo2d/extras/event/PZoomToEventHandler.java index 150209a3..e9e6acb5 100644 --- a/extras/src/main/java/org/piccolo2d/extras/event/PZoomToEventHandler.java +++ b/extras/src/main/java/org/piccolo2d/extras/event/PZoomToEventHandler.java @@ -52,7 +52,7 @@ public class PZoomToEventHandler extends PBasicInputEventHandler { * Constructs a PZoomToEventHandler that only recognizes BUTTON1 events. */ public PZoomToEventHandler() { - setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); } /** diff --git a/extras/src/main/java/org/piccolo2d/extras/handles/PBoundsHandle.java b/extras/src/main/java/org/piccolo2d/extras/handles/PBoundsHandle.java index 6a4931c0..c22f7d09 100644 --- a/extras/src/main/java/org/piccolo2d/extras/handles/PBoundsHandle.java +++ b/extras/src/main/java/org/piccolo2d/extras/handles/PBoundsHandle.java @@ -104,11 +104,11 @@ public static void addStickyBoundsHandlesTo(final PNode node, final PCamera came * @param node node having its handles removed from */ public static void removeBoundsHandlesFrom(final PNode node) { - final ArrayList handles = new ArrayList(); + final ArrayList handles = new ArrayList(); - final Iterator i = node.getChildrenIterator(); + final Iterator i = node.getChildrenIterator(); while (i.hasNext()) { - final PNode each = (PNode) i.next(); + final PNode each = i.next(); if (each instanceof PBoundsHandle) { handles.add(each); } @@ -259,7 +259,7 @@ public void endHandleDrag(final Point2D aLocalPoint, final PInputEvent aEvent) { * @param flipY whether to allow flipping along the y direction */ public void flipSiblingBoundsHandles(final boolean flipX, final boolean flipY) { - final Iterator i = getParent().getChildrenIterator(); + final Iterator i = getParent().getChildrenIterator(); while (i.hasNext()) { final Object each = i.next(); if (each instanceof PBoundsHandle) { diff --git a/extras/src/main/java/org/piccolo2d/extras/handles/PHandle.java b/extras/src/main/java/org/piccolo2d/extras/handles/PHandle.java index 6669d961..5170429d 100644 --- a/extras/src/main/java/org/piccolo2d/extras/handles/PHandle.java +++ b/extras/src/main/java/org/piccolo2d/extras/handles/PHandle.java @@ -118,7 +118,7 @@ public void propertyChange(final PropertyChangeEvent evt) { } }); - handleDragger.setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_MASK)); + handleDragger.setEventFilter(new PInputEventFilter(InputEvent.BUTTON1_DOWN_MASK)); handleDragger.getEventFilter().setMarksAcceptedEventsAsHandled(true); handleDragger.getEventFilter().setAcceptsMouseEntered(false); handleDragger.getEventFilter().setAcceptsMouseExited(false); diff --git a/extras/src/main/java/org/piccolo2d/extras/nodes/PLine.java b/extras/src/main/java/org/piccolo2d/extras/nodes/PLine.java index 05c83cc4..87dd36de 100644 --- a/extras/src/main/java/org/piccolo2d/extras/nodes/PLine.java +++ b/extras/src/main/java/org/piccolo2d/extras/nodes/PLine.java @@ -41,7 +41,6 @@ import org.piccolo2d.PNode; import org.piccolo2d.extras.util.LineShape; -import org.piccolo2d.nodes.PPath; import org.piccolo2d.util.PAffineTransform; import org.piccolo2d.util.PPaintContext; import org.piccolo2d.util.PUtil; diff --git a/extras/src/main/java/org/piccolo2d/extras/nodes/PStyledText.java b/extras/src/main/java/org/piccolo2d/extras/nodes/PStyledText.java index eb8520cb..36018229 100644 --- a/extras/src/main/java/org/piccolo2d/extras/nodes/PStyledText.java +++ b/extras/src/main/java/org/piccolo2d/extras/nodes/PStyledText.java @@ -78,7 +78,7 @@ public class PStyledText extends PNode { protected Document document; /** String contents of the document. */ - protected transient ArrayList stringContents; + protected transient ArrayList stringContents; /** Tracks the information about line metrics within the document. */ protected transient LineInfo[] lines; @@ -174,7 +174,7 @@ public void setDocument(final Document document) { */ public void syncWithDocument() { // First get the actual text and stick it in an Attributed String - stringContents = new ArrayList(); + stringContents = new ArrayList(); String documentString; try { @@ -188,7 +188,7 @@ public void syncWithDocument() { } // The paragraph start and end indices - final ArrayList pEnds = extractParagraphRanges(documentString); + final ArrayList pEnds = extractParagraphRanges(documentString); // The default style context - which will be reused final StyleContext styleContext = StyleContext.getDefaultStyleContext(); @@ -198,11 +198,11 @@ public void syncWithDocument() { AttributedString attributedString; - final Iterator contentIterator = stringContents.iterator(); - final Iterator paragraphIterator = pEnds.iterator(); + final Iterator contentIterator = stringContents.iterator(); + final Iterator paragraphIterator = pEnds.iterator(); while (contentIterator.hasNext() && paragraphIterator.hasNext()) { - paragraphRange = (RunInfo) paragraphIterator.next(); - attributedString = (AttributedString) contentIterator.next(); + paragraphRange = paragraphIterator.next(); + attributedString = contentIterator.next(); pos = paragraphRange.startIndex; // The current element will be used as a temp variable while @@ -356,9 +356,9 @@ private Font extractFontFromDefaultStyledDocument(final DefaultStyledDocument st return font; } - private ArrayList extractParagraphRanges(final String documentString) { + private ArrayList extractParagraphRanges(final String documentString) { // The paragraph start and end indices - final ArrayList paragraphRanges = new ArrayList(); + final ArrayList paragraphRanges = new ArrayList(); // The current position in the specified range int pos = 0; @@ -427,19 +427,19 @@ public void recomputeLayout() { return; } - final ArrayList linesList = new ArrayList(); + final ArrayList linesList = new ArrayList(); double textWidth = 0; double textHeight = 0; - final Iterator contentIterator = stringContents.iterator(); + final Iterator contentIterator = stringContents.iterator(); while (contentIterator.hasNext()) { final AttributedString ats = (AttributedString) contentIterator.next(); final AttributedCharacterIterator itr = ats.getIterator(); LineBreakMeasurer measurer; - ArrayList breakList = null; + ArrayList breakList = null; measurer = new LineBreakMeasurer(itr, SWING_FRC); breakList = extractLineBreaks(itr, measurer); @@ -468,7 +468,7 @@ public void recomputeLayout() { linesList.add(lineInfo); } - final int lineEnd = ((Integer) breakList.get(0)).intValue(); + final int lineEnd = breakList.get(0).intValue(); if (lineEnd <= itr.getRunLimit()) { breakList.remove(0); newLine = true; @@ -522,8 +522,7 @@ private double calculateLineHeightFromLineInfo(final LineInfo lineInfo) { final double lineHeight; if (lineInfo == null) { lineHeight = 0; - } - else { + } else { lineHeight = lineInfo.maxAscent + lineInfo.maxDescent + lineInfo.leading; } return lineHeight; @@ -550,18 +549,17 @@ private void constrainDimensionsIfNeeded(final double textWidth, final double te // Because swing doesn't use fractional font metrics by default, we use // LineBreakMeasurer to find out where Swing is going to break them - private ArrayList extractLineBreaks(final AttributedCharacterIterator itr, final LineBreakMeasurer measurer) { - ArrayList breakList; - breakList = new ArrayList(); + private ArrayList extractLineBreaks(final AttributedCharacterIterator itr, final LineBreakMeasurer measurer) { + ArrayList breakList = new ArrayList(); + while (measurer.getPosition() < itr.getEndIndex()) { if (constrainWidthToTextWidth) { measurer.nextLayout(Float.MAX_VALUE); - } - else { + } else { measurer.nextLayout((float) Math.ceil(getWidth() - insets.left - insets.right)); } - breakList.add(new Integer(measurer.getPosition())); + breakList.add(Integer.valueOf(measurer.getPosition())); } return breakList; } @@ -765,7 +763,7 @@ public int getEndIndex() { */ protected static class LineInfo { /** Segments which make up this line's formatting segments. */ - public List segments; + public List segments; /** Maximum of the line segments' ascents. */ public double maxAscent; @@ -780,7 +778,7 @@ protected static class LineInfo { * Creates a LineInfo that contains no segments. */ public LineInfo() { - segments = new ArrayList(); + segments = new ArrayList(); } } diff --git a/extras/src/main/java/org/piccolo2d/extras/pswing/PComboBox.java b/extras/src/main/java/org/piccolo2d/extras/pswing/PComboBox.java index 701bc177..66d56b29 100644 --- a/extras/src/main/java/org/piccolo2d/extras/pswing/PComboBox.java +++ b/extras/src/main/java/org/piccolo2d/extras/pswing/PComboBox.java @@ -72,10 +72,8 @@ */ public class PComboBox extends JComboBox implements Serializable { - /** - * - */ private static final long serialVersionUID = 1L; + private PSwing pSwing; private PSwingCanvas canvas; @@ -84,7 +82,7 @@ public class PComboBox extends JComboBox implements Serializable { * * @param model The ComboBoxModel from which the list will be created */ - public PComboBox(final ComboBoxModel model) { + public PComboBox(final ComboBoxModel model) { super(model); init(); } @@ -104,7 +102,7 @@ public PComboBox(final Object[] items) { * * @param items The items to populate the PComboBox list */ - public PComboBox(final Vector items) { + public PComboBox(final Vector items) { super(items); init(); } diff --git a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwing.java b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwing.java index d69d09f1..df12be60 100644 --- a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwing.java +++ b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwing.java @@ -249,7 +249,7 @@ public class PSwing extends PNode implements Serializable, PropertyChangeListene * Used to keep track of which nodes we've attached listeners to since no * built in support in PNode. */ - private final ArrayList listeningTo = new ArrayList(); + private final ArrayList listeningTo = new ArrayList(); /** The parent listener for camera/canvas changes. */ private final PropertyChangeListener parentListener = new PropertyChangeListener() { diff --git a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingEventHandler.java b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingEventHandler.java index 307c6f10..d3a8a353 100644 --- a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingEventHandler.java +++ b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingEventHandler.java @@ -261,7 +261,7 @@ else if (SwingUtilities.isRightMouseButton(mEvent)) { } else if (isPressOrClickOrMove(pSwingMouseEvent) && comp != null) { final MouseEvent tempEvent = new MouseEvent(comp, pSwingMouseEvent.getID(), mEvent.getWhen(), mEvent - .getModifiers(), point.x - offset.x, point.y - offset.y, mEvent.getClickCount(), mEvent + .getModifiersEx(), point.x - offset.x, point.y - offset.y, mEvent.getClickCount(), mEvent .isPopupTrigger()); final PSwingEvent e2 = PSwingMouseEvent.createMouseEvent(tempEvent.getID(), tempEvent, aEvent); @@ -271,7 +271,7 @@ else if (isWheelEvent(pSwingMouseEvent) && comp != null) { final MouseWheelEvent mWEvent = (MouseWheelEvent) mEvent; final MouseWheelEvent tempEvent = new MouseWheelEvent(comp, pSwingMouseEvent.getID(), mEvent.getWhen(), - mEvent.getModifiers(), point.x - offset.x, point.y - offset.y, mEvent.getClickCount(), mEvent + mEvent.getModifiersEx(), point.x - offset.x, point.y - offset.y, mEvent.getClickCount(), mEvent .isPopupTrigger(), mWEvent.getScrollType(), mWEvent.getScrollAmount(), mWEvent .getWheelRotation()); @@ -381,7 +381,7 @@ private void handleButton(final PSwingEvent e1, final PInputEvent aEvent, final final Point2D pt = new Point2D.Double(m1.getX(), m1.getY()); cameraToLocal(e1.getPath().getTopCamera(), pt, buttonData.getPNode()); final MouseEvent tempEvent = new MouseEvent(buttonData.getFocusedComponent(), m1.getID(), m1.getWhen(), m1 - .getModifiers(), (int) pt.getX() - buttonData.getOffsetX(), (int) pt.getY() + .getModifiersEx(), (int) pt.getX() - buttonData.getOffsetX(), (int) pt.getY() - buttonData.getOffsetY(), m1.getClickCount(), m1.isPopupTrigger()); final PSwingEvent e2 = PSwingMouseEvent.createMouseEvent(tempEvent.getID(), tempEvent, aEvent); diff --git a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseEvent.java b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseEvent.java index 50b2fa85..3c43ddb8 100644 --- a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseEvent.java +++ b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseEvent.java @@ -89,7 +89,7 @@ public class PSwingMouseEvent extends MouseEvent implements Serializable, PSwing * @param piccoloEvent used to query about the event's Piccolo context */ protected PSwingMouseEvent(final int id, final MouseEvent swingEvent, final PInputEvent piccoloEvent) { - super((Component) swingEvent.getSource(), swingEvent.getID(), swingEvent.getWhen(), swingEvent.getModifiers(), + super((Component) swingEvent.getSource(), swingEvent.getID(), swingEvent.getWhen(), swingEvent.getModifiersEx(), swingEvent.getX(), swingEvent.getY(), swingEvent.getClickCount(), swingEvent.isPopupTrigger()); this.id = id; this.event = piccoloEvent; diff --git a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseWheelEvent.java b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseWheelEvent.java index 2f15f820..97365cf1 100644 --- a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseWheelEvent.java +++ b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingMouseWheelEvent.java @@ -86,7 +86,7 @@ public class PSwingMouseWheelEvent extends MouseWheelEvent implements PSwingEven * event's piccolo2d context */ protected PSwingMouseWheelEvent(final int id, final MouseWheelEvent swingEvent, final PInputEvent piccoloEvent) { - super((Component) swingEvent.getSource(), swingEvent.getID(), swingEvent.getWhen(), swingEvent.getModifiers(), + super((Component) swingEvent.getSource(), swingEvent.getID(), swingEvent.getWhen(), swingEvent.getModifiersEx(), swingEvent.getX(), swingEvent.getY(), swingEvent.getClickCount(), swingEvent.isPopupTrigger(), swingEvent.getScrollType(), swingEvent.getScrollAmount(), swingEvent.getWheelRotation()); this.id = id; diff --git a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingRepaintManager.java b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingRepaintManager.java index cea6c688..bd28353c 100644 --- a/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingRepaintManager.java +++ b/extras/src/main/java/org/piccolo2d/extras/pswing/PSwingRepaintManager.java @@ -75,7 +75,7 @@ public class PSwingRepaintManager extends RepaintManager { // The components that are currently painting // This needs to be a vector for thread safety - private final Vector paintingComponents = new Vector(); + private final Vector paintingComponents = new Vector(); /** * Locks repaint for a particular (Swing) component displayed by PCanvas. diff --git a/extras/src/main/java/org/piccolo2d/extras/swing/PDefaultScrollDirector.java b/extras/src/main/java/org/piccolo2d/extras/swing/PDefaultScrollDirector.java index ab6cc287..44713cdc 100644 --- a/extras/src/main/java/org/piccolo2d/extras/swing/PDefaultScrollDirector.java +++ b/extras/src/main/java/org/piccolo2d/extras/swing/PDefaultScrollDirector.java @@ -139,8 +139,8 @@ public Point getViewPosition(final Rectangle2D viewBounds) { if (camera != null) { // First we compute the union of all the layers final PBounds layerBounds = new PBounds(); - final List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { + final List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { final PLayer layer = (PLayer) i.next(); layerBounds.add(layer.getFullBoundsReference()); } @@ -169,9 +169,9 @@ public Dimension getViewSize(final Rectangle2D viewBounds) { if (camera != null) { // First we compute the union of all the layers final PBounds bounds = new PBounds(); - final List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); bounds.add(layer.getFullBoundsReference()); } @@ -205,9 +205,9 @@ public void setViewPosition(final double x, final double y) { // Get the union of all the layers' bounds final PBounds layerBounds = new PBounds(); - final List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); layerBounds.add(layer.getFullBoundsReference()); } @@ -277,9 +277,9 @@ public boolean shouldRevalidateScrollPane() { // Get the union of all the layers' bounds final PBounds layerBounds = new PBounds(); - final List layers = camera.getLayersReference(); - for (final Iterator i = layers.iterator(); i.hasNext();) { - final PLayer layer = (PLayer) i.next(); + final List layers = camera.getLayersReference(); + for (final Iterator i = layers.iterator(); i.hasNext();) { + final PLayer layer = i.next(); layerBounds.add(layer.getFullBoundsReference()); } diff --git a/extras/src/main/java/org/piccolo2d/extras/swing/SwingLayoutNode.java b/extras/src/main/java/org/piccolo2d/extras/swing/SwingLayoutNode.java index 3c81cf1a..5b64693a 100644 --- a/extras/src/main/java/org/piccolo2d/extras/swing/SwingLayoutNode.java +++ b/extras/src/main/java/org/piccolo2d/extras/swing/SwingLayoutNode.java @@ -254,16 +254,16 @@ public void addChild(final PNode child, final Anchor anchor) { * the child * @param anchor specifies the location from which layout takes place */ - public void addChildren(final Collection nodes, final Object constraints, final Anchor anchor) { - final Iterator i = nodes.iterator(); + public void addChildren(final Collection nodes, final Object constraints, final Anchor anchor) { + final Iterator i = nodes.iterator(); while (i.hasNext()) { - final PNode each = (PNode) i.next(); + final PNode each = i.next(); addChild(each, constraints, anchor); } } /** {@inheritDoc} */ - public void addChildren(final Collection nodes) { + public void addChildren(final Collection nodes) { addChildren(nodes, null, defaultAnchor); } @@ -274,7 +274,7 @@ public void addChildren(final Collection nodes) { * @param constraints constraints the layout manager uses when laying out * the child */ - public void addChildren(final Collection nodes, final Object constraints) { + public void addChildren(final Collection nodes, final Object constraints) { addChildren(nodes, constraints, defaultAnchor); } @@ -284,7 +284,7 @@ public void addChildren(final Collection nodes, final Object constraints) { * @param nodes nodes to add to the end of the list * @param anchor specifies the location from which layout takes place */ - public void addChildren(final Collection nodes, final Anchor anchor) { + public void addChildren(final Collection nodes, final Anchor anchor) { addChildren(nodes, null, anchor); } @@ -318,9 +318,9 @@ public PNode removeChild(final int index) { * less efficient) manner. */ public void removeAllChildren() { - final Iterator i = getChildrenIterator(); + final Iterator i = getChildrenIterator(); while (i.hasNext()) { - removeChild((PNode) i.next()); + removeChild(i.next()); } } diff --git a/extras/src/test/java/org/piccolo2d/extras/PAppletTest.java b/extras/src/test/java/org/piccolo2d/extras/PAppletTest.java index 7fee89d5..c5bb382f 100644 --- a/extras/src/test/java/org/piccolo2d/extras/PAppletTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/PAppletTest.java @@ -29,7 +29,6 @@ package org.piccolo2d.extras; import org.piccolo2d.PCanvas; -import org.piccolo2d.extras.PApplet; import junit.framework.TestCase; diff --git a/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java b/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java index 8503b124..eff4d7f7 100644 --- a/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java @@ -28,10 +28,7 @@ */ package org.piccolo2d.extras; -import java.awt.event.KeyListener; - import org.piccolo2d.PCanvas; -import org.piccolo2d.extras.PFrame; import junit.framework.TestCase; @@ -40,11 +37,13 @@ * Unit test for PFrame. */ public class PFrameTest extends TestCase { - private PFrame frame; - + public void testCanvasIsValidWithDefaultConstructor() { PFrame frame = new PFrame() { - public void setVisible(boolean visible) { + + private static final long serialVersionUID = 1L; + + public void setVisible(boolean visible) { // why oh why is PFrame visible by default } }; @@ -53,11 +52,16 @@ public void setVisible(boolean visible) { assertNotNull(canvas.getLayer()); assertNotNull(canvas.getCamera()); assertSame(canvas.getLayer(), canvas.getCamera().getLayer(0)); + + assertFalse(frame.isVisible()); } public void testDefaultsToWindowed() { PFrame frame = new PFrame() { - public void setVisible(boolean visible) { + + private static final long serialVersionUID = 1L; + + public void setVisible(boolean visible) { // why oh why is PFrame visible by default } }; diff --git a/extras/src/test/java/org/piccolo2d/extras/event/PNotificationCenterTest.java b/extras/src/test/java/org/piccolo2d/extras/event/PNotificationCenterTest.java index 17ec467b..ecd7dc35 100644 --- a/extras/src/test/java/org/piccolo2d/extras/event/PNotificationCenterTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/event/PNotificationCenterTest.java @@ -28,9 +28,6 @@ */ package org.piccolo2d.extras.event; -import org.piccolo2d.extras.event.PNotification; -import org.piccolo2d.extras.event.PNotificationCenter; - import junit.framework.TestCase; public class PNotificationCenterTest extends TestCase { diff --git a/extras/src/test/java/org/piccolo2d/extras/event/PSelectionEventHandlerTest.java b/extras/src/test/java/org/piccolo2d/extras/event/PSelectionEventHandlerTest.java index 1309cf19..71f5abf3 100755 --- a/extras/src/test/java/org/piccolo2d/extras/event/PSelectionEventHandlerTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/event/PSelectionEventHandlerTest.java @@ -34,11 +34,6 @@ import org.piccolo2d.PLayer; import org.piccolo2d.PNode; import org.piccolo2d.event.PInputEvent; -import org.piccolo2d.extras.event.PNotification; -import org.piccolo2d.extras.event.PNotificationCenter; -import org.piccolo2d.extras.event.PSelectionEventHandler; - - import junit.framework.TestCase; @@ -94,7 +89,7 @@ public void testKeyboardDeleteFiresSelectionChange() PNotificationCenter notificationCenter = PNotificationCenter.defaultCenter(); notificationCenter.addListener(this, "selectionChanged", PSelectionEventHandler.SELECTION_CHANGED_NOTIFICATION, null); - KeyEvent keyEvent = new KeyEvent(canvas, -1, System.currentTimeMillis(), 0, KeyEvent.VK_DELETE); + KeyEvent keyEvent = new KeyEvent(canvas, -1, System.currentTimeMillis(), 0, KeyEvent.VK_DELETE, KeyEvent.CHAR_UNDEFINED); PInputEvent event = new PInputEvent(null, keyEvent); selectionHandler.keyPressed(event); assertTrue(selectionHandler.getSelectionReference().isEmpty()); @@ -116,7 +111,7 @@ public void testKeyboardDeleteInactive() PNotificationCenter notificationCenter = PNotificationCenter.defaultCenter(); notificationCenter.addListener(this, "selectionChanged", PSelectionEventHandler.SELECTION_CHANGED_NOTIFICATION, null); - KeyEvent keyEvent = new KeyEvent(canvas, -1, System.currentTimeMillis(), 0, KeyEvent.VK_DELETE); + KeyEvent keyEvent = new KeyEvent(canvas, -1, System.currentTimeMillis(), 0, KeyEvent.VK_DELETE, KeyEvent.CHAR_UNDEFINED); PInputEvent event = new PInputEvent(null, keyEvent); selectionHandler.keyPressed(event); assertTrue(selectionHandler.getSelectionReference().contains(node)); @@ -135,7 +130,7 @@ public void testKeyboardDeleteEmptySelection() PNotificationCenter notificationCenter = PNotificationCenter.defaultCenter(); notificationCenter.addListener(this, "selectionChanged", PSelectionEventHandler.SELECTION_CHANGED_NOTIFICATION, null); - KeyEvent keyEvent = new KeyEvent(canvas, -1, System.currentTimeMillis(), 0, KeyEvent.VK_DELETE); + KeyEvent keyEvent = new KeyEvent(canvas, -1, System.currentTimeMillis(), 0, KeyEvent.VK_DELETE, KeyEvent.CHAR_UNDEFINED); PInputEvent event = new PInputEvent(null, keyEvent); selectionHandler.keyPressed(event); assertTrue(selectionHandler.getSelectionReference().isEmpty()); diff --git a/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java b/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java index 1b4e4c6d..08b8955f 100644 --- a/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java @@ -29,7 +29,6 @@ package org.piccolo2d.extras.handles; import org.piccolo2d.PNode; -import org.piccolo2d.extras.handles.PHandle; import org.piccolo2d.extras.util.PLocator; import junit.framework.TestCase; @@ -69,7 +68,10 @@ public void testChangingLocatorWorks() { public void testChangingParentCausesRelocateHandle() { final int[] relocateCounts = new int[1]; PHandle handle = new PHandle(new OriginLocator()) { - public void relocateHandle() { + + private static final long serialVersionUID = 1L; + + public void relocateHandle() { super.relocateHandle(); relocateCounts[0]++; } @@ -83,7 +85,10 @@ public void relocateHandle() { public void testResizingParentCausesRelocateHandle() { final int[] relocateCounts = new int[1]; PHandle handle = new PHandle(new OriginLocator()) { - public void relocateHandle() { + + private static final long serialVersionUID = 1L; + + public void relocateHandle() { super.relocateHandle(); relocateCounts[0]++; } @@ -101,7 +106,10 @@ public void testLocatorCanBeNullWithoutAProblem() { } private final class OriginLocator extends PLocator { - public double locateX() { + + private static final long serialVersionUID = 1L; + + public double locateX() { return 0; } diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/P3DRectTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/P3DRectTest.java index b3b0ff2a..808a1921 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/P3DRectTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/P3DRectTest.java @@ -32,7 +32,6 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; -import org.piccolo2d.extras.nodes.P3DRect; import org.piccolo2d.util.PPaintContext; import junit.framework.TestCase; diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PCacheCameraTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PCacheCameraTest.java index 52d3a79a..db4d754b 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PCacheCameraTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PCacheCameraTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.extras.nodes; -import org.piccolo2d.extras.nodes.PCacheCamera; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PClipTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PClipTest.java index 98788783..99412330 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PClipTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PClipTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.extras.nodes; -import org.piccolo2d.extras.nodes.PClip; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PCompositeTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PCompositeTest.java index 8a802d9b..8a5a415f 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PCompositeTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PCompositeTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.extras.nodes; -import org.piccolo2d.extras.nodes.PComposite; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PLensTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PLensTest.java index 72d897f8..1acf9d45 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PLensTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PLensTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.extras.nodes; -import org.piccolo2d.extras.nodes.PLens; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PLineTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PLineTest.java index 6f953759..350fbd38 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PLineTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PLineTest.java @@ -30,8 +30,6 @@ import java.awt.Color; -import org.piccolo2d.extras.nodes.PLine; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PNodeCacheTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PNodeCacheTest.java index b1067def..189835c5 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PNodeCacheTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PNodeCacheTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.extras.nodes; -import org.piccolo2d.extras.nodes.PNodeCache; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PShadowTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PShadowTest.java index 5bd58520..ffbbd9ef 100755 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PShadowTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PShadowTest.java @@ -31,11 +31,8 @@ import java.awt.Color; import java.awt.Graphics2D; import java.awt.Paint; - import java.awt.image.BufferedImage; -import org.piccolo2d.extras.nodes.PShadow; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/nodes/PStyledTextTest.java b/extras/src/test/java/org/piccolo2d/extras/nodes/PStyledTextTest.java index 99fd00fe..3514e5c4 100644 --- a/extras/src/test/java/org/piccolo2d/extras/nodes/PStyledTextTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/nodes/PStyledTextTest.java @@ -28,8 +28,6 @@ */ package org.piccolo2d.extras.nodes; -import org.piccolo2d.extras.nodes.PStyledText; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PComboBoxTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PComboBoxTest.java index 2edc6f02..dadce284 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PComboBoxTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PComboBoxTest.java @@ -32,10 +32,6 @@ import javax.swing.DefaultComboBoxModel; -import org.piccolo2d.extras.pswing.PComboBox; -import org.piccolo2d.extras.pswing.PSwing; -import org.piccolo2d.extras.pswing.PSwingCanvas; - import junit.framework.TestCase; /** @@ -48,7 +44,7 @@ public void testPComboInstallsItsOwnUI() { } public void testConstructsWithVector() { - final Vector items = new Vector(); + final Vector items = new Vector(); items.add("A"); items.add("B"); final PComboBox combo = new PComboBox(items); @@ -62,7 +58,7 @@ public void testConstructsWithArray() { } public void testConstructsWithComboBoxModel() { - final DefaultComboBoxModel model = new DefaultComboBoxModel(); + final DefaultComboBoxModel model = new DefaultComboBoxModel(); model.addElement("A"); model.addElement("B"); final PComboBox combo = new PComboBox(model); diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingCanvasTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingCanvasTest.java index 3040dc99..74ed2dba 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingCanvasTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingCanvasTest.java @@ -30,9 +30,6 @@ import javax.swing.JLabel; -import org.piccolo2d.extras.pswing.PSwing; -import org.piccolo2d.extras.pswing.PSwingCanvas; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingDynamicComponentExample.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingDynamicComponentExample.java index 6ef741c0..546b1b32 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingDynamicComponentExample.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingDynamicComponentExample.java @@ -56,7 +56,9 @@ */ public class PSwingDynamicComponentExample extends JFrame { - private static final Dimension FRAME_SIZE = new Dimension( 800, 400 ); + private static final long serialVersionUID = 1L; + + private static final Dimension FRAME_SIZE = new Dimension( 800, 400 ); private static final int TEXT_FIELD_COLUMNS = 30; private final ComponentPanel swingPanel, piccoloPanel; @@ -175,7 +177,9 @@ private void updatePanels() { // A panel with a few different types of JComponent. private static class ComponentPanel extends JPanel { - // allow public access to keep our example code short + private static final long serialVersionUID = 1L; + + // allow public access to keep our example code short public final JLabel label; public final JCheckBox checkBox; public final JRadioButton radioButton; diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java index d096deab..92d299b4 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java @@ -1,14 +1,11 @@ package org.piccolo2d.extras.pswing; -import org.piccolo2d.extras.pswing.PSwingCanvas; -import org.piccolo2d.extras.pswing.PSwingEventHandler; - import junit.framework.TestCase; public class PSwingEventHandlerTest extends TestCase { public void testConstructorAcceptsNullTargetNode() { - PSwingCanvas canvas = new PSwingCanvas(); - PSwingEventHandler handler = new PSwingEventHandler(canvas, null); + //PSwingCanvas canvas = new PSwingCanvas(); + //PSwingEventHandler handler = new PSwingEventHandler(canvas, null); } } diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingMouseEventTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingMouseEventTest.java index cb82afa1..6a9da769 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingMouseEventTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingMouseEventTest.java @@ -7,10 +7,6 @@ import javax.swing.JPanel; import org.piccolo2d.event.PInputEvent; -import org.piccolo2d.extras.pswing.PSwingEvent; -import org.piccolo2d.extras.pswing.PSwingMouseEvent; -import org.piccolo2d.extras.pswing.PSwingMouseMotionEvent; -import org.piccolo2d.extras.pswing.PSwingMouseWheelEvent; import junit.framework.TestCase; diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingRepaintManagerTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingRepaintManagerTest.java index 4c526b2b..6174cdd6 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingRepaintManagerTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingRepaintManagerTest.java @@ -35,9 +35,6 @@ import javax.swing.JPanel; import javax.swing.RepaintManager; -import org.piccolo2d.extras.pswing.PSwingCanvas; -import org.piccolo2d.extras.pswing.PSwingRepaintManager; - import junit.framework.TestCase; /** diff --git a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java index 47d62faa..06cc97be 100644 --- a/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java @@ -74,7 +74,10 @@ public void testPSwingResizesItselfWhenComponentIsResized() { final JPanel panel = new JPanel(); new PSwing(panel) { - public void updateBounds() { + + private static final long serialVersionUID = 1L; + + public void updateBounds() { super.updateBounds(); reshaped[0] = true; @@ -294,7 +297,10 @@ public void testPSwingRegistersWithCanvasThroughoutItsLifeCycle() { } public class MockPaintingPSwing extends PSwing { - private boolean paintedGreek; + + private static final long serialVersionUID = 1L; + + private boolean paintedGreek; private boolean paintedComponent; public MockPaintingPSwing(JComponent component) { diff --git a/extras/src/test/java/org/piccolo2d/extras/util/ShadowUtilsTest.java b/extras/src/test/java/org/piccolo2d/extras/util/ShadowUtilsTest.java index 93d7ac90..8f91afe5 100755 --- a/extras/src/test/java/org/piccolo2d/extras/util/ShadowUtilsTest.java +++ b/extras/src/test/java/org/piccolo2d/extras/util/ShadowUtilsTest.java @@ -33,10 +33,6 @@ import java.awt.Paint; import java.awt.image.BufferedImage; -import org.piccolo2d.extras.nodes.PShadow; -import org.piccolo2d.extras.util.ShadowUtils; - - import junit.framework.TestCase; /**