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$
 

com.archimatetool.canvas/src/com/archimatetool/canvas/NewCanvasExtensionContributionFactory.java

@@ -175,7 +175,7 @@ public EvaluationResult evaluate(IEvaluationContext context) throws CoreExceptio
             fCurrentFolder = null;
 
             // Evaluate visibility here (otherwise we might see an empty "New" menu item if Canvas is not enabled)
-            if(!CanvasEditorPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.CANVAS_EDITOR_ENABLED)) {
+            if(!CanvasEditorPlugin.getInstance().getPreferenceStore().getBoolean(IPreferenceConstants.CANVAS_EDITOR_ENABLED)) {
                 return EvaluationResult.FALSE;
             }
 

com.archimatetool.canvas/src/com/archimatetool/canvas/NewModelWithCanvasExtensionContributionFactory.java

@@ -132,7 +132,7 @@ public ImageDescriptor getImageDescriptor() {
     private Expression visibleExpression = new Expression() {
         @Override
         public EvaluationResult evaluate(IEvaluationContext context) throws CoreException {
-            boolean isVisible = CanvasEditorPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.CANVAS_EDITOR_ENABLED);
+            boolean isVisible = CanvasEditorPlugin.getInstance().getPreferenceStore().getBoolean(IPreferenceConstants.CANVAS_EDITOR_ENABLED);
             return isVisible ? EvaluationResult.TRUE : EvaluationResult.FALSE;
         }
     };

com.archimatetool.canvas/src/com/archimatetool/canvas/SaveAsCanvasExtensionContributionFactory.java

@@ -43,7 +43,7 @@ public SaveAsCanvasExtensionContributionFactory() {
 
     @Override
     public void createContributionItems(IServiceLocator serviceLocator, IContributionRoot additions) {
-        boolean enabled = CanvasEditorPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.CANVAS_EDITOR_ENABLED);
+        boolean enabled = CanvasEditorPlugin.getInstance().getPreferenceStore().getBoolean(IPreferenceConstants.CANVAS_EDITOR_ENABLED);
         if(!enabled) {
             return;
         }

com.archimatetool.canvas/src/com/archimatetool/canvas/figures/CanvasStickyFigure.java

@@ -185,7 +185,7 @@ protected void paintFigure(Graphics graphics) {
 
     @Override
     public IFigure getToolTip() {
-        if(!ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.VIEW_TOOLTIPS)) {
+        if(!ArchiPlugin.getInstance().getPreferenceStore().getBoolean(IPreferenceConstants.VIEW_TOOLTIPS)) {
             return null;
         }
 

com.archimatetool.canvas/src/com/archimatetool/canvas/preferences/CanvasPreferencePage.java

@@ -34,7 +34,7 @@ public class CanvasPreferencePage
     private Button fCanvasEditorEnabledButton;
 
 	public CanvasPreferencePage() {
-		setPreferenceStore(CanvasEditorPlugin.INSTANCE.getPreferenceStore());
+		setPreferenceStore(CanvasEditorPlugin.getInstance().getPreferenceStore());
 	}
 
     @Override

com.archimatetool.canvas/src/com/archimatetool/canvas/preferences/PreferenceInitializer.java

@@ -22,7 +22,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer
 
     @Override
     public void initializeDefaultPreferences() {
-		IPreferenceStore store = CanvasEditorPlugin.INSTANCE.getPreferenceStore();
+		IPreferenceStore store = CanvasEditorPlugin.getInstance().getPreferenceStore();
 
 		store.setDefault(CANVAS_EDITOR_ENABLED, true);
     }

com.archimatetool.canvas/src/com/archimatetool/canvas/templates/model/CanvasTemplateManager.java

@@ -34,7 +34,7 @@ public class CanvasTemplateManager extends TemplateManager {
     @Override
     protected ITemplateGroup loadInbuiltTemplates() {
         ITemplateGroup group = new TemplateGroup(Messages.CanvasTemplateManager_0);
-        File folder = CanvasEditorPlugin.INSTANCE.getTemplatesFolder();
+        File folder = CanvasEditorPlugin.getInstance().getTemplatesFolder();
         if(folder.exists()) {
             for(File file : folder.listFiles()) {
                 if(file.getName().toLowerCase().endsWith(CANVAS_TEMPLATE_FILE_EXTENSION)) {
@@ -52,7 +52,7 @@ protected ITemplateGroup loadInbuiltTemplates() {
 
     @Override
     public File getUserTemplatesManifestFile() {
-        return new File(ArchiPlugin.INSTANCE.getWorkspaceFolder(), "canvasses.xml"); //$NON-NLS-1$
+        return new File(ArchiPlugin.getInstance().getWorkspaceFolder(), "canvasses.xml"); //$NON-NLS-1$
     }
 
     @Override

com.archimatetool.canvas/src/com/archimatetool/canvas/templates/wizard/SaveCanvasAsTemplateWizardPage.java

@@ -96,7 +96,7 @@ public void createControl(Composite parent) {
         String defaultFileName = Messages.SaveCanvasAsTemplateWizardPage_3 + CanvasTemplateManager.CANVAS_TEMPLATE_FILE_EXTENSION;
 
         // Get last folder used
-        String lastFolderName = CanvasEditorPlugin.INSTANCE.getPreferenceStore().getString(PREFS_LAST_FOLDER);
+        String lastFolderName = CanvasEditorPlugin.getInstance().getPreferenceStore().getString(PREFS_LAST_FOLDER);
         File lastFolder = new File(lastFolderName);
         if(lastFolder.exists() && lastFolder.isDirectory()) {
             fFileTextField.setText(new File(lastFolder, defaultFileName).getPath());
@@ -307,7 +307,7 @@ void storePreferences() {
         // Store current folder
         File parentFile = new File(getFileName()).getAbsoluteFile().getParentFile(); // Make sure to use absolute file
         if(parentFile != null) {
-            IPreferenceStore store = CanvasEditorPlugin.INSTANCE.getPreferenceStore();
+            IPreferenceStore store = CanvasEditorPlugin.getInstance().getPreferenceStore();
             store.setValue(PREFS_LAST_FOLDER, parentFile.getAbsolutePath());
         }
     }