[442268] Simplify code by removing useless indirections

- Inline the value of boolean fields which were never changed (and not
  changeable) from their initial value.
- Replace method with direct reference to inherited constant.
- Move SEPARATOR constant up into SVGFigure (where it is used).

Bug: 442268
Change-Id: I5bb1a8f7fff66890cff00721dfc02fe740c01ab4
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

3 files changed, 17 insertions, 33 deletions

diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java
index 1e17e8e225..725617d93d 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/AbstractCachedSVGFigure.java
@@ -11,14 +11,12 @@
 package org.eclipse.sirius.diagram.ui.tools.api.figure;
 
 import java.awt.image.BufferedImage;
-import java.text.MessageFormat;
 import java.util.Collection;
 
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.XYLayout;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.sirius.common.tools.api.util.StringUtil;
-import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 import org.eclipse.sirius.diagram.ui.tools.internal.figure.TransparentFigureGraphicsModifier;
 import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.ImageCache;
 import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.SVGUtils;
@@ -38,13 +36,6 @@ import com.google.common.collect.Lists;
  */
 public abstract class AbstractCachedSVGFigure extends SVGFigure implements StyledFigure, ITransparentFigure, ImageFigureWithAlpha {
     /**
-     * Key separator.
-     */
-    protected static final String SEPARATOR = "|"; //$NON-NLS-1$
-
-    private static final String IMAGE_NOT_FOUND_URI = MessageFormat.format("platform:/plugin/{0}/images/NotFound.svg", DiagramUIPlugin.getPlugin().getSymbolicName()); //$NON-NLS-1$
-    
-    /**
      * Cache to store bitmaps of rendered SVGs.
      */
     private static final ImageCache CACHE = new ImageCache();
@@ -111,9 +102,9 @@ public abstract class AbstractCachedSVGFigure extends SVGFigure implements Style
         result.append(aaText);
         result.append(AbstractCachedSVGFigure.SEPARATOR);
         Rectangle r = getClientArea();
-        result.append(getSpecifyCanvasWidth() ? r.width : -1);
+        result.append(r.width);
         result.append(AbstractCachedSVGFigure.SEPARATOR);
-        result.append(getSpecifyCanvasHeight() ? r.height : -1);
+        result.append(r.height);
 
         return result.toString();
     }
@@ -137,8 +128,7 @@ public abstract class AbstractCachedSVGFigure extends SVGFigure implements Style
             if (document == null) {
                 return null;
             }
-
-            getTranscoder().setCanvasSize(getSpecifyCanvasWidth() ? clientArea.width : -1, getSpecifyCanvasHeight() ? clientArea.height : -1);
+            getTranscoder().setCanvasSize(clientArea.width, clientArea.height);
             updateRenderingHints(graphics);
             BufferedImage awtImage = getTranscoder().getBufferedImage();
             if (awtImage != null) {
@@ -161,15 +151,6 @@ public abstract class AbstractCachedSVGFigure extends SVGFigure implements Style
     protected abstract String getKey();
 
     /**
-     * The uri of the image to display when the file has not been found.
-     *
-     * @return The uri of the image to display when the file has not been found.
-     */
-    protected static String getImageNotFoundURI() {
-        return AbstractCachedSVGFigure.IMAGE_NOT_FOUND_URI;
-    }
-
-    /**
      * Remove all entries whose key begins with the given key. Remove from the
      * document map, the entries with the given keys to force to re-read the
      * file.
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java
index d78ba0dce5..69097155eb 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGFigure.java
@@ -15,6 +15,7 @@ package org.eclipse.sirius.diagram.ui.tools.api.figure;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.WeakHashMap;
 
 import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
@@ -23,6 +24,7 @@ import org.eclipse.draw2d.Figure;
 import org.eclipse.draw2d.Graphics;
 import org.eclipse.draw2d.geometry.Rectangle;
 import org.eclipse.sirius.diagram.DiagramPlugin;
+import org.eclipse.sirius.diagram.ui.provider.DiagramUIPlugin;
 import org.eclipse.sirius.diagram.ui.provider.Messages;
 import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.SVGUtils;
 import org.eclipse.sirius.diagram.ui.tools.internal.figure.svg.SimpleImageTranscoder;
@@ -33,10 +35,19 @@ import org.w3c.dom.Document;
 
 //CHECKSTYLE:OFF
 public class SVGFigure extends Figure {
+    /**
+     * The uri of the image to display when the file has not been found.
+     */
+    protected static final String IMAGE_NOT_FOUND_URI = MessageFormat.format("platform:/plugin/{0}/images/NotFound.svg", DiagramUIPlugin.getPlugin().getSymbolicName()); //$NON-NLS-1$
+
+    /**
+     * Key separator.
+     */
+    protected static final String SEPARATOR = "|"; //$NON-NLS-1$
 
     private String uri;
 
-    private boolean failedToLoadDocument, specifyCanvasWidth = true, specifyCanvasHeight = true;
+    private boolean failedToLoadDocument;
 
     private SimpleImageTranscoder transcoder;
 
@@ -138,7 +149,7 @@ public class SVGFigure extends Figure {
         Image image = null;
         try {
             Rectangle r = getClientArea();
-            transcoder.setCanvasSize(specifyCanvasWidth ? r.width : -1, specifyCanvasHeight ? r.height : -1);
+            transcoder.setCanvasSize(r.width, r.height);
             updateRenderingHints(graphics);
             BufferedImage awtImage = transcoder.getBufferedImage();
             if (awtImage != null) {
@@ -210,13 +221,5 @@ public class SVGFigure extends Figure {
     protected SimpleImageTranscoder getTranscoder() {
         return transcoder;
     }
-
-    protected boolean getSpecifyCanvasWidth() {
-        return specifyCanvasWidth;
-    }
-
-    protected boolean getSpecifyCanvasHeight() {
-        return specifyCanvasHeight;
-    }
     // CHECKSTYLE:ON
 }
diff --git a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGWorkspaceImageFigure.java b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGWorkspaceImageFigure.java
index f2a7511684..87df9e60f5 100644
--- a/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGWorkspaceImageFigure.java
+++ b/plugins/org.eclipse.sirius.diagram.ui/src-diag/org/eclipse/sirius/diagram/ui/tools/api/figure/SVGWorkspaceImageFigure.java
@@ -174,7 +174,7 @@ public class SVGWorkspaceImageFigure extends AbstractCachedSVGFigure implements
             if (existingImageUri.some()) {
                 setURI(existingImageUri.get());
             } else {
-                setURI(AbstractCachedSVGFigure.getImageNotFoundURI());
+                setURI(SVGFigure.IMAGE_NOT_FOUND_URI);
             }
             return true;
         }