diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/uml/UMLClassFigure.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/uml/UMLClassFigure.java
index b2165ebb3..b2b7645a4 100644
--- a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/uml/UMLClassFigure.java
+++ b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/uml/UMLClassFigure.java
@@ -13,6 +13,11 @@
 
 package org.eclipse.draw2d.examples.uml;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Image;
+
 import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
@@ -22,10 +27,6 @@
 import org.eclipse.draw2d.ToolbarLayout;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
 
 public class UMLClassFigure extends Figure {
 
@@ -53,15 +54,16 @@ public void paint(IFigure figure, Graphics graphics, Insets insets) {
 		header.setBorder(new MarginBorder(3, 5, 3, 5));
 
 		Figure attributes = new Figure();
-		ToolbarLayout layout;
-		attributes.setLayoutManager(layout = new ToolbarLayout());
+		ToolbarLayout layout = new ToolbarLayout();
+		attributes.setLayoutManager(layout);
 		layout.setStretchMinorAxis(false);
 		attributes.add(new Label("name : String")); //$NON-NLS-1$
 		attributes.add(new Label("ID : String")); //$NON-NLS-1$
 		attributes.setBorder(new SeparatorBorder());
 
 		Figure methods = new Figure();
-		methods.setLayoutManager(layout = new ToolbarLayout());
+		layout = new ToolbarLayout();
+		methods.setLayoutManager(layout);
 		layout.setStretchMinorAxis(false);
 		methods.add(new Label("foo() : int")); //$NON-NLS-1$
 		methods.add(new Label("bar() : char")); //$NON-NLS-1$
diff --git a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/zoom/CompartmentFigure.java b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/zoom/CompartmentFigure.java
index 819ba6067..a50d3513d 100644
--- a/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/zoom/CompartmentFigure.java
+++ b/org.eclipse.draw2d.examples/src/org/eclipse/draw2d/examples/zoom/CompartmentFigure.java
@@ -16,6 +16,7 @@
 import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.OrderedLayout;
 import org.eclipse.draw2d.ToolbarLayout;
 import org.eclipse.draw2d.geometry.Insets;
 
@@ -27,7 +28,7 @@ public class CompartmentFigure extends Figure {
 
 	public CompartmentFigure() {
 		ToolbarLayout layout = new ToolbarLayout();
-		layout.setMinorAlignment(ToolbarLayout.ALIGN_TOPLEFT);
+		layout.setMinorAlignment(OrderedLayout.ALIGN_TOPLEFT);
 		layout.setStretchMinorAxis(false);
 		layout.setSpacing(2);
 		setLayoutManager(layout);
diff --git a/org.eclipse.draw2d.tests/src/org/eclipse/draw2d/test/AbstractTextTest.java b/org.eclipse.draw2d.tests/src/org/eclipse/draw2d/test/AbstractTextTest.java
index 22309d848..82f922580 100644
--- a/org.eclipse.draw2d.tests/src/org/eclipse/draw2d/test/AbstractTextTest.java
+++ b/org.eclipse.draw2d.tests/src/org/eclipse/draw2d/test/AbstractTextTest.java
@@ -24,8 +24,10 @@
  */
 public class AbstractTextTest extends BaseTestCase {
 
+	private static final String FRAGMENT_LOCATION_ERROR = "Fragment location error"; //$NON-NLS-1$
+
 	static class TestBorder extends AbstractFlowBorder {
-		private Insets insets;
+		private final Insets insets;
 
 		TestBorder(Insets insets) {
 			this.insets = insets;
@@ -40,10 +42,10 @@ public Insets getInsets(IFigure figure) {
 	public Rectangle expected = new Rectangle();
 
 	protected void assertFragmentLocation(TextFragmentBox box) {
-		assertEquals("Fragment location error", box.getX(), expected.x);
-		assertEquals("Fragment location error", box.getBaseline() - box.getAscent(), expected.y);
-		assertEquals("Fragment location error", box.getBaseline() + box.getDescent(), expected.bottom());
-		assertEquals("Fragment location error", box.getWidth() + box.getX(), expected.right());
+		assertEquals(FRAGMENT_LOCATION_ERROR, box.getX(), expected.x);
+		assertEquals(FRAGMENT_LOCATION_ERROR, box.getBaseline() - box.getAscent(), expected.y);
+		assertEquals(FRAGMENT_LOCATION_ERROR, box.getBaseline() + box.getDescent(), expected.bottom());
+		assertEquals(FRAGMENT_LOCATION_ERROR, box.getWidth() + box.getX(), expected.right());
 	}
 
 }
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBackground.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBackground.java
index 7cc141cfa..eed2388f0 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBackground.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBackground.java
@@ -41,6 +41,7 @@ public Insets getInsets(IFigure figure) {
 	 */
 	@Override
 	public void paint(IFigure figure, Graphics graphics, Insets insets) {
+		// empty default implementation
 	}
 
 	/**
@@ -55,6 +56,7 @@ public void paint(IFigure figure, Graphics graphics, Insets insets) {
 	 * @since 3.2
 	 */
 	public void paintBackground(IFigure figure, Graphics graphics, Insets insets) {
+		// empty default implementation
 	}
 
 }
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBorder.java
index a0001d2d8..c28949dea 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/AbstractBorder.java
@@ -41,7 +41,7 @@ public abstract class AbstractBorder implements Border {
 	 */
 	protected static final Rectangle getPaintRectangle(IFigure figure, Insets insets) {
 		tempRect.setBounds(figure.getBounds());
-		return tempRect.crop(insets);
+		return tempRect.shrink(insets);
 	}
 
 	/**
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonBorder.java
index ba8f6a6f5..2170de714 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/ButtonBorder.java
@@ -35,7 +35,7 @@ public class ButtonBorder extends SchemeBorder {
 	 */
 	public static final Border BUTTON = new ButtonBorder(SCHEMES.BUTTON);
 	/**
-	 * Inverted hightlight colors from BUTTON.
+	 * Inverted highlight colors from BUTTON.
 	 *
 	 * @see SCHEMES#BUTTON_CONTRAST
 	 */
@@ -59,7 +59,8 @@ public class ButtonBorder extends SchemeBorder {
 	 * an extra set of borders for the pressed states.
 	 */
 	public static class ButtonScheme extends Scheme {
-		private Color highlightPressed[] = null, shadowPressed[] = null;
+		private Color[] highlightPressed = null;
+		private Color[] shadowPressed = null;
 
 		/**
 		 * Constructs a new button scheme where the input colors are the colors for the
@@ -132,20 +133,27 @@ protected Insets calculateInsets() {
 		 */
 		@Override
 		protected boolean calculateOpaque() {
-			if (!super.calculateOpaque())
+			if (!super.calculateOpaque()) {
 				return false;
-			if (getHighlight().length != getShadowPressed().length)
+			}
+			if (getHighlight().length != getShadowPressed().length) {
 				return false;
-			if (getShadow().length != getHighlightPressed().length)
+			}
+			if (getShadow().length != getHighlightPressed().length) {
 				return false;
+			}
 			Color[] colors = getHighlightPressed();
-			for (int i = 0; i < colors.length; i++)
-				if (colors[i] == null)
+			for (Color color : colors) {
+				if (color == null) {
 					return false;
+				}
+			}
 			colors = getShadowPressed();
-			for (int i = 0; i < colors.length; i++)
-				if (colors[i] == null)
+			for (Color color : colors) {
+				if (color == null) {
 					return false;
+				}
+			}
 			return true;
 		}
 
@@ -228,10 +236,12 @@ public void paint(IFigure figure, Graphics graphics, Insets insets) {
 		ButtonModel model = clickable.getModel();
 		ButtonScheme colorScheme = (ButtonScheme) getScheme();
 
-		if (clickable.isRolloverEnabled() && !model.isMouseOver() && !model.isSelected())
+		if (clickable.isRolloverEnabled() && !model.isMouseOver() && !model.isSelected()) {
 			return;
+		}
 
-		Color tl[], br[];
+		Color[] tl;
+		Color[] br;
 		if (model.isSelected() || model.isArmed()) {
 			tl = colorScheme.getShadowPressed();
 			br = colorScheme.getHighlightPressed();
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/CompoundBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/CompoundBorder.java
index e1439bbed..ec11e78c4 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/CompoundBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/CompoundBorder.java
@@ -68,10 +68,11 @@ public Border getInnerBorder() {
 	@Override
 	public Insets getInsets(IFigure figure) {
 		Insets insets = null;
-		if (inner != null)
+		if (inner != null) {
 			insets = inner.getInsets(figure);
-		else
+		} else {
 			insets = new Insets();
+		}
 		if (outer != null) {
 			Insets moreInsets = outer.getInsets(figure);
 			insets = insets.getAdded(moreInsets);
@@ -111,7 +112,7 @@ public Border getOuterBorder() {
 	 */
 	@Override
 	public boolean isOpaque() {
-		return ((inner != null) ? inner.isOpaque() : false) && ((outer != null) ? outer.isOpaque() : false);
+		return (inner != null && inner.isOpaque()) && (outer != null && outer.isOpaque());
 	}
 
 	/**
@@ -126,8 +127,9 @@ public void paint(IFigure figure, Graphics g, Insets insets) {
 
 			insets = insets.getAdded(outer.getInsets(figure));
 		}
-		if (inner != null)
+		if (inner != null) {
 			inner.paint(figure, g, insets);
+		}
 	}
 
 }
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/FocusBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/FocusBorder.java
index 5af51d50b..4e1a6a09d 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/FocusBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/FocusBorder.java
@@ -19,12 +19,6 @@
  */
 public class FocusBorder extends AbstractBorder {
 
-	/**
-	 * Constructs a new FocusBorder.
-	 */
-	public FocusBorder() {
-	}
-
 	/**
 	 * @see org.eclipse.draw2d.Border#getInsets(IFigure)
 	 */
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/FrameBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/FrameBorder.java
index b7d32a64d..6c6a17db4 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/FrameBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/FrameBorder.java
@@ -29,10 +29,6 @@ public class FrameBorder extends CompoundBorder implements LabeledBorder {
 			new Color[] { ColorConstants.button, ColorConstants.buttonLightest, ColorConstants.button },
 			new Color[] { ColorConstants.buttonDarkest, ColorConstants.buttonDarker, ColorConstants.button });
 
-	{
-		createBorders();
-	}
-
 	/**
 	 * Constructs a FrameBorder with its label set to the name of the
 	 * {@link TitleBarBorder} class.
@@ -40,6 +36,7 @@ public class FrameBorder extends CompoundBorder implements LabeledBorder {
 	 * @since 2.0
 	 */
 	public FrameBorder() {
+		createBorders();
 	}
 
 	/**
@@ -49,6 +46,7 @@ public FrameBorder() {
 	 * @since 2.0
 	 */
 	public FrameBorder(String label) {
+		this();
 		setLabel(label);
 	}
 
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/GroupBoxBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/GroupBoxBorder.java
index 849f92364..bb39e1d8f 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/GroupBoxBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/GroupBoxBorder.java
@@ -71,11 +71,12 @@ public Dimension getPreferredSize(IFigure fig) {
 	public void paint(IFigure figure, Graphics g, Insets insets) {
 		tempRect.setBounds(getPaintRectangle(figure, insets));
 		Rectangle r = tempRect;
-		if (r.isEmpty())
+		if (r.isEmpty()) {
 			return;
+		}
 
 		Rectangle textLoc = new Rectangle(r.getTopLeft(), getTextExtents(figure));
-		r.crop(new Insets(getTextExtents(figure).height / 2));
+		r.shrink(new Insets(getTextExtents(figure).height / 2));
 		FigureUtilities.paintEtchedBorder(g, r);
 
 		textLoc.x += getInsets(figure).left;
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/MarginBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/MarginBorder.java
index 1c22fc2e9..c69c620f8 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/MarginBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/MarginBorder.java
@@ -72,6 +72,7 @@ public Insets getInsets(IFigure figure) {
 	 */
 	@Override
 	public void paint(IFigure figure, Graphics graphics, Insets insets) {
+		// empty default implementation
 	}
 
 }
diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/SchemeBorder.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/SchemeBorder.java
index 5babf39a0..33341f93e 100644
--- a/org.eclipse.draw2d/src/org/eclipse/draw2d/SchemeBorder.java
+++ b/org.eclipse.draw2d/src/org/eclipse/draw2d/SchemeBorder.java
@@ -29,9 +29,9 @@ public class SchemeBorder extends AbstractBorder implements ColorConstants {
 	protected Scheme scheme = null;
 
 	/** Arrays of Colors, used for shadow or highlight effects **/
-	protected static final Color DARKEST_DARKER[] = new Color[] { buttonDarkest, buttonDarker },
-			LIGHTER_DARKER[] = new Color[] { buttonLightest, buttonDarker },
-			DARKER_LIGHTER[] = new Color[] { buttonDarker, buttonLightest };
+	protected static final Color[] DARKEST_DARKER = { buttonDarkest, buttonDarker };
+	protected static final Color[] LIGHTER_DARKER = { buttonLightest, buttonDarker };
+	protected static final Color[] DARKER_LIGHTER = { buttonDarker, buttonLightest };
 
 	/**
 	 * Holds a set of information about a border, which can be changed to create a
@@ -42,8 +42,9 @@ public static class Scheme {
 		private Insets insets;
 		private boolean isOpaque = false;
 
-		/** Arrays of Colors, used for highlight and shadow effecsts */
-		protected Color highlight[], shadow[];
+		/** Arrays of Colors, used for highlight and shadow effects */
+		protected Color[] highlight;
+		protected Color[] shadow;
 
 		/**
 		 * Constructs a default border Scheme with no border sides.
@@ -108,14 +109,18 @@ protected Insets calculateInsets() {
 		 * @since 2.0
 		 */
 		protected boolean calculateOpaque() {
-			Color colors[] = getHighlight();
-			for (int i = 0; i < colors.length; i++)
-				if (colors[i] == null)
+			Color[] colors = getHighlight();
+			for (Color color : colors) {
+				if (color == null) {
 					return false;
+				}
+			}
 			colors = getShadow();
-			for (int i = 0; i < colors.length; i++)
-				if (colors[i] == null)
+			for (Color color : colors) {
+				if (color == null) {
 					return false;
+				}
+			}
 			return true;
 		}
 
@@ -178,13 +183,13 @@ protected boolean isOpaque() {
 	public static interface SCHEMES {
 
 		/** Schemes used for shadow and highlight effects **/
-		Scheme BUTTON_CONTRAST = new Scheme(new Color[] { button, buttonLightest }, DARKEST_DARKER),
-				BUTTON_RAISED = new Scheme(new Color[] { buttonLightest }, DARKEST_DARKER),
-				BUTTON_PRESSED = new Scheme(DARKEST_DARKER, new Color[] { buttonLightest }),
-				RAISED = new Scheme(new Color[] { buttonLightest }, new Color[] { buttonDarkest }),
-				LOWERED = new Scheme(new Color[] { buttonDarkest }, new Color[] { buttonLightest }),
-				RIDGED = new Scheme(LIGHTER_DARKER, DARKER_LIGHTER),
-				ETCHED = new Scheme(DARKER_LIGHTER, LIGHTER_DARKER);
+		Scheme BUTTON_CONTRAST = new Scheme(new Color[] { button, buttonLightest }, DARKEST_DARKER);
+		Scheme BUTTON_RAISED = new Scheme(new Color[] { buttonLightest }, DARKEST_DARKER);
+		Scheme BUTTON_PRESSED = new Scheme(DARKEST_DARKER, new Color[] { buttonLightest });
+		Scheme RAISED = new Scheme(new Color[] { buttonLightest }, new Color[] { buttonDarkest });
+		Scheme LOWERED = new Scheme(new Color[] { buttonDarkest }, new Color[] { buttonLightest });
+		Scheme RIDGED = new Scheme(LIGHTER_DARKER, DARKER_LIGHTER);
+		Scheme ETCHED = new Scheme(DARKER_LIGHTER, LIGHTER_DARKER);
 	}
 
 	/**
diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitBorder.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitBorder.java
index dfd4d5e0d..a6234f6e3 100644
--- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitBorder.java
+++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitBorder.java
@@ -43,28 +43,27 @@ public class CircuitBorder extends AbstractBorder {
 	}
 
 	private static void drawConnectors(Graphics g, Rectangle rec) {
-		int y1 = rec.y, width = rec.width, x1, bottom = y1 + rec.height;
 		g.setBackgroundColor(LogicColorConstants.connectorGreen);
 		for (int i = 0; i < 4; i++) {
-			x1 = rec.x + (2 * i + 1) * width / 8;
+			int x1 = rec.x + (2 * i + 1) * rec.width / 8;
 
 			// Draw the "gap" for the connector
 			g.setForegroundColor(ColorConstants.listBackground);
-			g.drawLine(x1 - 2, y1 + 2, x1 + 3, y1 + 2);
+			g.drawLine(x1 - 2, rec.y + 2, x1 + 3, rec.y + 2);
 
 			// Draw the connectors
 			g.setForegroundColor(LogicColorConstants.connectorGreen);
-			connector.translate(x1, y1);
+			connector.translate(x1, rec.y);
 			g.fillPolygon(connector);
 			g.drawPolygon(connector);
-			connector.translate(-x1, -y1);
+			connector.translate(-x1, -rec.y);
 			g.setForegroundColor(ColorConstants.listBackground);
-			g.drawLine(x1 - 2, bottom - 3, x1 + 3, bottom - 3);
+			g.drawLine(x1 - 2, rec.bottom() - 3, x1 + 3, rec.bottom() - 3);
 			g.setForegroundColor(LogicColorConstants.connectorGreen);
-			bottomConnector.translate(x1, bottom);
+			bottomConnector.translate(x1, rec.bottom());
 			g.fillPolygon(bottomConnector);
 			g.drawPolygon(bottomConnector);
-			bottomConnector.translate(-x1, -bottom);
+			bottomConnector.translate(-x1, -rec.bottom());
 		}
 	}
 
diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitFeedbackBorder.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitFeedbackBorder.java
index 0071cabad..86def6b2d 100644
--- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitFeedbackBorder.java
+++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/CircuitFeedbackBorder.java
@@ -21,21 +21,20 @@
 public class CircuitFeedbackBorder extends CircuitBorder {
 
 	private static void drawConnectors(Graphics g, Rectangle rec) {
-		int y1 = rec.y, width = rec.width, x1, bottom = y1 + rec.height;
 		for (int i = 0; i < 4; i++) {
-			x1 = rec.x + (2 * i + 1) * width / 8;
+			int x1 = rec.x + (2 * i + 1) * rec.width / 8;
 
 			// Draw the "gap" for the connector
-			g.drawLine(x1 - 2, y1 + 2, x1 + 3, y1 + 2);
+			g.drawLine(x1 - 2, rec.y + 2, x1 + 3, rec.y + 2);
 
 			// Draw the connectors
-			connector.translate(x1, y1);
+			connector.translate(x1, rec.y);
 			g.drawPolygon(connector);
-			connector.translate(-x1, -y1);
-			g.drawLine(x1 - 2, bottom - 3, x1 + 3, bottom - 3);
-			bottomConnector.translate(x1, bottom);
+			connector.translate(-x1, -rec.y);
+			g.drawLine(x1 - 2, rec.bottom() - 3, x1 + 3, rec.bottom() - 3);
+			bottomConnector.translate(x1, rec.bottom());
 			g.drawPolygon(bottomConnector);
-			bottomConnector.translate(-x1, -bottom);
+			bottomConnector.translate(-x1, -rec.bottom());
 		}
 	}
 
diff --git a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/LogicFlowFeedbackBorder.java b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/LogicFlowFeedbackBorder.java
index dec7592a7..13b2076e6 100644
--- a/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/LogicFlowFeedbackBorder.java
+++ b/org.eclipse.gef.examples.logic/src/org/eclipse/gef/examples/logicdesigner/figures/LogicFlowFeedbackBorder.java
@@ -36,12 +36,6 @@ public void paint(IFigure figure, Graphics graphics, Insets insets) {
 		Rectangle r = figure.getBounds();
 
 		graphics.drawRectangle(r.x, r.y, r.width - 1, r.height - 1);
-		// graphics.drawLine(r.x, r.y + 1, r.right() - 1, r.y + 1);
-		// graphics.drawLine(r.x, r.bottom() - 1, r.right() - 1, r.bottom() -
-		// 1);
-		// graphics.drawLine(r.x, r.y + 1, r.x, r.bottom() - 1);
-		// graphics.drawLine(r.right() - 1, r.bottom() - 1, r.right() - 1, r.y +
-		// 1);
 
 		tempRect.setBounds(new Rectangle(r.x, r.y, grabBarWidth, r.height));
 
diff --git a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/figures/BulletBorder.java b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/figures/BulletBorder.java
index ae2f24b82..5f753f7ed 100644
--- a/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/figures/BulletBorder.java
+++ b/org.eclipse.gef.examples.text/src/org/eclipse/gef/examples/text/figures/BulletBorder.java
@@ -25,7 +25,7 @@
  */
 public class BulletBorder extends ListItemBorder {
 
-	private static final String BULLET = " \u25cf ";
+	private static final String BULLET = " \u25cf "; //$NON-NLS-1$
 
 	@Override
 	public Insets getInsets(IFigure figure) {
diff --git a/org.eclipse.gef/src/org/eclipse/gef/handles/CornerTriangleBorder.java b/org.eclipse.gef/src/org/eclipse/gef/handles/CornerTriangleBorder.java
index adb0e6c7f..e7e965d78 100644
--- a/org.eclipse.gef/src/org/eclipse/gef/handles/CornerTriangleBorder.java
+++ b/org.eclipse.gef/src/org/eclipse/gef/handles/CornerTriangleBorder.java
@@ -29,6 +29,7 @@
  *
  * @deprecated this class is no longer used
  */
+@Deprecated
 public final class CornerTriangleBorder extends AbstractBorder {
 
 	private boolean isPrimary = true;
@@ -39,7 +40,6 @@ public final class CornerTriangleBorder extends AbstractBorder {
 	 * @param isPrimary Determines this border's color.
 	 */
 	public CornerTriangleBorder(boolean isPrimary) {
-		super();
 		this.isPrimary = isPrimary;
 	}
 
@@ -72,7 +72,7 @@ public Insets getInsets(IFigure figure) {
 	@Override
 	public void paint(IFigure figure, Graphics graphics, Insets insets) {
 		// Don't paint the center of the figure.
-		int width = 1, edgeSize;
+		int width = 1;
 		Rectangle rect = tempRect;
 		tempRect.setBounds(getPaintRectangle(figure, insets));
 		rect.width--;
@@ -83,7 +83,7 @@ public void paint(IFigure figure, Graphics graphics, Insets insets) {
 		// Draw the primary handles one pixel larger than the secondary
 		// handles. Primary which paints as black with white border looks
 		// smaller than secondary which paints as white with black border.
-		edgeSize = isPrimary() ? 7 : 6;
+		int edgeSize = isPrimary() ? 7 : 6;
 
 		// Top left corner
 		PointList pList = new PointList();
diff --git a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java
index b73f2c4f6..bfdf08839 100644
--- a/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java
+++ b/org.eclipse.gef/src/org/eclipse/gef/internal/ui/palette/editparts/DropShadowButtonBorder.java
@@ -28,9 +28,9 @@ class DropShadowButtonBorder extends AbstractBorder {
 
 	protected Insets insets = new Insets(1, 1, 3, 3);
 
-	private static final Color highlight = ColorConstants.menuBackgroundSelected,
-			dropshadow2 = new Color(null, ViewForm.borderMiddleRGB),
-			dropshadow3 = new Color(null, ViewForm.borderOutsideRGB);
+	private static final Color highlight = ColorConstants.menuBackgroundSelected;
+	private static final Color dropshadow2 = new Color(null, ViewForm.borderMiddleRGB);
+	private static final Color dropshadow3 = new Color(null, ViewForm.borderOutsideRGB);
 
 	/**
 	 * Returns the space used by the border for the figure provided as input. In
diff --git a/org.eclipse.zest.examples/src/org/eclipse/zest/examples/uml/CompartmentFigure.java b/org.eclipse.zest.examples/src/org/eclipse/zest/examples/uml/CompartmentFigure.java
index cbe08723c..e36438d41 100644
--- a/org.eclipse.zest.examples/src/org/eclipse/zest/examples/uml/CompartmentFigure.java
+++ b/org.eclipse.zest.examples/src/org/eclipse/zest/examples/uml/CompartmentFigure.java
@@ -16,6 +16,7 @@
 import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.OrderedLayout;
 import org.eclipse.draw2d.ToolbarLayout;
 import org.eclipse.draw2d.geometry.Insets;
 
@@ -23,7 +24,7 @@ public class CompartmentFigure extends Figure {
 
 	public CompartmentFigure() {
 		ToolbarLayout layout = new ToolbarLayout();
-		layout.setMinorAlignment(ToolbarLayout.ALIGN_TOPLEFT);
+		layout.setMinorAlignment(OrderedLayout.ALIGN_TOPLEFT);
 		layout.setStretchMinorAxis(false);
 		layout.setSpacing(2);
 		setLayoutManager(layout);