Merge pull request #2742 from akurtakov/develop

Reduce static access methods in AbstractActivatorUI

Author: eselmeister

chemclipse/plugins/org.eclipse.chemclipse.rcp.app.ui/src/org/eclipse/chemclipse/rcp/app/ui/handlers/PerspectiveSwitchHandler.java

@@ -6,7 +6,7 @@
  * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  * Philip Wenig - initial API and implementation
  *******************************************************************************/
@@ -15,7 +15,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.chemclipse.rcp.app.ui.Activator;
 import org.eclipse.chemclipse.rcp.app.ui.dialogs.PerspectiveChooserDialog;
 import org.eclipse.chemclipse.rcp.app.ui.dialogs.PerspectiveSwitcherDialog;
 import org.eclipse.chemclipse.rcp.app.ui.preferences.PreferenceSupplier;
@@ -97,12 +96,6 @@ public static void focusPerspectiveAndView(String perspectiveId, List<String> vi
 		}
 	}
 
-	public static boolean isActivePerspective(String perspectiveId) {
-
-		String activePerspective = Activator.getDefault().getActivePerspective();
-		return activePerspective.equals(perspectiveId);
-	}
-
 	/*
 	 * Show a dialog if requested. The boolean values: P_SHOW_PERSPECTIVE_DIALOG
 	 * P_CHANGE_PERSPECTIVE_AUTOMATICALLY can be edited by the user.

chemclipse/plugins/org.eclipse.chemclipse.support.ui/src/org/eclipse/chemclipse/support/ui/activator/AbstractActivatorUI.java

@@ -6,7 +6,7 @@
  * which is available at https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  * Philip Wenig - initial API and implementation
  *******************************************************************************/
@@ -71,7 +71,7 @@ public IPreferenceStore getPreferenceStore() {
 	 * Returns the image given by the key.
 	 * Please initialize the image registry before using this function.
 	 * Use the method e.g.:
-	 * 
+	 *
 	 * getImage(ICON_WARN)
 	 */
 	public Image getImage(String key) {
@@ -99,11 +99,6 @@ public EPartService getPartService() {
 		return getEclipseContext().get(EPartService.class);
 	}
 
-	public PartSupport getPartSupport() {
-
-		return getEclipseContext().get(PartSupport.class);
-	}
-
 	public PerspectiveSupport getPerspectiveSupport() {
 
 		return getEclipseContext().get(PerspectiveSupport.class);
@@ -168,16 +163,6 @@ public IEclipseContext getEclipseContext() {
 		return eclipseContext;
 	}
 
-	public boolean saveDirtyParts() {
-
-		return getPartSupport().saveDirtyParts();
-	}
-
-	public String getActivePerspective() {
-
-		return getPerspectiveSupport().getActivePerspective();
-	}
-
 	/**
 	 * Initialize the preference store.
 	 */
@@ -198,14 +183,14 @@ protected void initializePreferenceStore(IPreferenceSupplier preferenceSupplier)
 	/**
 	 * Initialize the image registry.
 	 * Please supply a HashMap of used images/icons, e.g.:
-	 * 
+	 *
 	 * <pre><code>
 	 * public static final String ICON_WARN = "ICON_WARN";
-	 * 
+	 *
 	 * Map&lt;String, String&gt; imageHashMap = new HashMap&lt;&gt;();
 	 * imageHashMap.put(ICON_WARN, "icons/16x16/warn.gif");
 	 * </code></pre>
-	 * 
+	 *
 	 * The icon path is set relative to the calling plugin.
 	 */
 	protected void initializeImageRegistry(Map<String, String> imageHashMap) {