Revision: 957
Author: allain.lalonde
Date: Tue Jan 26 07:51:15 2010
Log: Fixing some findbugs warnings
http://code.google.com/p/piccolo2d/source/detail?r=957
Modified:
/piccolo2d.java/branches/2.0-spike/core/src/test/java/org/piccolo2d/MockPCamera.java
/piccolo2d.java/branches/2.0-spike/core/src/test/java/org/piccolo2d/PCameraTest.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/GroupExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/PrintExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeApplet.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java
/piccolo2d.java/branches/2.0-spike/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java
/piccolo2d.java/branches/2.0-spike/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTBoundsHandle.java
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTCanvas.java
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTKeyEvent.java
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTMouseEvent.java
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTSelectionEventHandler.java
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/SWTGraphics2D.java
/piccolo2d.java/branches/2.0-spike/swt/src/test/java/org/piccolo2d/swt/PSWTImageTest.java
/piccolo2d.java/branches/2.0-spike/swt-examples/src/main/java/org/piccolo2d/swt/examples/SWTBenchTest.java
=======================================
---
/piccolo2d.java/branches/2.0-spike/core/src/test/java/org/piccolo2d/MockPCamera.java
Wed Jan 20 10:01:15 2010
+++
/piccolo2d.java/branches/2.0-spike/core/src/test/java/org/piccolo2d/MockPCamera.java
Tue Jan 26 07:51:15 2010
@@ -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;
@@ -52,22 +49,25 @@
static class Notification {
private final String type;
private final PBounds bounds;
- // this should really be PLayer
- private final PNode layer;
-
- private Notification(final String type, final PBounds bounds,
final PNode layer) {
+ private final PLayer layer;
+
+ private Notification(final String type, final PBounds bounds,
final PLayer layer) {
this.bounds = bounds;
this.layer = layer;
this.type = type;
}
- public PNode getLayer() {
+ public PLayer getLayer() {
return layer;
}
public PBounds getBounds() {
return bounds;
}
+
+ public String getType() {
+ return type;
+ }
}
public int getNotificationCount() {
=======================================
---
/piccolo2d.java/branches/2.0-spike/core/src/test/java/org/piccolo2d/PCameraTest.java
Wed Jan 20 10:01:15 2010
+++
/piccolo2d.java/branches/2.0-spike/core/src/test/java/org/piccolo2d/PCameraTest.java
Tue Jan 26 07:51:15 2010
@@ -77,8 +77,7 @@
camera1.addLayer(layer2);
- final PCamera cameraCopy = (PCamera) camera1.clone();
- //TODO: assertEquals(2, cameraCopy.getLayerCount());
+ camera1.clone();
}
public void testCameraShouldHaveNullComponentUntilAssigned() {
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/DynamicExample.java
Tue Jan 26 07:51:15 2010
@@ -30,7 +30,6 @@
import java.awt.BasicStroke;
import java.awt.Color;
-import java.util.Iterator;
import java.util.Random;
import org.piccolo2d.PCanvas;
@@ -94,9 +93,7 @@
}
public void rotateNodes() {
- final Iterator i =
getCanvas().getLayer().getChildrenReference().iterator();
- while (i.hasNext()) {
- final PNode each = (PNode) i.next();
+ for (PNode each : getCanvas().getLayer().getChildrenReference()) {
each.rotate(Math.toRadians(2));
}
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ExampleRunner.java
Tue Jan 26 07:51:15 2010
@@ -88,6 +88,7 @@
/**
* @param c
*/
+ @SuppressWarnings("serial")
private JPanel buildOptions() {
JPanel optionsPanel = new JPanel(new GridLayout(3, 1));
optionsPanel.setBorder(new TitledBorder("Display Options"));
@@ -113,13 +114,14 @@
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) {
+ @SuppressWarnings("serial")
+ private JButton buildExampleButton(final Class<?> exampleClass) {
final String fullClassName = exampleClass.getName();
final String simpleClassName =
fullClassName.substring(fullClassName.lastIndexOf('.') + 1);
final String exampleLabel = camelToProper(simpleClassName);
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/GraphEditorExample.java
Tue Jan 26 07:51:15 2010
@@ -31,6 +31,7 @@
import java.awt.Color;
import java.awt.geom.Point2D;
import java.util.ArrayList;
+import java.util.List;
import java.util.Random;
import org.piccolo2d.PCanvas;
@@ -63,6 +64,7 @@
super("GraphEditorExample", false, aCanvas);
}
+ @SuppressWarnings("unchecked")
public void initialize() {
final int numNodes = 50;
final int numEdges = 50;
@@ -73,13 +75,13 @@
final PLayer edgeLayer = new PLayer();
getCanvas().getCamera().addLayer(0, edgeLayer);
final Random rnd = new Random();
- 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();
- path.addAttribute("edges", tmp);
+
+ path.addAttribute("edges", new ArrayList<PPath>());
nodeLayer.addChild(path);
}
@@ -98,15 +100,13 @@
edge.moveTo((float) bound1.getX(), (float) bound1.getY());
edge.lineTo((float) bound2.getX(), (float) bound2.getY());
- tmp = (ArrayList) node1.getAttribute("edges");
- tmp.add(edge);
- tmp = (ArrayList) node2.getAttribute("edges");
- tmp.add(edge);
-
- tmp = new ArrayList();
- tmp.add(node1);
- tmp.add(node2);
- edge.addAttribute("nodes", tmp);
+ ((List<PPath>) node1.getAttribute("edges")).add(edge);
+ ((List<PPath>) node2.getAttribute("edges")).add(edge);
+
+ List<PNode> nodes = new ArrayList<PNode>();
+ nodes.add(node1);
+ nodes.add(node2);
+ edge.addAttribute("nodes", nodes);
edgeLayer.addChild(edge);
}
@@ -149,6 +149,7 @@
}
}
+ @SuppressWarnings("unchecked")
public void drag(final PInputEvent e) {
final PNode node = e.getPickedNode();
node.translate(e.getDelta().width, e.getDelta().height);
@@ -158,7 +159,7 @@
int i;
for (i = 0; i < edges.size(); i++) {
final PPath edge = (PPath) edges.get(i);
- final ArrayList nodes = (ArrayList)
edge.getAttribute("nodes");
+ final List<PNode> nodes = (ArrayList<PNode>)
edge.getAttribute("nodes");
final PNode node1 = (PNode) nodes.get(0);
final PNode node2 = (PNode) nodes.get(1);
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/GroupExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/GroupExample.java
Tue Jan 26 07:51:15 2010
@@ -32,6 +32,7 @@
import java.awt.Graphics2D;
import java.awt.Paint;
import java.util.ArrayList;
+import java.util.List;
import org.piccolo2d.PCamera;
import org.piccolo2d.PCanvas;
@@ -109,7 +110,7 @@
// Create a selection handler so we can see that the decorator
actually
// works
- final ArrayList selectableParents = new ArrayList();
+ final List<PNode> selectableParents = new ArrayList<PNode>();
selectableParents.add(dg);
selectableParents.add(vdg);
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/LayoutExample.java
Tue Jan 26 07:51:15 2010
@@ -29,7 +29,6 @@
package org.piccolo2d.examples;
import java.awt.Color;
-import java.util.Iterator;
import org.piccolo2d.PCanvas;
import org.piccolo2d.PNode;
@@ -37,7 +36,6 @@
import org.piccolo2d.extras.handles.PBoundsHandle;
import org.piccolo2d.nodes.PPath;
-
/**
* This example shows how to create a node that will automatically layout
its
* children.
@@ -71,9 +69,7 @@
double xOffset = 0;
final double yOffset = 0;
- final Iterator i = getChildrenIterator();
- while (i.hasNext()) {
- final PNode each = (PNode) i.next();
+ for (PNode each : getChildrenReference()) {
each.setOffset(xOffset - each.getX(), yOffset);
xOffset += each.getWidth();
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java
Thu Jan 14 13:48:07 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/P3DRectExample.java
Tue Jan 26 07:51:15 2010
@@ -6,7 +6,7 @@
import org.piccolo2d.extras.PFrame;
import org.piccolo2d.extras.nodes.P3DRect;
-
+...@suppresswarnings("serial")
public class P3DRectExample extends PFrame {
public P3DRectExample() {
@@ -26,7 +26,7 @@
rect2.setPaint(new Color(239, 235, 222));
rect2.translate(110, 0);
rect2.setRaised(false);
- getCanvas().getLayer().addChild(rect2);
+ getCanvas().getLayer().addChild(rect2);
}
public static void main(String[] args) {
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/PrintExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/PrintExample.java
Tue Jan 26 07:51:15 2010
@@ -41,8 +41,6 @@
import java.awt.print.Printable;
import java.awt.print.PrinterException;
import java.awt.print.PrinterJob;
-import java.util.Iterator;
-import java.util.List;
import javax.swing.ButtonGroup;
import javax.swing.JButton;
@@ -62,7 +60,6 @@
import org.piccolo2d.util.PAffineTransform;
import org.piccolo2d.util.PBounds;
-
/**
* Adding print action to scrolling example.
*
@@ -185,9 +182,7 @@
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();
+ for (PLayer layer : camera.getLayersReference()) {
layerBounds.add(layer.getFullBoundsReference());
}
@@ -233,9 +228,7 @@
// 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();
+ for (final PLayer layer : camera.getLayersReference()) {
layerBounds.add(layer.getFullBoundsReference());
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ScrollingExample.java
Tue Jan 26 07:51:15 2010
@@ -35,7 +35,6 @@
import java.awt.event.ActionListener;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.util.Iterator;
import javax.swing.ButtonGroup;
import javax.swing.JPanel;
@@ -53,7 +52,6 @@
import org.piccolo2d.util.PAffineTransform;
import org.piccolo2d.util.PBounds;
-
/**
* This creates a simple scene and allows switching between traditional
* scrolling where the scrollbars control the view and alternate scrolling
where
@@ -155,9 +153,7 @@
// 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();
+ for (PLayer layer : camera.getLayersReference()) {
layerBounds.add(layer.getFullBoundsReference());
}
@@ -202,9 +198,7 @@
// 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();
+ for (PLayer layer : camera.getLayersReference()) {
layerBounds.add(layer.getFullBoundsReference());
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/ShadowExample.java
Tue Jan 26 07:51:15 2010
@@ -30,8 +30,6 @@
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.Paint;
-
import java.awt.image.BufferedImage;
import org.piccolo2d.PCanvas;
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/StickyHandleLayerExample.java
Tue Jan 26 07:51:15 2010
@@ -29,7 +29,6 @@
package org.piccolo2d.examples;
import java.awt.Color;
-import java.util.Iterator;
import org.piccolo2d.PCanvas;
import org.piccolo2d.PNode;
@@ -41,7 +40,6 @@
import org.piccolo2d.extras.util.PBoundsLocator;
import org.piccolo2d.nodes.PPath;
-
/**
* This example shows another way to create sticky handles. These handles
are
* not added as children to the object that they manipulate. Instead they
are
@@ -81,9 +79,7 @@
final PRoot root = getActivityScheduler().getRoot();
if (root.getPaintInvalid() || root.getChildPaintInvalid())
{
- final Iterator i =
getCanvas().getCamera().getChildrenIterator();
- while (i.hasNext()) {
- final PNode each = (PNode) i.next();
+ for (PNode each :
getCanvas().getCamera().getChildrenReference()) {
if (each instanceof PHandle) {
final PHandle handle = (PHandle) each;
handle.relocateHandle();
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/SwingLayoutExample.java
Tue Jan 26 07:51:15 2010
@@ -63,7 +63,7 @@
import org.piccolo2d.nodes.PPath;
import org.piccolo2d.nodes.PText;
-
+...@suppresswarnings("serial")
public class SwingLayoutExample {
public static class MyPPath extends PPath {
@@ -122,7 +122,7 @@
gridBagLayoutNode.setOffset(400, 250);
rootNode.addChild(gridBagLayoutNode);
- JPanel container = new JPanel();
+ JPanel container = new JPanel();
container.setLayout(new BoxLayout(container, BoxLayout.Y_AXIS));
final SwingLayoutNode boxLayoutNode = new
SwingLayoutNode(container);
boxLayoutNode.addChild(new MyPPath(new Rectangle2D.Double(0, 0,
50, 50), Color.yellow, new BasicStroke(2),
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/CalendarNode.java
Tue Jan 26 07:51:15 2010
@@ -35,6 +35,7 @@
import org.piccolo2d.event.PInputEvent;
+...@suppresswarnings("serial")
class CalendarNode extends PNode {
static int DEFAULT_NUM_DAYS = 7;
static int DEFAULT_NUM_WEEKS = 12;
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/DayNode.java
Tue Jan 26 07:51:15 2010
@@ -31,21 +31,22 @@
import java.awt.Color;
import java.awt.Graphics2D;
import java.util.ArrayList;
+import java.util.List;
import org.piccolo2d.PNode;
import org.piccolo2d.util.PPaintContext;
-
class DayNode extends PNode {
+ private static final long serialVersionUID = 1L;
boolean hasWidthFocus;
boolean hasHeightFocus;
- ArrayList lines;
+ List<String> lines;
int week;
int day;
String dayOfMonthString;
public DayNode(int week, int day) {
- lines = new ArrayList();
+ lines = new ArrayList<String>();
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.");
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheye.java
Tue Jan 26 07:51:15 2010
@@ -36,6 +36,7 @@
public class TabularFisheye extends PCanvas {
+ private static final long serialVersionUID = 1L;
private CalendarNode calendarNode;
public TabularFisheye() {
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeApplet.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeApplet.java
Tue Jan 26 07:51:15 2010
@@ -31,6 +31,7 @@
import javax.swing.JApplet;
public class TabularFisheyeApplet extends JApplet {
+ private static final long serialVersionUID = 1L;
public void init() {
getContentPane().add(new TabularFisheye());
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/fisheye/TabularFisheyeFrame.java
Tue Jan 26 07:51:15 2010
@@ -31,6 +31,8 @@
import javax.swing.JFrame;
public class TabularFisheyeFrame extends JFrame {
+ private static final long serialVersionUID = 1L;
+
public TabularFisheyeFrame() {
setTitle("Piccolo2D Tabular Fisheye");
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/MultiplePSwingCanvasesExample.java
Tue Jan 26 07:51:15 2010
@@ -44,6 +44,7 @@
import org.piccolo2d.extras.pswing.PSwingCanvas;
+...@suppresswarnings("serial")
public class MultiplePSwingCanvasesExample extends JFrame {
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample2.java
Tue Jan 26 07:51:15 2010
@@ -75,7 +75,6 @@
import org.piccolo2d.extras.pswing.PSwing;
import org.piccolo2d.extras.pswing.PSwingCanvas;
-
/**
* User: Sam Reid Date: Jul 11, 2005 Time: 12:15:55 PM
*/
@@ -218,7 +217,7 @@
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<String> data = new Vector<String>();
data.addElement("Choice 1");
data.addElement("Choice 2");
data.addElement("Choice 3");
@@ -298,65 +297,15 @@
canvas.getLayer().addChild(transform);
// JTable Example
- final Vector columns = new Vector();
- columns.addElement("Check Number");
- columns.addElement("Description");
- columns.addElement("Amount");
- 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.addElement("102");
- row.addElement("Monkey Wrench");
- row.addElement("$100.00");
- rows.addElement(row);
- row = new Vector();
- row.addElement("214");
- row.addElement("Ant farm");
- row.addElement("$55.00");
- rows.addElement(row);
- row = new Vector();
- row.addElement("215");
- row.addElement("Self-esteem tapes");
- row.addElement("$37.99");
- rows.addElement(row);
- row = new Vector();
- row.addElement("216");
- row.addElement("Tube Socks");
- row.addElement("$7.45");
- rows.addElement(row);
- row = new Vector();
- row.addElement("220");
- row.addElement("Ab Excerciser");
- row.addElement("$56.95");
- rows.addElement(row);
- row = new Vector();
- row.addElement("319");
- row.addElement("Y2K Supplies");
- row.addElement("$4624.33");
- rows.addElement(row);
- row = new Vector();
- row.addElement("332");
- row.addElement("Tie Rack");
- row.addElement("$15.20");
- rows.addElement(row);
- row = new Vector();
- row.addElement("344");
- row.addElement("Swing Set");
- row.addElement("$146.59");
- rows.addElement(row);
- final JTable table = new JTable(rows, columns);
+ final JTable table = new JTable(buildTableRows(),
buildColumnNames());
+
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
table.setRowHeight(30);
- TableColumn c = table.getColumn(table.getColumnName(0));
- c.setPreferredWidth(150);
- c = table.getColumn(table.getColumnName(1));
- c.setPreferredWidth(150);
- c = table.getColumn(table.getColumnName(2));
- c.setPreferredWidth(150);
+ for (int tableIndex = 0; tableIndex < 3; tableIndex ++) {
+ TableColumn c =
table.getColumn(table.getColumnName(tableIndex));
+ c.setPreferredWidth(150);
+ }
+
pane = new JScrollPane(table);
pane.setPreferredSize(new Dimension(200, 200));
table.setDoubleBuffered(false);
@@ -369,7 +318,6 @@
// JEditorPane - HTML example
try {
-
final JEditorPane editorPane = new
JEditorPane(loader.getResource("csdept.html"));
editorPane.setDoubleBuffered(false);
editorPane.setEditable(false);
@@ -500,6 +448,73 @@
canvas.getCamera().animateViewToCenterBounds(canvas.getLayer().getFullBounds(),
true, 1200);
}
+
+ private Vector<String> buildColumnNames() {
+ final Vector<String> columns = new Vector<String>();
+ columns.addElement("Check Number");
+ columns.addElement("Description");
+ columns.addElement("Amount");
+ return columns;
+ }
+
+ private Vector<Vector<String>> buildTableRows() {
+ final Vector<Vector<String>> rows = new Vector<Vector<String>>();
+
+ Vector<String> row = new Vector<String>();
+ row.addElement("101");
+ row.addElement("Sandwich");
+ row.addElement("$20.00");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("102");
+ row.addElement("Monkey Wrench");
+ row.addElement("$100.00");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("214");
+ row.addElement("Ant farm");
+ row.addElement("$55.00");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("215");
+ row.addElement("Self-esteem tapes");
+ row.addElement("$37.99");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("216");
+ row.addElement("Tube Socks");
+ row.addElement("$7.45");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("220");
+ row.addElement("Ab Excerciser");
+ row.addElement("$56.95");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("319");
+ row.addElement("Y2K Supplies");
+ row.addElement("$4624.33");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("332");
+ row.addElement("Tie Rack");
+ row.addElement("$15.20");
+ rows.addElement(row);
+
+ row = new Vector<String>();
+ row.addElement("344");
+ row.addElement("Swing Set");
+ row.addElement("$146.59");
+ rows.addElement(row);
+ return rows;
+ }
public static void main(final String[] args) {
new PSwingExample2().setVisible(true);
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/examples/pswing/PSwingExample3.java
Tue Jan 26 07:51:15 2010
@@ -51,6 +51,7 @@
/**
* User: Sam Reid Date: Jul 11, 2005 Time: 12:15:55 PM
*/
+...@suppresswarnings("serial")
public class PSwingExample3 extends JFrame {
private static final long serialVersionUID = 1L;
=======================================
---
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/examples/src/main/java/org/piccolo2d/tutorial/PiccoloPresentation.java
Tue Jan 26 07:51:15 2010
@@ -33,6 +33,7 @@
import java.awt.geom.AffineTransform;
import java.io.File;
import java.util.ArrayList;
+import java.util.List;
import org.piccolo2d.PNode;
import org.piccolo2d.event.PBasicInputEventHandler;
@@ -42,15 +43,11 @@
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 List<PNode> slides = new ArrayList<PNode>();
public PiccoloPresentation() {
super();
@@ -65,7 +62,7 @@
if (event.getKeyCode() == KeyEvent.VK_SPACE) {
final int newIndex = slides.indexOf(currentSlide) + 1;
if (newIndex < slides.size()) {
- goToSlide((PNode) slides.get(newIndex));
+ goToSlide(slides.get(newIndex));
}
}
}
@@ -131,7 +128,7 @@
slides.add(slide);
}
- goToSlide((PNode) slides.get(0));
+ goToSlide(slides.get(0));
}
public static void main(final String[] argv) {
=======================================
---
/piccolo2d.java/branches/2.0-spike/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java
Wed Jan 20 10:51:17 2010
+++
/piccolo2d.java/branches/2.0-spike/extras/src/main/java/org/piccolo2d/extras/event/PNotification.java
Tue Jan 26 07:51:15 2010
@@ -59,7 +59,7 @@
/** The Object associated with this notification. */
protected Object source;
/** A free form map of properties to attach to this notification. */
- protected Map<Object, Object> properties;
+ protected Map<?, ?> properties;
/**
* Creates a notification.
@@ -68,7 +68,7 @@
* @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<Object, Object> properties) {
+ public PNotification(final String name, final Object source, final
Map<?, ?> properties) {
this.name = name;
this.source = source;
this.properties = properties;
=======================================
---
/piccolo2d.java/branches/2.0-spike/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java
Wed Jan 20 10:51:17 2010
+++
/piccolo2d.java/branches/2.0-spike/extras/src/main/java/org/piccolo2d/extras/event/PNotificationCenter.java
Tue Jan 26 07:51:15 2010
@@ -66,7 +66,7 @@
public static final Object NULL_MARKER = new Object();
/** Singleton instance of the notification center. */
- protected static volatile PNotificationCenter DEFAULT_CENTER;
+ protected static volatile PNotificationCenter DEFAULT_CENTER;
/** A map of listeners keyed by NotificationKey objects. */
protected HashMap<NotificationKey, List<NotificationTarget>>
listenersMap;
@@ -239,7 +239,7 @@
* @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));
}
@@ -282,7 +282,8 @@
* @param object source of the notification
* @param listeners list to append listeners to
*/
- private void fillWithMatchingListeners(final Object notificationName,
final Object object, final List<NotificationTarget> listeners) {
+ private void fillWithMatchingListeners(final Object notificationName,
final Object object,
+ final List<NotificationTarget> listeners) {
final Object key = new NotificationKey(nullify(notificationName),
nullify(object));
final List<NotificationTarget> globalListeners =
listenersMap.get(key);
if (globalListeners != null) {
=======================================
---
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/PFrameTest.java
Tue Jan 26 07:51:15 2010
@@ -40,8 +40,7 @@
* Unit test for PFrame.
*/
public class PFrameTest extends TestCase {
- private PFrame frame;
-
+ @SuppressWarnings("serial")
public void testCanvasIsValidWithDefaultConstructor() {
PFrame frame = new PFrame() {
public void setVisible(boolean visible) {
@@ -55,6 +54,7 @@
assertSame(canvas.getLayer(), canvas.getCamera().getLayer(0));
}
+ @SuppressWarnings("serial")
public void testDefaultsToWindowed() {
PFrame frame = new PFrame() {
public void setVisible(boolean visible) {
=======================================
---
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/handles/PHandleTest.java
Tue Jan 26 07:51:15 2010
@@ -39,6 +39,7 @@
/**
* Unit test for PHandle.
*/
+...@suppresswarnings("serial")
public class PHandleTest extends TestCase {
public void testCloneWorksAsExpected() {
PHandle handle = new PHandle(new OriginLocator());
=======================================
---
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java
Thu Jan 14 13:48:07 2010
+++
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingEventHandlerTest.java
Tue Jan 26 07:51:15 2010
@@ -9,6 +9,6 @@
public void testConstructorAcceptsNullTargetNode() {
PSwingCanvas canvas = new PSwingCanvas();
- PSwingEventHandler handler = new PSwingEventHandler(canvas, null);
+ new PSwingEventHandler(canvas, null);
}
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/extras/src/test/java/org/piccolo2d/extras/pswing/PSwingTest.java
Tue Jan 26 07:51:15 2010
@@ -47,6 +47,7 @@
import junit.framework.TestCase;
+...@suppresswarnings("serial")
public class PSwingTest extends TestCase {
public void setUp() {
RepaintManager.setCurrentManager(new PSwingRepaintManager());
@@ -123,7 +124,8 @@
public void
testAddingSwingComponentToWrappedHierarchyMakesItNotDoubleBuffer() {
final JPanel panel = new JPanel();
- final PSwing pSwing = new PSwing(panel);
+ new PSwing(panel);
+
final JComponent child = new JLabel("Test Component");
child.setDoubleBuffered(true);
panel.add(child);
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTBoundsHandle.java
Tue Jan 26 07:04:07 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTBoundsHandle.java
Tue Jan 26 07:51:15 2010
@@ -31,7 +31,6 @@
import java.awt.Cursor;
import java.awt.geom.Point2D;
import java.util.ArrayList;
-import java.util.Iterator;
import javax.swing.SwingConstants;
@@ -44,10 +43,9 @@
import org.piccolo2d.util.PDimension;
import org.piccolo2d.util.PPickPath;
-
/**
- * <b>PSWTBoundsHandle</b> a handle for resizing the bounds of another
node. If a
- * bounds handle is dragged such that the other node's width or height
becomes
+ * <b>PSWTBoundsHandle</b> a handle for resizing the bounds of another
node. If
+ * a bounds handle is dragged such that the other node's width or height
becomes
* negative then the each drag handle's locator assciated with that other
node
* is "flipped" so that they are attached to and dragging a different
corner of
* the nodes bounds.
@@ -286,9 +284,7 @@
* @param flipY whether to allow flipping in the vertical direction
*/
public void flipSiblingBoundsHandles(final boolean flipX, final
boolean flipY) {
- final Iterator i = getParent().getChildrenIterator();
- while (i.hasNext()) {
- final Object each = i.next();
+ for (PNode each : getParent().getChildrenReference()) {
if (each instanceof PSWTBoundsHandle) {
((PSWTBoundsHandle) each).flipHandleIfNeeded(flipX, flipY);
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTCanvas.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTCanvas.java
Tue Jan 26 07:51:15 2010
@@ -84,7 +84,7 @@
private Image backBuffer;
private boolean doubleBuffered = true;
private PCamera camera;
- private final PStack cursorStack;
+ private final PStack<Cursor> cursorStack;
private Cursor curCursor;
private int interacting;
private int defaultRenderQuality;
@@ -111,7 +111,7 @@
super(parent, style | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE);
CURRENT_CANVAS = this;
- cursorStack = new PStack();
+ cursorStack = new PStack<Cursor>();
setCamera(createBasicSceneGraph());
installInputSources();
setDefaultRenderQuality(PPaintContext.HIGH_QUALITY_RENDERING);
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTKeyEvent.java
Tue Jan 19 13:09:08 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTKeyEvent.java
Tue Jan 26 07:51:15 2010
@@ -45,6 +45,7 @@
private static final long serialVersionUID = 1L;
private static final Component fakeSrc = new Component() {
+ private static final long serialVersionUID = 1L;
};
private org.eclipse.swt.events.KeyEvent swtEvent;
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTMouseEvent.java
Tue Jan 19 13:09:08 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTMouseEvent.java
Tue Jan 26 07:51:15 2010
@@ -47,7 +47,8 @@
private static final int SWT_BUTTON3 = 3;
private static final long serialVersionUID = 1L;
-
+
+ @SuppressWarnings("serial")
private static final Component fakeSrc = new Component() {
};
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTSelectionEventHandler.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/PSWTSelectionEventHandler.java
Tue Jan 26 07:51:15 2010
@@ -76,7 +76,7 @@
* @param selectableParents A list of nodes whose children will be
selected
* by this event handler.
*/
- public PSWTSelectionEventHandler(final PNode marqueeParent, final List
selectableParents) {
+ public PSWTSelectionEventHandler(final PNode marqueeParent, final
List<PNode> selectableParents) {
super(new PNode(), selectableParents);
this.marqueeParent = marqueeParent;
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/SWTGraphics2D.java
Tue Jan 19 13:09:08 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/main/java/org/piccolo2d/swt/SWTGraphics2D.java
Tue Jan 26 07:51:15 2010
@@ -59,7 +59,6 @@
import java.awt.image.renderable.RenderableImage;
import java.text.AttributedCharacterIterator;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.eclipse.swt.SWT;
@@ -92,38 +91,39 @@
* incrementGCCount and decrementGCCount.
*/
protected static int CACHE_COUNT = 0;
-
+
/** Map from font names to Fonts. */
- protected static final HashMap FONT_CACHE = new HashMap();
-
+ protected static final Map<String, org.eclipse.swt.graphics.Font>
FONT_CACHE = new HashMap<String, org.eclipse.swt.graphics.Font>();
+
/** Map from awt colors to swt colors. */
- protected static final HashMap COLOR_CACHE = new HashMap();
-
- /** Map from awt shapess to swt Paths. */
- protected static final HashMap SHAPE_CACHE = new HashMap();
-
+ protected static final Map<Color, org.eclipse.swt.graphics.Color>
COLOR_CACHE = new HashMap<Color, org.eclipse.swt.graphics.Color>();
+
+ /** Map from awt shapes to swt Paths. */
+ protected static final Map<Shape, Path> SHAPE_CACHE = new
HashMap<Shape, Path>();
+
/** Buffer used to extract the graphics device. */
protected static final BufferedImage BUFFER = new BufferedImage(1, 1,
BufferedImage.TYPE_INT_ARGB);
private static final Point TEMP_POINT = new Point();
private static final Rectangle2D TEMP_RECT = new Rectangle2D.Double();
private static final Rectangle2D TEMP_LINE_RECT = new
Rectangle2D.Double();
- private static final org.eclipse.swt.graphics.Rectangle SWT_RECT = new
org.eclipse.swt.graphics.Rectangle(0, 0, 0, 0);
+ private static final org.eclipse.swt.graphics.Rectangle SWT_RECT = new
org.eclipse.swt.graphics.Rectangle(0, 0, 0,
+ 0);
/** The Underlying GraphicsContext provided by swt. */
protected GC gc;
-
+
/** Device onto which all graphics operations will ultimately take
place. */
protected Device device;
-
+
/** The current transform to apply to drawing operations. */
protected AffineTransform transform = new AffineTransform();
-
+
private final Transform swtTransform;
-
+
/** The current font to use when drawing text. */
protected org.eclipse.swt.graphics.Font curFont;
-
+
/** The current stroke width to use when drawing lines. */
protected double lineWidth = 1.0;
@@ -377,7 +377,7 @@
* @return matching font, or null if not found
*/
public org.eclipse.swt.graphics.Font getFont(final String fontString) {
- org.eclipse.swt.graphics.Font cachedFont =
(org.eclipse.swt.graphics.Font) FONT_CACHE.get(fontString);
+ org.eclipse.swt.graphics.Font cachedFont =
FONT_CACHE.get(fontString);
if (cachedFont == null) {
int style = 0;
if (fontString.indexOf("bold=true") != -1) {
@@ -569,7 +569,7 @@
fillArc(a2.getX(), a2.getY(), a2.getWidth(), a2.getHeight(),
a2.getAngleStart(), a2.getAngleExtent());
}
else {
- Path p = (Path) SHAPE_CACHE.get(s);
+ Path p = SHAPE_CACHE.get(s);
if (p == null) {
p = pathIterator2Path(s.getPathIterator(null));
SHAPE_CACHE.put(s, p);
@@ -1318,7 +1318,7 @@
*
* @see java.awt.Graphics2D#setRenderingHints(Map)
*/
- public void setRenderingHints(final Map hints) {
+ public void setRenderingHints(final Map<?, ?> hints) {
}
/**
@@ -1326,7 +1326,7 @@
*
* @see java.awt.Graphics2D#addRenderingHints(Map)
*/
- public void addRenderingHints(final Map hints) {
+ public void addRenderingHints(final Map<?, ?> hints) {
}
/**
@@ -1523,16 +1523,13 @@
CACHE_COUNT--;
if (CACHE_COUNT == 0) {
- for (final Iterator i = FONT_CACHE.values().iterator();
i.hasNext();) {
- final org.eclipse.swt.graphics.Font font =
(org.eclipse.swt.graphics.Font) i.next();
+ for (final org.eclipse.swt.graphics.Font font :
FONT_CACHE.values()) {
font.dispose();
}
- for (final Iterator i = COLOR_CACHE.values().iterator();
i.hasNext();) {
- final org.eclipse.swt.graphics.Color color =
(org.eclipse.swt.graphics.Color) i.next();
+ for (final org.eclipse.swt.graphics.Color color :
COLOR_CACHE.values()) {
color.dispose();
}
- for (final Iterator i = SHAPE_CACHE.values().iterator();
i.hasNext();) {
- final Path path = (Path) i.next();
+ for (final Path path : SHAPE_CACHE.values()) {
path.dispose();
}
}
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt/src/test/java/org/piccolo2d/swt/PSWTImageTest.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/swt/src/test/java/org/piccolo2d/swt/PSWTImageTest.java
Tue Jan 26 07:51:15 2010
@@ -45,6 +45,7 @@
/**
* Unit test for PSWTImage.
*/
+...@suppresswarnings("serial")
public class PSWTImageTest extends TestCase {
File imageFile;
PSWTCanvas canvas;
=======================================
---
/piccolo2d.java/branches/2.0-spike/swt-examples/src/main/java/org/piccolo2d/swt/examples/SWTBenchTest.java
Tue Jan 19 12:39:24 2010
+++
/piccolo2d.java/branches/2.0-spike/swt-examples/src/main/java/org/piccolo2d/swt/examples/SWTBenchTest.java
Tue Jan 26 07:51:15 2010
@@ -28,7 +28,6 @@
*/
package org.piccolo2d.swt.examples;
-import java.awt.AlphaComposite;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
@@ -55,7 +54,6 @@
import org.eclipse.swt.widgets.Shell;
import org.piccolo2d.swt.SWTGraphics2D;
-
/**
* Piccolo2D SWT benchmarking test suite.
*/
@@ -123,8 +121,8 @@
private static final int DRAW_IMG5 = 12;
private static final int NUM_TESTS = 13;
- private static String testNames[] = { "line", "rect", "fill
rect", "oval", "fill oval", "poly", "fill poly", "text",
- "image", "scaled image", "mask image", "alpha image", "argb
image", };
+ private static String testNames[] = { "line", "rect", "fill
rect", "oval", "fill oval", "poly", "fill poly",
+ "text", "image", "scaled image", "mask image", "alpha
image", "argb image", };
private void testDrawLine(final SWTGraphics2D g, final Random r) {
g.drawLine(rand(r), rand(r), rand(r), rand(r));
@@ -214,8 +212,9 @@
}
/**
- * Create a new Piccolo2D SWT benchmarking test suite with the
specified parent and style.
- *
+ * Create a new Piccolo2D SWT benchmarking test suite with the
specified
+ * parent and style.
+ *
* @param parent parent
* @param style style
*/
@@ -267,14 +266,6 @@
g.setTransform(transform);
}
-
- private void setupClip(final Graphics2D g, final Random r) {
- // g.setClip(rand(r), rand(r), rand(r), rand(r));
- }
-
- private void setupBlend(final Graphics2D g, final Random r) {
- g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
r.nextFloat()));
- }
private void setup(final int ctx, final Graphics2D g, final Random r) {
switch (ctx) {
@@ -294,6 +285,15 @@
// break;
}
}
+
+ // private void setupClip(final Graphics2D g, final Random r) {
+ // g.setClip(rand(r), rand(r), rand(r), rand(r));
+ // }
+
+ // private void setupBlend(final Graphics2D g, final Random r) {
+ // g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
+ // r.nextFloat()));
+ // }
private void test(final int testNum, final SWTGraphics2D g, final
Random r) {
@@ -442,7 +442,7 @@
/**
* Main.
- *
+ *
* @param args command line arguments, ignored
*/
public static void main(final String args[]) {
--
Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en
