Bug 564088 - Remove ActivatorY20201104-1200Y20201103-1200Y20201102-1200Y20201101-1200I20201105-0230I20201104-1800I20201103-1800I20201103-0030I20201102-1910I20201101-1800

The Activator (going by the old name of Plugin) is only used in order to
access the dialog settings. However, bug 549929 provided a new way to
get the DialogSettings without requiring a subclass of Plugin to access
it.

Change-Id: Iff6167992b580de138b39b174dcfd18688975681
Signed-off-by: Alex Blewitt <alex.blewitt@gmail.com>

3 files changed, 9 insertions, 32 deletions

diff --git a/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/org.eclipse.tips.ide/META-INF/MANIFEST.MF
index eecb02233..228b408bf 100644
--- a/org.eclipse.tips.ide/META-INF/MANIFEST.MF
+++ b/org.eclipse.tips.ide/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true
-Bundle-Version: 0.1.900.qualifier
+Bundle-Version: 0.1.1000.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.0.0",
  org.eclipse.core.runtime;bundle-version="3.0.0",
  org.eclipse.core.expressions;bundle-version="3.0.0",
  org.eclipse.e4.ui.workbench;bundle-version="1.0.0",
+ org.eclipse.ui.workbench;bundle-version="3.122.0",
  org.eclipse.tips.core;bundle-version="0.1.0",
  org.eclipse.tips.ui;bundle-version="0.1.0",
  org.eclipse.tips.json,
@@ -16,6 +17,5 @@ Import-Package: javax.annotation
 Export-Package: org.eclipse.tips.ide.internal;x-internal:=true
 Automatic-Module-Name: org.eclipse.tips.ide
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Activator: org.eclipse.tips.ide.internal.Plugin
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.tips.ide.internal.TipsStartupService.xml
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/IDETipManager.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/IDETipManager.java
index 1220af3d9..239c35f39 100644
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/IDETipManager.java
+++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/IDETipManager.java
@@ -33,6 +33,7 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.tips.core.ITipManager;
 import org.eclipse.tips.core.Tip;
 import org.eclipse.tips.core.TipProvider;
@@ -41,6 +42,8 @@ import org.eclipse.tips.core.internal.TipManager;
 import org.eclipse.tips.ui.internal.DefaultTipManager;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.services.IEvaluationService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -106,7 +109,9 @@ public class IDETipManager extends DefaultTipManager {
 			evaluationService.addSourceProvider(fSourceProvider);
 			fSourceProviderAdded = true;
 		}
-		return super.open(startUp, Plugin.getInstance().getDialogSettings());
+		Bundle bundle = FrameworkUtil.getBundle(IDETipManager.class);
+		IDialogSettings settings = PlatformUI.getDialogSettingsProvider(bundle).getDialogSettings();
+		return super.open(startUp, settings);
 	}
 
 	/**
@@ -305,4 +310,4 @@ public class IDETipManager extends DefaultTipManager {
 		}
 		return locationDir;
 	}
-}
\ No newline at end of file
+}
diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Plugin.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Plugin.java
deleted file mode 100644
index f588301e4..000000000
--- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/Plugin.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2018 Remain Software
- *
- * This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     wim.jongman@remainsoftware.com - initial API and implementation
- *******************************************************************************/
-package org.eclipse.tips.ide.internal;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-public class Plugin extends AbstractUIPlugin {
-	private static Plugin instance;
-
-	public Plugin() {
-		instance = this;
-	}
-
-	public static AbstractUIPlugin getInstance() {
-		return instance;
-	}
-}
\ No newline at end of file