Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Tiede2013-09-10 08:45:32 -0400
committerMarkus Tiede2013-09-10 08:45:51 -0400
commitf010f2aac451d1b80be0b96e4c6e923e4db8b027 (patch)
tree8ec96b0348adf50beb79149256a9327683bc8709 /org.eclipse.jubula.toolkit.provider.rcp.gef
parent5cf381314b57cd7365449b1383ecb404349607ee (diff)
downloadorg.eclipse.jubula.core-f010f2aac451d1b80be0b96e4c6e923e4db8b027.tar.gz
org.eclipse.jubula.core-f010f2aac451d1b80be0b96e4c6e923e4db8b027.tar.xz
org.eclipse.jubula.core-f010f2aac451d1b80be0b96e4c6e923e4db8b027.zip
Sprint task - minimize UI / RCP dependencies for toolkit provider.
Diffstat (limited to 'org.eclipse.jubula.toolkit.provider.rcp.gef')
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/Activator.java (renamed from org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/PluginStarter.java)32
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java33
3 files changed, 18 insertions, 50 deletions
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF
index 71d1f0ea6..930ada783 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/META-INF/MANIFEST.MF
@@ -3,12 +3,11 @@ Bundle-ManifestVersion: 2
Bundle-Name: Jubula Toolkit - GEF
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.rcp.gef;singleton:=true
Bundle-Version: 2.2.0.qualifier
-Bundle-Activator: org.eclipse.jubula.toolkit.provider.rcp.gef.PluginStarter
+Bundle-Activator: org.eclipse.jubula.toolkit.provider.rcp.gef.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.toolkit.common;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.toolkit.provider.rcp;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)";resolution:=optional,
org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/PluginStarter.java b/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/Activator.java
index a53ba0778..49daf0462 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/PluginStarter.java
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/Activator.java
@@ -10,38 +10,27 @@
*******************************************************************************/
package org.eclipse.jubula.toolkit.provider.rcp.gef;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.core.runtime.Plugin;
import org.osgi.framework.BundleContext;
/**
* The activator class controls the plug-in life cycle
*/
-public class PluginStarter extends AbstractUIPlugin {
- /** The plug-in ID */
- public static final String PLUGIN_ID = "org.eclipse.jubula.toolkit.provider.rcp.gef"; //$NON-NLS-1$
-
+public class Activator extends Plugin {
/** The shared instance */
- private static PluginStarter plugin;
+ private static Activator plugin;
- /**
- * The constructor
- */
- public PluginStarter() {
+ /** The constructor */
+ public Activator() {
plugin = this;
}
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void start(BundleContext context) throws Exception {
super.start(context);
}
- /**
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
@@ -49,11 +38,10 @@ public class PluginStarter extends AbstractUIPlugin {
/**
* Returns the shared instance
- *
+ *
* @return the shared instance
*/
- public static PluginStarter getDefault() {
+ public static Activator getDefault() {
return plugin;
}
-
-}
+} \ No newline at end of file
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java
index 51a7e96ad..c937a0e12 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/src/org/eclipse/jubula/toolkit/provider/rcp/gef/ToolkitProvider.java
@@ -11,48 +11,29 @@
package org.eclipse.jubula.toolkit.provider.rcp.gef;
import java.net.URL;
-import java.util.Map;
import java.util.ResourceBundle;
-import org.eclipse.jubula.toolkit.common.IToolKitProvider;
+import org.eclipse.jubula.toolkit.common.AbstractToolkitProvider;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
import org.eclipse.jubula.tools.constants.ToolkitConstants;
-import org.eclipse.swt.widgets.Composite;
-
/**
* @author BREDEX GmbH
* @created 26.04.2007
*/
-public class ToolkitProvider implements IToolKitProvider {
- /**
- * <code>I18N_PROPERTIES</code>
- */
+public class ToolkitProvider extends AbstractToolkitProvider {
+ /** <code>I18N_PROPERTIES</code> */
private static final String I18N_PROPERTIES =
"org.eclipse.jubula.toolkit.provider.rcp.gef.I18nStrings"; //$NON-NLS-1$
- /**
- * {@inheritDoc}
- */
- public Composite getAutConfigDialog(Composite parent, int style,
- Map<String, String> autConfig, String autName) {
-
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(PluginStarter.getDefault(),
+ return ToolkitUtils.getURL(Activator.getDefault(),
ToolkitConstants.COMP_CONFIG_PATH);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ResourceBundle getI18nResourceBundle() {
return ResourceBundle.getBundle(I18N_PROPERTIES);
}
-
-}
+} \ No newline at end of file

Back to the top