Use getPreferenceStore() instead of static field PREFERENCES

- We want to avoid using these global static fields

Author: Phillipus

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.PREFERENCES.getBoolean(IPreferenceConstants.VIEW_TOOLTIPS)) {
+        if(!ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.VIEW_TOOLTIPS)) {
             return null;
         }
 

com.archimatetool.editor/src/com/archimatetool/editor/ArchiPlugin.java

@@ -14,10 +14,8 @@
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.osgi.service.datalocation.Location;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
 import org.osgi.framework.Version;
 
 
@@ -49,34 +47,10 @@ public class ArchiPlugin extends AbstractUIPlugin {
      */
     public static ArchiPlugin INSTANCE;
 
-    /**
-     * The shared Preference store
-     */
-    public static IPreferenceStore PREFERENCES;
-
     public ArchiPlugin() {
-    }
-
-    /**
-     * This method is called upon plug-in activation
-     */
-    @Override
-    public void start(BundleContext context) throws Exception {
-        super.start(context);
-        
         INSTANCE = this;
-        PREFERENCES = getPreferenceStore();
     }
 
-    /**
-     * This method is called when the plug-in is stopped
-     */
-    @Override
-    public void stop(BundleContext context) throws Exception {
-        // super must be *last*
-        super.stop(context);
-    }
-    
     /**
      * @return The User data folder use for Archi data
      */ 

com.archimatetool.editor/src/com/archimatetool/editor/ArchiWorkbenchAdvisor.java

@@ -51,7 +51,7 @@ public void initialize(IWorkbenchConfigurer configurer) {
                 "true".equals(System.getProperty("showheap")));
 
         // Edge Browser on Windows
-        if(PlatformUtils.isWindows() && ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.EDGE_BROWSER)) {
+        if(PlatformUtils.isWindows() && ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.EDGE_BROWSER)) {
             System.setProperty("org.eclipse.swt.browser.DefaultType", "edge");
         }
 

com.archimatetool.editor/src/com/archimatetool/editor/ArchiWorkbenchWindowAdvisor.java

@@ -31,7 +31,7 @@ public ArchiWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
         super(configurer);
 
         // Status Line
-        boolean doShowStatusLine = ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.SHOW_STATUS_LINE);
+        boolean doShowStatusLine = ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.SHOW_STATUS_LINE);
         configurer.setShowStatusLine(doShowStatusLine);
     }
 

com.archimatetool.editor/src/com/archimatetool/editor/actions/CheckForNewVersionAction.java

@@ -64,7 +64,7 @@ String getOnlineVersion(URL url) throws IOException {
     @Override
     public void run() {
         try {
-            String versionFile = ArchiPlugin.PREFERENCES.getString(IPreferenceConstants.UPDATE_URL);
+            String versionFile = ArchiPlugin.INSTANCE.getPreferenceStore().getString(IPreferenceConstants.UPDATE_URL);
 
             if(!StringUtils.isSet(versionFile)) {
                 return;
@@ -76,7 +76,7 @@ public void run() {
             String thisVersion = ArchiPlugin.INSTANCE.getVersion();
 
             if(StringUtils.compareVersionNumbers(newVersion, thisVersion) > 0) {
-                String downloadURL = ArchiPlugin.PREFERENCES.getString(IPreferenceConstants.DOWNLOAD_URL);
+                String downloadURL = ArchiPlugin.INSTANCE.getPreferenceStore().getString(IPreferenceConstants.DOWNLOAD_URL);
 
                 // No download URL
                 if(!StringUtils.isSet(downloadURL)) {
@@ -115,7 +115,7 @@ public void run() {
 
     @Override
     public boolean isEnabled() {
-        String versionFile = ArchiPlugin.PREFERENCES.getString(IPreferenceConstants.UPDATE_URL);
+        String versionFile = ArchiPlugin.INSTANCE.getPreferenceStore().getString(IPreferenceConstants.UPDATE_URL);
         return StringUtils.isSet(versionFile);
     }
 

com.archimatetool.editor/src/com/archimatetool/editor/actions/MRUMenuManager.java

@@ -60,7 +60,7 @@ private List<File> loadMRUListFromPreferenceStore() {
         List<File> list = new ArrayList<File>();
 
         for(int i = 0; i < getPreferencesMRUMax(); i++) {
-            String path = ArchiPlugin.PREFERENCES.getString(MRU_PREFS_KEY + i);
+            String path = ArchiPlugin.INSTANCE.getPreferenceStore().getString(MRU_PREFS_KEY + i);
             if(StringUtils.isSet(path)) {
                 list.add(new File(path));
             }
@@ -96,12 +96,12 @@ void addToList(File file) {
     private void saveList() {
         // Clear
         for(int i = 0; i < 50; i++) {
-            ArchiPlugin.PREFERENCES.setValue(MRU_PREFS_KEY + i, "");
+            ArchiPlugin.INSTANCE.getPreferenceStore().setValue(MRU_PREFS_KEY + i, "");
         }
 
         // Save
         for(int i = 0; i < getMRUList().size(); i++) {
-            ArchiPlugin.PREFERENCES.setValue(MRU_PREFS_KEY + i, getMRUList().get(i).getAbsolutePath());
+            ArchiPlugin.INSTANCE.getPreferenceStore().setValue(MRU_PREFS_KEY + i, getMRUList().get(i).getAbsolutePath());
         }
     }
 
@@ -129,7 +129,7 @@ void clearAll() {
     }
 
     int getPreferencesMRUMax() {
-        int max = ArchiPlugin.PREFERENCES.getInt(IPreferenceConstants.MRU_MAX);
+        int max = ArchiPlugin.INSTANCE.getPreferenceStore().getInt(IPreferenceConstants.MRU_MAX);
         if(max < 3) {
             max = 3;
         }

com.archimatetool.editor/src/com/archimatetool/editor/actions/SetConceptTypeExtensionContributionFactory.java

@@ -222,7 +222,7 @@ private void changeElementTypes(EClass eClass, Set<IArchimateElement> elements)
         for(Entry<IArchimateModel, Set<IArchimateElement>> entry : elementsMap.entrySet()) {
             CommandStack stack = (CommandStack)entry.getKey().getAdapter(CommandStack.class);
             CompoundCommand cmd = SetConceptTypeCommandFactory.createSetElementTypeCommand(eClass, entry.getValue(),
-                                  ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.ADD_DOCUMENTATION_NOTE_ON_RELATION_CHANGE));
+                                  ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.ADD_DOCUMENTATION_NOTE_ON_RELATION_CHANGE));
             if(stack != null && cmd != null) {
                 // Wrap the command in a NonNotifyingCompoundCommand to minimise event noise
                 stack.execute(new NonNotifyingCompoundCommand(cmd));

com.archimatetool.editor/src/com/archimatetool/editor/diagram/AbstractDiagramEditor.java

@@ -261,7 +261,7 @@ public CommandStack getCommandStack() {
         setPartName(input.getName());
 
         // Listen to App Prefs changes
-        ArchiPlugin.PREFERENCES.addPropertyChangeListener(appPreferencesListener);
+        ArchiPlugin.INSTANCE.getPreferenceStore().addPropertyChangeListener(appPreferencesListener);
     }
 
     @Override
@@ -448,7 +448,7 @@ protected void setProperties() {
      * Apply grid Prefs
      */
     protected void applyUserGridPreferences() {
-        IPreferenceStore store = ArchiPlugin.PREFERENCES;
+        IPreferenceStore store = ArchiPlugin.INSTANCE.getPreferenceStore();
 
         // Grid Spacing
         int gridSize = store.getInt(IPreferenceConstants.GRID_SIZE);
@@ -471,7 +471,7 @@ protected void applyUserGridPreferences() {
     @Override
     protected PaletteViewerProvider createPaletteViewerProvider() {
         // Ensure palette is showing or not
-        boolean showPalette = ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.PALETTE_STATE);
+        boolean showPalette = ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.PALETTE_STATE);
         getPalettePreferences().setPaletteState(showPalette ? FlyoutPaletteComposite.STATE_PINNED_OPEN : FlyoutPaletteComposite.STATE_COLLAPSED);
 
         return new PaletteViewerProvider(getEditDomain()) {
@@ -1060,7 +1060,7 @@ public void dispose() {
         super.dispose();
 
         // Remove Preference listener
-        ArchiPlugin.PREFERENCES.removePropertyChangeListener(appPreferencesListener);
+        ArchiPlugin.INSTANCE.getPreferenceStore().removePropertyChangeListener(appPreferencesListener);
 
         // Remove eCore adapter listener objects
         eCoreAdapter.remove(getModel(), getModel() != null ? getModel().getArchimateModel() : null);

com.archimatetool.editor/src/com/archimatetool/editor/diagram/ArchimateDiagramEditor.java

@@ -71,7 +71,7 @@ protected void setViewpoint() {
         getPaletteRoot().updateViewpoint();
 
         // If the preference is to hide elements then refresh the model contents
-        if(!ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.VIEWPOINTS_GHOST_DIAGRAM_ELEMENTS)) {
+        if(!ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.VIEWPOINTS_GHOST_DIAGRAM_ELEMENTS)) {
             getGraphicalViewer().setContents(getModel()); 
         }
     }

com.archimatetool.editor/src/com/archimatetool/editor/diagram/ArchimateDiagramEditorPalette.java

@@ -198,7 +198,7 @@ private void createSpecializationsGroup() {
         }
         fSpecializationEntries.clear();
 
-        if(!ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.SHOW_SPECIALIZATIONS_IN_PALETTE)) {
+        if(!ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.SHOW_SPECIALIZATIONS_IN_PALETTE)) {
             fDiagramModel.getArchimateModel().eAdapters().remove(eAdapter);
             return;
         }
@@ -304,7 +304,7 @@ private void createArchimateElementGroup(String title, EClass[] types) {
 
     private boolean isAllowedConceptForViewpoint(EClass eClass) {
         // Preference to show all pallette elements regardless of Viewpoint
-        if(!ArchiPlugin.PREFERENCES.getBoolean(IPreferenceConstants.VIEWPOINTS_HIDE_PALETTE_ELEMENTS)) {
+        if(!ArchiPlugin.INSTANCE.getPreferenceStore().getBoolean(IPreferenceConstants.VIEWPOINTS_HIDE_PALETTE_ELEMENTS)) {
             return true;
         }