Use getInstance() instead of INSTANCE for access to singleton Plugins

Author: Phillipus

com.archimatetool.canvas/src/com/archimatetool/canvas/CanvasEditorPlugin.java

@@ -22,18 +22,23 @@ public class CanvasEditorPlugin extends AbstractUIPlugin {
 
     public static final String PLUGIN_ID = "com.archimatetool.canvas"; //$NON-NLS-1$
 
-    /**
-     * The shared instance
-     */
-    public static CanvasEditorPlugin INSTANCE;
+    // The shared instance
+    private static CanvasEditorPlugin instance;
 
     /**
      * The File location of this plugin folder
      */
     private static File fPluginFolder;
 
+    /**
+     * @return the shared instance
+     */
+    public static CanvasEditorPlugin getInstance() {
+        return instance;
+    }
+
     public CanvasEditorPlugin() {
-        INSTANCE = this;
+        instance = this;
     }
 
     /**

com.archimatetool.canvas/src/com/archimatetool/canvas/ICanvasImages.java

@@ -17,7 +17,7 @@
  */
 public interface ICanvasImages {
 
-    ImageFactory ImageFactory = new ImageFactory(CanvasEditorPlugin.INSTANCE);
+    ImageFactory ImageFactory = new ImageFactory(CanvasEditorPlugin.getInstance());
 
     String IMGPATH = "img/"; //$NON-NLS-1$