Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZeb Ford-Reitz2011-10-07 12:03:52 +0000
committerZeb Ford-Reitz2011-10-10 06:38:53 +0000
commit2134b6f36eb2614a845e1de9c4a70c319e6afe32 (patch)
treec6139adb3b2d47ce33026d90be1477e0a4254d81 /org.eclipse.jubula.client.autagent
parentbf47761bcb6e82082701f87e9364de0f5ebc7444 (diff)
downloadorg.eclipse.jubula.core-2134b6f36eb2614a845e1de9c4a70c319e6afe32.tar.gz
org.eclipse.jubula.core-2134b6f36eb2614a845e1de9c4a70c319e6afe32.tar.xz
org.eclipse.jubula.core-2134b6f36eb2614a845e1de9c4a70c319e6afe32.zip
Initial UI bundle split: UI => UI and UI RCP.
Diffstat (limited to 'org.eclipse.jubula.client.autagent')
-rw-r--r--org.eclipse.jubula.client.autagent/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java4
-rw-r--r--org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java4
3 files changed, 6 insertions, 5 deletions
diff --git a/org.eclipse.jubula.client.autagent/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.autagent/META-INF/MANIFEST.MF
index 795b86c9c..0ee0c9989 100644
--- a/org.eclipse.jubula.client.autagent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.autagent/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
org.eclipse.jubula.tools;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jubula.communication;bundle-version="[1.1.0,1.2.0)",
org.eclipse.jubula.autagent;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jubula.client.ui;bundle-version="[1.1.0,1.2.0)"
+ org.eclipse.jubula.client.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jubula.client.ui.rcp;bundle-version="[1.1.0,1.2.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jubula.client.autagent.handlers
diff --git a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java
index 54df9bf80..91d9bc7c4 100644
--- a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java
+++ b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/handlers/ConnectToEmbeddedAutAgentHandler.java
@@ -22,8 +22,8 @@ import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.autagent.AutStarter.Verbosity;
import org.eclipse.jubula.client.autagent.Activator;
import org.eclipse.jubula.client.autagent.preferences.PreferenceInitializer;
-import org.eclipse.jubula.client.ui.actions.StartServerAction;
-import org.eclipse.jubula.client.ui.utils.ServerManager.Server;
+import org.eclipse.jubula.client.ui.rcp.actions.StartServerAction;
+import org.eclipse.jubula.client.ui.rcp.utils.ServerManager.Server;
import org.eclipse.jubula.tools.i18n.I18n;
import org.eclipse.ui.statushandlers.StatusManager;
diff --git a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java
index 3680083ae..ee11b9216 100644
--- a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java
+++ b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java
@@ -21,7 +21,6 @@ import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.preference.PreferencePage;
import org.eclipse.jubula.client.autagent.Activator;
import org.eclipse.jubula.client.autagent.preferences.PreferenceInitializer;
-import org.eclipse.jubula.client.ui.Plugin;
import org.eclipse.jubula.client.ui.constants.ContextHelpIds;
import org.eclipse.jubula.client.ui.databinding.SimpleIntegerToStringConverter;
import org.eclipse.jubula.client.ui.databinding.SimpleStringToIntegerConverter;
@@ -34,6 +33,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.preferences.ScopedPreferenceStore;
/**
@@ -91,7 +91,7 @@ public class EmbeddedAutAgentPreferencePage extends PreferencePage
PreferencePageSupport.create(this, m_dbc);
// context sensitive help
- Plugin.getHelpSystem().setHelp(parent,
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,
ContextHelpIds.PREFPAGE_EMBEDDED_AGENT);
return composite;

Back to the top