more clean-up of draw2d examples

eclipse-gef · Jul 31, 2023 · 6c037e5 · 6c037e5
1 parent 6e2f189
commit 6c037e5
Show file tree

Hide file tree

Showing 18 changed files with 106 additions and 99 deletions.
diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/ExampleUtil.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/ExampleUtil.java
@@ -10,48 +10,51 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+
 import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.FlowLayout;
 import org.eclipse.draw2d.GroupBoxBorder;
 import org.eclipse.draw2d.IFigure;
 import org.eclipse.draw2d.Label;
 import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
 
 /**
  * A factory for figures. Created on :Sep 26, 2002
- * 
+ *
  * @author hudsonr
  * @since 2.0
  */
 public final class ExampleUtil {
 
-	static final Font FONT_LARGE = new Font(null, "Arial", 16, SWT.BOLD);
+	static final Font FONT_LARGE = new Font(null, "Arial", 16, SWT.BOLD); //$NON-NLS-1$
 
 	public static IFigure createFlowLayoutPanel() {
 		Figure f = new Figure();
 
-		f.setBorder(new GroupBoxBorder("FlowLayout"));
+		f.setBorder(new GroupBoxBorder("FlowLayout")); //$NON-NLS-1$
 		f.setLayoutManager(new FlowLayout());
 
-		for (int i = 0; i < 5; i++)
-			f.add(new Label("Label " + i, ExampleImages.GEORGE));
+		for (int i = 0; i < 5; i++) {
+			f.add(new Label("Label " + i, ExampleImages.GEORGE)); //$NON-NLS-1$
+		}
 
 //	Label l = new Label("A really wide label is here");
 //	l.setBorder(new LineBorder());
 //	l.setFont(FONT_LARGE);
 //	f.add(l);
 
-		for (int i = 6; i < 10; i++)
-			f.add(new Label("Label " + i, ExampleImages.GEORGE));
+		for (int i = 6; i < 10; i++) {
+			f.add(new Label("Label " + i, ExampleImages.GEORGE)); //$NON-NLS-1$
+		}
 
 		return f;
 	}
 
 	public static IFigure createToolbarLayout() {
 		Figure f = new Figure();
-		f.setBorder(new GroupBoxBorder("Toolbar"));
+		f.setBorder(new GroupBoxBorder("Toolbar")); //$NON-NLS-1$
 		f.setLayoutManager(new ToolbarLayout());
 		f.add(createFlowLayoutPanel());
 		f.add(createFlowLayoutPanel());

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/HelloWorld.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/HelloWorld.java
@@ -10,12 +10,13 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples;
 
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.Label;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
+import org.eclipse.draw2d.FigureCanvas;
+import org.eclipse.draw2d.Label;
+
 public class HelloWorld {
 
 	public static void main(String[] args) {
@@ -25,14 +26,16 @@ public static void main(String[] args) {
 		shell.setLayout(new FillLayout());
 
 		FigureCanvas canvas = new FigureCanvas(shell);
-		canvas.setContents(new Label("Hello World"));
+		canvas.setContents(new Label("Hello World")); //$NON-NLS-1$
 
-		shell.setText("Draw2d");
+		shell.setText("Draw2d"); //$NON-NLS-1$
 		shell.setSize(200, 100);
 		shell.open();
-		while (!shell.isDisposed())
-			while (!d.readAndDispatch())
+		while (!shell.isDisposed()) {
+			while (!d.readAndDispatch()) {
 				d.sleep();
+			}
+		}
 
 	}
 

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/cg/ObstructionExample.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/cg/ObstructionExample.java
@@ -150,17 +150,16 @@ public void paint(Graphics graphics) {
 			super.paint(graphics);
 			Rectangle b = getBounds();
 			Point p = b.getCenter().translate(-22, -15);
-			graphics.drawString("y:" + b.y() + "h:" + b.height(), p);
+			graphics.drawString("y:" + b.y() + "h:" + b.height(), p); //$NON-NLS-1$ //$NON-NLS-2$
 			p.setY(p.y() + 12);
-			graphics.drawString("x:" + b.x() + "w:" + b.width(), p);
+			graphics.drawString("x:" + b.x() + "w:" + b.width(), p); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 	}
 
 	class TestFigure extends Figure {
 
 		private static final int INITAL_OBSTACLE_COUNT = 5;
 
-		Map obstacleMap = new HashMap();
 		boolean showSegs = false;
 
 		public TestFigure() {

diff --git a/...aw2d.examples/src/org/eclipse/draw2d/examples/connections/ConnectionAndAnchorExample.java b/...aw2d.examples/src/org/eclipse/draw2d/examples/connections/ConnectionAndAnchorExample.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples.connections;
 
+import org.eclipse.swt.widgets.Shell;
+
 import org.eclipse.draw2d.ChopboxAnchor;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.ConnectionEndpointLocator;
@@ -129,9 +131,10 @@ protected IFigure createContents() {
 	}
 
 	/**
-	 * @see org.eclipse.draw2d.examples.AbstractExample#hookShell()
+	 * @see org.eclipse.draw2d.examples.AbstractExample#hookShell(Shell shell)
 	 */
-	protected void hookShell() {
+	@Override
+	protected void hookShell(Shell shell) {
 		getFigureCanvas().setSize(820, 440);
 	}
 

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/graph/AbstractGraphDemo.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/graph/AbstractGraphDemo.java
@@ -13,6 +13,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
 import org.eclipse.draw2d.AbsoluteBendpoint;
 import org.eclipse.draw2d.BendpointConnectionRouter;
 import org.eclipse.draw2d.ChopboxAnchor;
@@ -30,15 +40,6 @@
 import org.eclipse.draw2d.graph.Edge;
 import org.eclipse.draw2d.graph.Node;
 import org.eclipse.draw2d.graph.NodeList;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 /**
  * @author Daniel Lee
@@ -184,9 +185,7 @@ static PolylineConnection connection(Edge e) {
 		return conn;
 	}
 
-	/**
-	 * @see org.eclipse.graph.AbstractExample#createContents()
-	 */
+	@SuppressWarnings("static-method")
 	protected IFigure getContents() {
 		return null;
 	}
@@ -208,9 +207,6 @@ protected FigureCanvas getFigureCanvas() {
 	 */
 	protected abstract String[] getGraphMethods();
 
-	/**
-	 * @see org.eclipse.graph.AbstractExample#hookShell()
-	 */
 	protected void hookShell() {
 		Composite composite = new Composite(shell, 0);
 		composite.setLayoutData(new GridData(GridData.FILL_VERTICAL));

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/graph/CompoundGraphDemo.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/graph/CompoundGraphDemo.java
@@ -12,6 +12,8 @@
 
 import java.lang.reflect.Method;
 
+import org.eclipse.swt.graphics.Font;
+
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.IFigure;
@@ -23,7 +25,6 @@
 import org.eclipse.draw2d.graph.Edge;
 import org.eclipse.draw2d.graph.Node;
 import org.eclipse.draw2d.graph.Subgraph;
-import org.eclipse.swt.graphics.Font;
 
 /**
  * @author hudsonr
@@ -39,7 +40,7 @@ public class CompoundGraphDemo extends AbstractGraphDemo {
 	 */
 	public static Figure buildGraph(CompoundDirectedGraph graph) {
 		Figure contents = new Panel();
-		contents.setFont(new Font(null, "Tahoma", 10, 0));
+		contents.setFont(new Font(null, "Tahoma", 10, 0)); //$NON-NLS-1$
 		contents.setBackgroundColor(ColorConstants.white);
 		contents.setLayoutManager(new XYLayout());
 
@@ -134,13 +135,13 @@ protected IFigure getContents() {
 			graph = (CompoundDirectedGraph) (CompoundGraphTests.class.getMethod(graphMethod, int.class).invoke(null,
 					Integer.valueOf(graphDirection)));
 		} catch (Exception e) {
-			System.out.println("Could not build graph");
+			System.out.println("Could not build graph"); //$NON-NLS-1$
 		}
 		return buildGraph(graph);
 	}
 
 	/**
-	 * @see org.eclipse.graph.demo.GraphDemo#getGraphMethods()
+	 * @see org.eclipse.draw2d.examples.graph.AbstractGraphDemo#getGraphMethods()
 	 */
 	@Override
 	protected String[] getGraphMethods() {

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/graph/DirectedGraphDemo.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/graph/DirectedGraphDemo.java
@@ -124,7 +124,7 @@ public static void main(String[] args) {
 	}
 
 	/**
-	 * @see org.eclipse.graph.demo.GraphDemo#getGraphMethods()
+	 * @see org.eclipse.draw2d.examples.graph.AbstractGraphDemo#getGraphMethods()
 	 */
 	@Override
 	protected String[] getGraphMethods() {

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/layouts/FlowLayoutExample.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/layouts/FlowLayoutExample.java
@@ -10,17 +10,6 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples.layouts;
 
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Ellipse;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FlowLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.OrderedLayout;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.RoundedRectangle;
-import org.eclipse.draw2d.Triangle;
-import org.eclipse.draw2d.examples.AbstractExample;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -34,6 +23,18 @@
 import org.eclipse.swt.widgets.Scale;
 import org.eclipse.swt.widgets.Shell;
 
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.Ellipse;
+import org.eclipse.draw2d.Figure;
+import org.eclipse.draw2d.FlowLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.LineBorder;
+import org.eclipse.draw2d.OrderedLayout;
+import org.eclipse.draw2d.RectangleFigure;
+import org.eclipse.draw2d.RoundedRectangle;
+import org.eclipse.draw2d.Triangle;
+import org.eclipse.draw2d.examples.AbstractExample;
+
 /**
  * @author hudsonr Created on Apr 30, 2003
  */
@@ -124,7 +125,7 @@ protected IFigure createContents() {
 	}
 
 	/**
-	 * @see org.eclipse.draw2d.examples.AbstractExample#hookShell()
+	 * @see org.eclipse.draw2d.examples.AbstractExample#hookShell(Shell shell)
 	 */
 	@Override
 	protected void hookShell(Shell shell) {

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/path/PathFigure.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/path/PathFigure.java
@@ -10,6 +10,12 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples.path;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Path;
+import org.eclipse.swt.graphics.TextLayout;
+import org.eclipse.swt.graphics.TextStyle;
+import org.eclipse.swt.widgets.Display;
+
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.Polyline;
@@ -18,11 +24,6 @@
 import org.eclipse.draw2d.geometry.PointList;
 import org.eclipse.draw2d.geometry.PrecisionPoint;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Path;
-import org.eclipse.swt.graphics.TextLayout;
-import org.eclipse.swt.graphics.TextStyle;
-import org.eclipse.swt.widgets.Display;
 
 public class PathFigure extends Polyline {
 
@@ -65,7 +66,7 @@ private void drawShape(Graphics g, boolean fill) {
 
 		TextLayout textLayout = new TextLayout(Display.getDefault());
 		textLayout.setFont(g.getFont());
-		textLayout.setText("zoom" + (g instanceof ScaledGraphics ? "[e]" : "[n]"));
+		textLayout.setText("zoom" + (g instanceof ScaledGraphics ? "[e]" : "[n]")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		TextStyle textStyle = new TextStyle();
 		textStyle.underline = true;
 		textStyle.underlineColor = ColorConstants.blue;

diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/scrollpane/InternalFrame.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/scrollpane/InternalFrame.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples.scrollpane;
 
+import org.eclipse.swt.graphics.Cursor;
+
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.CompoundBorder;
 import org.eclipse.draw2d.Cursors;
@@ -26,7 +28,6 @@
 import org.eclipse.draw2d.geometry.Dimension;
 import org.eclipse.draw2d.geometry.Point;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Cursor;
 
 public class InternalFrame extends LabeledContainer {
 
@@ -113,7 +114,7 @@ public void mouseMoved(MouseEvent me) {
 			Rectangle figBounds = getBounds();
 			Point mouseLocation = me.getLocation();
 			if (!getBounds().contains(mouseLocation)) {
-				System.out.println("Error");
+				System.out.println("Error"); //$NON-NLS-1$
 			}
 			if (!figBounds.contains(mouseLocation)) {
 				return;

diff --git a/...eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/swt/InheritBackgroundExample.java b/...eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/swt/InheritBackgroundExample.java
@@ -10,9 +10,6 @@
  *******************************************************************************/
 package org.eclipse.draw2d.examples.swt;
 
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.Label;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
@@ -24,6 +21,10 @@
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Shell;
 
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.draw2d.FigureCanvas;
+import org.eclipse.draw2d.Label;
+
 public class InheritBackgroundExample {
 
 	static Shell shell;