[529148] Format and cleanup (without change)

This commit only formats and cleans up the copied class. It does not
modify the behavior of the class.

Bug: 529148
Change-Id: Ie9b029bfcd3f46f9ba22e9faa89f0d7242fc59fa
Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>

1 files changed, 179 insertions, 202 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/SiriusRulerComposite.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/SiriusRulerComposite.java
index 62e293714c..07e8b4b4b0 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/SiriusRulerComposite.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/internal/editor/SiriusRulerComposite.java
@@ -15,22 +15,7 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
 import org.eclipse.core.runtime.Assert;
-
 import org.eclipse.draw2d.AbstractBorder;
 import org.eclipse.draw2d.ColorConstants;
 import org.eclipse.draw2d.DefaultRangeModel;
@@ -41,7 +26,6 @@ import org.eclipse.draw2d.PositionConstants;
 import org.eclipse.draw2d.RangeModel;
 import org.eclipse.draw2d.Viewport;
 import org.eclipse.draw2d.geometry.Insets;
-
 import org.eclipse.gef.DragTracker;
 import org.eclipse.gef.EditDomain;
 import org.eclipse.gef.EditPart;
@@ -57,47 +41,72 @@ import org.eclipse.gef.internal.ui.rulers.RulerRootEditPart;
 import org.eclipse.gef.rulers.RulerProvider;
 import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
 import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.gef.ui.rulers.RulerComposite;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
 
 /**
- * A RulerComposite is used to show rulers to the north and west of the control
- * of a given {@link #setGraphicalViewer(ScrollingGraphicalViewer) graphical
- * viewer}. The rulers will be shown based on whether or not
- * {@link org.eclipse.gef.rulers.RulerProvider#PROPERTY_HORIZONTAL_RULER
- * horizontal ruler} and
- * {@link org.eclipse.gef.rulers.RulerProvider#PROPERTY_VERTICAL_RULER vertical
- * ruler} properties are set on the given viewer, and the value of the
- * {@link org.eclipse.gef.rulers.RulerProvider#PROPERTY_RULER_VISIBILITY
- * visibility} property.
- * 
- * Class copied from {@link RulerComposite} to associate a specific Sirius {@link RulerEditPartFactory} to the left ruler.
- * 
+ * A RulerComposite is used to show rulers to the north and west of the control of a given
+ * {@link #setGraphicalViewer(ScrollingGraphicalViewer) graphical viewer}. The rulers will be shown based on whether or
+ * not {@link org.eclipse.gef.rulers.RulerProvider#PROPERTY_HORIZONTAL_RULER horizontal ruler} and
+ * {@link org.eclipse.gef.rulers.RulerProvider#PROPERTY_VERTICAL_RULER vertical ruler} properties are set on the given
+ * viewer, and the value of the {@link org.eclipse.gef.rulers.RulerProvider#PROPERTY_RULER_VISIBILITY visibility}
+ * property.
+ *
+ * Class copied from {@link RulerComposite} to associate a specific Sirius {@link RulerEditPartFactory} to the left
+ * ruler.
+ *
  * @author Pratik Shah
  * @author Laurent Redor (lredor)
  */
-public class SiriusRulerComposite extends Composite {
+@SuppressWarnings("restriction")
+public class SiriusRulerComposite extends RulerComposite {
 
     private EditDomain rulerEditDomain;
-    private GraphicalViewer left, top;
+
+    private GraphicalViewer left;
+
+    private GraphicalViewer top;
+
     private FigureCanvas editor;
+
     private GraphicalViewer diagramViewer;
+
     private Font font;
+
     private Listener layoutListener;
+
     private PropertyChangeListener propertyListener;
-    private boolean layingOut = false;
+
+    private boolean layingOut;
+
     private boolean isRulerVisible = true;
-    private boolean needToLayout = false;
+
+    private boolean needToLayout;
+
     private Runnable runnable = new Runnable() {
+        @Override
         public void run() {
             layout(false);
         }
     };
 
     /**
-     * Constructor
-     * 
+     * Constructor.
+     *
      * @param parent
-     *            a widget which will be the parent of the new instance (cannot
-     *            be null)
+     *            a widget which will be the parent of the new instance (cannot be null)
      * @param style
      *            the style of widget to construct
      * @see Composite#Composite(org.eclipse.swt.widgets.Composite, int)
@@ -105,6 +114,7 @@ public class SiriusRulerComposite extends Composite {
     public SiriusRulerComposite(Composite parent, int style) {
         super(parent, style);
         addDisposeListener(new DisposeListener() {
+            @Override
             public void widgetDisposed(DisposeEvent e) {
                 disposeResources();
             }
@@ -112,11 +122,11 @@ public class SiriusRulerComposite extends Composite {
     }
 
     /**
-     * Calculates the proper trim. Includes scrollbars' sizes only if they're
-     * visible.
-     * 
+     * Calculates the proper trim. Includes scrollbars' sizes only if they're visible.
+     *
      * @param canvas
      *            The canvas.
+     * @return A rectangle representing the proper trim.
      * @since 3.6
      */
     public static Rectangle calculateEditorTrim(Canvas canvas) {
@@ -125,8 +135,7 @@ public class SiriusRulerComposite extends Composite {
          */
         Rectangle bounds = canvas.getBounds();
         Rectangle clientArea = canvas.getClientArea();
-        Rectangle result = new Rectangle(0, 0, bounds.width - clientArea.width,
-                bounds.height - clientArea.height);
+        Rectangle result = new Rectangle(0, 0, bounds.width - clientArea.width, bounds.height - clientArea.height);
         if (result.width != 0 || result.height != 0) {
             Rectangle trim = canvas.computeTrim(0, 0, 0, 0);
             result.x = result.height == 0 ? 0 : trim.x;
@@ -137,9 +146,10 @@ public class SiriusRulerComposite extends Composite {
 
     /**
      * Calculates the proper trim for the ruler.
-     * 
+     *
      * @param canvas
      *            The canvas.
+     * @return A rectangle representing the proper trim for the ruler.
      * @since 3.6
      */
     public static Rectangle calculateRulerTrim(Canvas canvas) {
@@ -156,15 +166,13 @@ public class SiriusRulerComposite extends Composite {
 
     private GraphicalViewer createRulerContainer(int orientation) {
         ScrollingGraphicalViewer viewer = new RulerViewer();
-        final boolean isHorizontal = orientation == PositionConstants.NORTH
-                || orientation == PositionConstants.SOUTH;
+        final boolean isHorizontal = orientation == PositionConstants.NORTH || orientation == PositionConstants.SOUTH;
 
         // Finish initializing the viewer
         viewer.setRootEditPart(new RulerRootEditPart(isHorizontal));
         viewer.setEditPartFactory(new RulerEditPartFactory(diagramViewer));
         viewer.createControl(this);
-        ((GraphicalEditPart) viewer.getRootEditPart()).getFigure().setBorder(
-                new RulerBorder(isHorizontal));
+        ((GraphicalEditPart) viewer.getRootEditPart()).getFigure().setBorder(new RulerBorder(isHorizontal));
         viewer.setProperty(GraphicalViewer.class.toString(), diagramViewer);
 
         // Configure the viewer's control
@@ -172,25 +180,22 @@ public class SiriusRulerComposite extends Composite {
         canvas.setScrollBarVisibility(FigureCanvas.NEVER);
         if (font == null) {
             FontData[] data = canvas.getFont().getFontData();
-            for (int i = 0; i < data.length; i++) {
-                data[i].setHeight(data[i].getHeight() - 1);
+            for (FontData element : data) {
+                element.setHeight(element.getHeight() - 1);
             }
             font = new Font(Display.getCurrent(), data);
         }
         canvas.setFont(font);
         if (isHorizontal) {
-            canvas.getViewport().setHorizontalRangeModel(
-                    editor.getViewport().getHorizontalRangeModel());
+            canvas.getViewport().setHorizontalRangeModel(editor.getViewport().getHorizontalRangeModel());
         } else {
-            canvas.getViewport().setVerticalRangeModel(
-                    editor.getViewport().getVerticalRangeModel());
+            canvas.getViewport().setVerticalRangeModel(editor.getViewport().getVerticalRangeModel());
         }
 
         // Add the viewer to the rulerEditDomain
         if (rulerEditDomain == null) {
             rulerEditDomain = new EditDomain();
-            rulerEditDomain.setCommandStack(diagramViewer.getEditDomain()
-                    .getCommandStack());
+            rulerEditDomain.setCommandStack(diagramViewer.getEditDomain().getCommandStack());
         }
         rulerEditDomain.addViewer(viewer);
 
@@ -198,22 +203,23 @@ public class SiriusRulerComposite extends Composite {
     }
 
     private void disposeResources() {
-        if (diagramViewer != null)
+        if (diagramViewer != null) {
             diagramViewer.removePropertyChangeListener(propertyListener);
-        if (font != null)
+        }
+        if (font != null) {
             font.dispose();
-        // layoutListener is not being removed from the scroll bars because they
-        // are already
-        // disposed at this point.
+            // layoutListener is not being removed from the scroll bars because they
+            // are already disposed at this point.
+        }
     }
 
     private void disposeRulerViewer(GraphicalViewer viewer) {
-        if (viewer == null)
+        if (viewer == null) {
             return;
+        }
         /*
-         * There's a tie from the editor's range model to the RulerViewport (via
-         * a listener) to the RulerRootEditPart to the RulerViewer. Break this
-         * tie so that the viewer doesn't leak and can be garbage collected.
+         * There's a tie from the editor's range model to the RulerViewport (via a listener) to the RulerRootEditPart to
+         * the RulerViewer. Break this tie so that the viewer doesn't leak and can be garbage collected.
          */
         RangeModel rModel = new DefaultRangeModel();
         Viewport port = ((FigureCanvas) viewer.getControl()).getViewport();
@@ -225,31 +231,32 @@ public class SiriusRulerComposite extends Composite {
 
     /**
      * Perform the ruler layout.
-     * 
+     *
      * @since 3.6
      */
+    @Override
     public void doLayout() {
         if (left == null && top == null) {
             Rectangle area = getClientArea();
-            if (editor != null && !editor.isDisposed()
-                    && !editor.getBounds().equals(area))
+            if (editor != null && !editor.isDisposed() && !editor.getBounds().equals(area)) {
                 editor.setBounds(area);
+            }
             return;
         }
 
-        int leftWidth = 0, topHeight = 0;
-        Rectangle leftTrim = null, topTrim = null;
+        int leftWidth = 0;
+        int topHeight = 0;
+        Rectangle leftTrim = null;
+        Rectangle topTrim = null;
         if (left != null) {
-            leftTrim = calculateRulerTrim((Canvas) left.getControl());
+            leftTrim = SiriusRulerComposite.calculateRulerTrim((Canvas) left.getControl());
             // Adding the trim width here because FigureCanvas#computeSize()
             // does not
-            leftWidth = left.getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT).x
-                    + leftTrim.width;
+            leftWidth = left.getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT).x + leftTrim.width;
         }
         if (top != null) {
-            topTrim = calculateRulerTrim((Canvas) top.getControl());
-            topHeight = top.getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT).y
-                    + topTrim.height;
+            topTrim = SiriusRulerComposite.calculateRulerTrim((Canvas) top.getControl());
+            topHeight = top.getControl().computeSize(SWT.DEFAULT, SWT.DEFAULT).y + topTrim.height;
         }
 
         Rectangle editorSize = getClientArea();
@@ -260,20 +267,16 @@ public class SiriusRulerComposite extends Composite {
         editor.setBounds(editorSize);
 
         /*
-         * Fix for Bug# 67554 Take trim into account. Some platforms (such as
-         * MacOS and Motif) leave some trimming around some canvasses.
+         * Fix for Bug# 67554 Take trim into account. Some platforms (such as MacOS and Motif) leave some trimming
+         * around some canvasses.
          */
-        Rectangle trim = calculateEditorTrim(editor);
+        Rectangle trim = SiriusRulerComposite.calculateEditorTrim(editor);
         if (left != null) {
             // The - 1 and + 1 are to compensate for the RulerBorder
-            left.getControl().setBounds(0, topHeight - trim.x + leftTrim.x - 1,
-                    leftWidth,
-                    editorSize.height - trim.height + leftTrim.height + 1);
+            left.getControl().setBounds(0, topHeight - trim.x + leftTrim.x - 1, leftWidth, editorSize.height - trim.height + leftTrim.height + 1);
         }
         if (top != null) {
-            top.getControl().setBounds(leftWidth - trim.y + topTrim.y - 1, 0,
-                    editorSize.width - trim.width + topTrim.width + 1,
-                    topHeight);
+            top.getControl().setBounds(leftWidth - trim.y + topTrim.y - 1, 0, editorSize.width - trim.width + topTrim.width + 1, topHeight);
         }
     }
 
@@ -285,13 +288,14 @@ public class SiriusRulerComposite extends Composite {
             break;
         case PositionConstants.WEST:
             result = left;
+            break;
+        default:
+            break;
         }
         return result;
     }
 
-    /**
-     * @see org.eclipse.swt.widgets.Composite#layout(boolean)
-     */
+    @Override
     public void layout(boolean change) {
         if (!layingOut && !isDisposed()) {
             checkWidget();
@@ -307,20 +311,17 @@ public class SiriusRulerComposite extends Composite {
     /**
      * Creates rulers for the given graphical viewer.
      * <p>
-     * The primaryViewer or its Control cannot be <code>null</code>. The
-     * primaryViewer's Control should be a FigureCanvas and a child of this
-     * Composite. This method should only be invoked once.
+     * The primaryViewer or its Control cannot be <code>null</code>. The primaryViewer's Control should be a
+     * FigureCanvas and a child of this Composite. This method should only be invoked once.
      * <p>
-     * To create ruler(s), simply add the RulerProvider(s) (with the right key:
-     * RulerProvider.PROPERTY_HORIZONTAL_RULER or
-     * RulerProvider.PROPERTY_VERTICAL_RULER) as a property on the given viewer.
-     * It can be done after this method is invoked.
-     * RulerProvider.PROPERTY_RULER_VISIBILITY can be used to show/hide the
-     * rulers.
-     * 
+     * To create ruler(s), simply add the RulerProvider(s) (with the right key: RulerProvider.PROPERTY_HORIZONTAL_RULER
+     * or RulerProvider.PROPERTY_VERTICAL_RULER) as a property on the given viewer. It can be done after this method is
+     * invoked. RulerProvider.PROPERTY_RULER_VISIBILITY can be used to show/hide the rulers.
+     *
      * @param primaryViewer
      *            The graphical viewer for which the rulers have to be created
      */
+    @Override
     public void setGraphicalViewer(ScrollingGraphicalViewer primaryViewer) {
         // pre-conditions
         Assert.isNotNull(primaryViewer);
@@ -331,15 +332,12 @@ public class SiriusRulerComposite extends Composite {
         editor = (FigureCanvas) diagramViewer.getControl();
 
         // layout whenever the scrollbars are shown or hidden, and whenever the
-        // RulerComposite
-        // is resized
+        // RulerComposite is resized
         layoutListener = new Listener() {
+            @Override
             public void handleEvent(Event event) {
-                // @TODO:Pratik If you use Display.asyncExec(runnable) here,
-                // some flashing
-                // occurs. You can see it when the palette is in the editor, and
-                // you hit
-                // the button to show/hide it.
+                // @TODO:Pratik If you use Display.asyncExec(runnable) here, some flashing occurs. You can see it when
+                // the palette is in the editor, and you hit the button to show/hide it.
                 layout(true);
             }
         };
@@ -350,47 +348,34 @@ public class SiriusRulerComposite extends Composite {
         editor.getVerticalBar().addListener(SWT.Hide, layoutListener);
 
         propertyListener = new PropertyChangeListener() {
+            @Override
             public void propertyChange(PropertyChangeEvent evt) {
                 String property = evt.getPropertyName();
                 if (RulerProvider.PROPERTY_HORIZONTAL_RULER.equals(property)) {
-                    setRuler(
-                            (RulerProvider) diagramViewer
-                                    .getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER),
-                            PositionConstants.NORTH);
-                } else if (RulerProvider.PROPERTY_VERTICAL_RULER
-                        .equals(property)) {
-                    setRuler(
-                            (RulerProvider) diagramViewer
-                                    .getProperty(RulerProvider.PROPERTY_VERTICAL_RULER),
-                            PositionConstants.WEST);
-                } else if (RulerProvider.PROPERTY_RULER_VISIBILITY
-                        .equals(property))
-                    setRulerVisibility(((Boolean) diagramViewer
-                            .getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY))
-                            .booleanValue());
+                    setRuler((RulerProvider) diagramViewer.getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER), PositionConstants.NORTH);
+                } else if (RulerProvider.PROPERTY_VERTICAL_RULER.equals(property)) {
+                    setRuler((RulerProvider) diagramViewer.getProperty(RulerProvider.PROPERTY_VERTICAL_RULER), PositionConstants.WEST);
+                } else if (RulerProvider.PROPERTY_RULER_VISIBILITY.equals(property)) {
+                    setRulerVisibility(((Boolean) diagramViewer.getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY)).booleanValue());
+                }
             }
         };
         diagramViewer.addPropertyChangeListener(propertyListener);
-        Boolean rulerVisibility = (Boolean) diagramViewer
-                .getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY);
-        if (rulerVisibility != null)
+        Boolean rulerVisibility = (Boolean) diagramViewer.getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY);
+        if (rulerVisibility != null) {
             setRulerVisibility(rulerVisibility.booleanValue());
-        setRuler(
-                (RulerProvider) diagramViewer
-                        .getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER),
-                PositionConstants.NORTH);
-        setRuler(
-                (RulerProvider) diagramViewer
-                        .getProperty(RulerProvider.PROPERTY_VERTICAL_RULER),
-                PositionConstants.WEST);
+        }
+        setRuler((RulerProvider) diagramViewer.getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER), PositionConstants.NORTH);
+        setRuler((RulerProvider) diagramViewer.getProperty(RulerProvider.PROPERTY_VERTICAL_RULER), PositionConstants.WEST);
     }
 
     private void setRuler(RulerProvider provider, int orientation) {
         Object ruler = null;
-        if (isRulerVisible && provider != null)
+        if (isRulerVisible && provider != null) {
             // provider.getRuler() might return null (at least the API does not
             // prevent that)
             ruler = provider.getRuler();
+        }
 
         if (ruler == null) {
             // Ruler is not visible or is not present
@@ -414,13 +399,15 @@ public class SiriusRulerComposite extends Composite {
 
     private void setRulerContainer(GraphicalViewer container, int orientation) {
         if (orientation == PositionConstants.NORTH) {
-            if (top == container)
+            if (top == container) {
                 return;
+            }
             disposeRulerViewer(top);
             top = container;
         } else if (orientation == PositionConstants.WEST) {
-            if (left == container)
+            if (left == container) {
                 return;
+            }
             disposeRulerViewer(left);
             left = container;
         }
@@ -430,70 +417,55 @@ public class SiriusRulerComposite extends Composite {
         if (isRulerVisible != isVisible) {
             isRulerVisible = isVisible;
             if (diagramViewer != null) {
-                setRuler(
-                        (RulerProvider) diagramViewer
-                                .getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER),
-                        PositionConstants.NORTH);
-                setRuler(
-                        (RulerProvider) diagramViewer
-                                .getProperty(RulerProvider.PROPERTY_VERTICAL_RULER),
-                        PositionConstants.WEST);
+                setRuler((RulerProvider) diagramViewer.getProperty(RulerProvider.PROPERTY_HORIZONTAL_RULER), PositionConstants.NORTH);
+                setRuler((RulerProvider) diagramViewer.getProperty(RulerProvider.PROPERTY_VERTICAL_RULER), PositionConstants.WEST);
             }
         }
     }
 
     private static class RulerBorder extends AbstractBorder {
         private static final Insets H_INSETS = new Insets(0, 1, 0, 0);
+
         private static final Insets V_INSETS = new Insets(1, 0, 0, 0);
+
         private boolean horizontal;
 
         /**
          * Constructor
-         * 
+         *
          * @param isHorizontal
-         *            whether or not the ruler being bordered is horizontal or
-         *            not
+         *            whether or not the ruler being bordered is horizontal or not
          */
-        public RulerBorder(boolean isHorizontal) {
+        RulerBorder(boolean isHorizontal) {
             horizontal = isHorizontal;
         }
 
         /**
          * @see org.eclipse.draw2d.Border#getInsets(org.eclipse.draw2d.IFigure)
          */
+        @Override
         public Insets getInsets(IFigure figure) {
-            return horizontal ? H_INSETS : V_INSETS;
+            return horizontal ? RulerBorder.H_INSETS : RulerBorder.V_INSETS;
         }
 
         /**
-         * @see org.eclipse.draw2d.Border#paint(org.eclipse.draw2d.IFigure,
-         *      org.eclipse.draw2d.Graphics, org.eclipse.draw2d.geometry.Insets)
+         * @see org.eclipse.draw2d.Border#paint(org.eclipse.draw2d.IFigure, org.eclipse.draw2d.Graphics,
+         *      org.eclipse.draw2d.geometry.Insets)
          */
+        @Override
         public void paint(IFigure figure, Graphics graphics, Insets insets) {
             graphics.setForegroundColor(ColorConstants.buttonDarker);
             if (horizontal) {
-                graphics.drawLine(
-                        figure.getBounds().getTopLeft(),
-                        figure.getBounds()
-                                .getBottomLeft()
-                                .translate(
-                                        new org.eclipse.draw2d.geometry.Point(
-                                                0, -4)));
+                graphics.drawLine(figure.getBounds().getTopLeft(), figure.getBounds().getBottomLeft().translate(new org.eclipse.draw2d.geometry.Point(0, -4)));
             } else {
-                graphics.drawLine(
-                        figure.getBounds().getTopLeft(),
-                        figure.getBounds()
-                                .getTopRight()
-                                .translate(
-                                        new org.eclipse.draw2d.geometry.Point(
-                                                -4, 0)));
+                graphics.drawLine(figure.getBounds().getTopLeft(), figure.getBounds().getTopRight().translate(new org.eclipse.draw2d.geometry.Point(-4, 0)));
             }
         }
     }
 
     /**
      * Custom graphical viewer intended to be used for rulers.
-     * 
+     *
      * @author Pratik Shah
      * @since 3.0
      */
@@ -501,7 +473,7 @@ public class SiriusRulerComposite extends Composite {
         /**
          * Constructor
          */
-        public RulerViewer() {
+        RulerViewer() {
             super();
             init();
         }
@@ -509,9 +481,13 @@ public class SiriusRulerComposite extends Composite {
         /**
          * @see org.eclipse.gef.EditPartViewer#appendSelection(org.eclipse.gef.EditPart)
          */
+        @Override
         public void appendSelection(EditPart editpart) {
-            if (editpart instanceof RootEditPart)
+            if (editpart instanceof RootEditPart) {
+                // CHECKSTYLE:OFF
                 editpart = ((RootEditPart) editpart).getContents();
+                // CHECKSTYLE:ON
+            }
             setFocus(editpart);
             super.appendSelection(editpart);
         }
@@ -519,16 +495,19 @@ public class SiriusRulerComposite extends Composite {
         /**
          * @see org.eclipse.gef.GraphicalViewer#findHandleAt(org.eclipse.draw2d.geometry.Point)
          */
+        @Override
         public Handle findHandleAt(org.eclipse.draw2d.geometry.Point p) {
-            final GraphicalEditPart gep = (GraphicalEditPart) findObjectAtExcluding(
-                    p, new ArrayList());
-            if (gep == null || !(gep instanceof GuideEditPart))
+            final GraphicalEditPart gep = (GraphicalEditPart) findObjectAtExcluding(p, new ArrayList());
+            if (gep == null || !(gep instanceof GuideEditPart)) {
                 return null;
+            }
             return new Handle() {
+                @Override
                 public DragTracker getDragTracker() {
                     return ((GuideEditPart) gep).getDragTracker(null);
                 }
 
+                @Override
                 public org.eclipse.draw2d.geometry.Point getAccessibleLocation() {
                     return null;
                 }
@@ -538,26 +517,29 @@ public class SiriusRulerComposite extends Composite {
         /**
          * @see org.eclipse.gef.ui.parts.AbstractEditPartViewer#init()
          */
+        @Override
         protected void init() {
             setContextMenu(new RulerContextMenuProvider(this));
             setKeyHandler(new RulerKeyHandler(this));
         }
 
         /**
-         * Requests to reveal a ruler are ignored since that causes undesired
-         * scrolling to the origin of the ruler
-         * 
+         * Requests to reveal a ruler are ignored since that causes undesired scrolling to the origin of the ruler
+         *
          * @see org.eclipse.gef.EditPartViewer#reveal(org.eclipse.gef.EditPart)
          */
+        @Override
         public void reveal(EditPart part) {
-            if (part != getContents())
+            if (part != getContents()) {
                 super.reveal(part);
+            }
         }
 
         /**
-         * 
+         *
          * @see org.eclipse.gef.ui.parts.GraphicalViewerImpl#handleFocusGained(org.eclipse.swt.events.FocusEvent)
          */
+        @Override
         protected void handleFocusGained(FocusEvent fe) {
             if (focusPart == null) {
                 setFocus(getContents());
@@ -566,9 +548,10 @@ public class SiriusRulerComposite extends Composite {
         }
 
         /**
-         * 
+         *
          * @see org.eclipse.gef.ui.parts.GraphicalViewerImpl#handleFocusLost(org.eclipse.swt.events.FocusEvent)
          */
+        @Override
         protected void handleFocusLost(FocusEvent fe) {
             super.handleFocusLost(fe);
             if (focusPart == getContents()) {
@@ -578,84 +561,78 @@ public class SiriusRulerComposite extends Composite {
 
         /**
          * Custom KeyHandler intended to be used with a RulerViewer
-         * 
+         *
          * @author Pratik Shah
          * @since 3.0
          */
-        protected static class RulerKeyHandler extends
-                GraphicalViewerKeyHandler {
+        protected static class RulerKeyHandler extends GraphicalViewerKeyHandler {
             /**
              * Constructor
-             * 
+             *
              * @param viewer
-             *            The viewer for which this handler processes keyboard
-             *            input
+             *            The viewer for which this handler processes keyboard input
              */
             public RulerKeyHandler(GraphicalViewer viewer) {
                 super(viewer);
             }
 
-            /**
-             * @see org.eclipse.gef.KeyHandler#keyPressed(org.eclipse.swt.events.KeyEvent)
-             */
+            @Override
             public boolean keyPressed(KeyEvent event) {
+                boolean result;
                 if (event.keyCode == SWT.DEL) {
                     // If a guide has focus, delete it
                     if (getFocusEditPart() instanceof GuideEditPart) {
-                        RulerEditPart parent = (RulerEditPart) getFocusEditPart()
-                                .getParent();
-                        getViewer()
-                                .getEditDomain()
-                                .getCommandStack()
-                                .execute(
-                                        parent.getRulerProvider()
-                                                .getDeleteGuideCommand(
-                                                        getFocusEditPart()
-                                                                .getModel()));
+                        RulerEditPart parent = (RulerEditPart) getFocusEditPart().getParent();
+                        getViewer().getEditDomain().getCommandStack().execute(parent.getRulerProvider().getDeleteGuideCommand(getFocusEditPart().getModel()));
                         event.doit = false;
-                        return true;
+                        result = true;
                     }
-                    return false;
-                } else if (((event.stateMask & SWT.ALT) != 0)
-                        && (event.keyCode == SWT.ARROW_UP)) {
+                    result = false;
+                } else if (((event.stateMask & SWT.ALT) != 0) && (event.keyCode == SWT.ARROW_UP)) {
                     // ALT + UP_ARROW pressed
                     // If a guide has focus, give focus to the ruler
                     EditPart parent = getFocusEditPart().getParent();
-                    if (parent instanceof RulerEditPart)
+                    if (parent instanceof RulerEditPart) {
                         navigateTo(getFocusEditPart().getParent(), event);
-                    return true;
+                    }
+                    result = true;
+                } else {
+                    result = super.keyPressed(event);
                 }
-                return super.keyPressed(event);
+                return result;
             }
         }
     }
 
     /**
      * Retrieve the left ruler graphical viewer.
-     * 
+     *
      * @return The left ruler graphical viewer.
      * @since 3.6
      */
+    @Override
     protected GraphicalViewer getLeft() {
         return left;
     }
 
     /**
      * Retrieve the top ruler graphical viewer.
-     * 
+     *
      * @return The top ruler graphical viewer.
      * @since 3.6
      */
+    @Override
     protected GraphicalViewer getTop() {
         return top;
     }
 
     /**
      * Retrieve the editor figure canvas.
-     * 
+     *
      * @return The editor figure canvas.
      * @since 3.6
      */
+    @Override
     protected FigureCanvas getEditor() {
         return editor;
     }