Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.app.autagent/.classpath1
-rw-r--r--org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.app.autrun/.classpath1
-rw-r--r--org.eclipse.jubula.app.autrun/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.app.dashboard/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.app/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java31
-rw-r--r--org.eclipse.jubula.autagent/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java14
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java6
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.core/build.properties1
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.core/plugin.xml12
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.ui.bridge/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.analyze/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java2
-rw-r--r--org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/ui/EmbeddedAutAgentPreferencePage.java2
-rw-r--r--org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.core/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java1
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/DatabaseConnectionInitializer.java2
-rw-r--r--org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ChooseHTMLWindowContributionItem.java6
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewViewInstanceHandler.java2
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/SetAsMainViewInstanceHandler.java3
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java3
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/sourceprovider/HTMLAutSourceProvider.java8
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/JBPropertiesView.java11
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/WinAutConfigComponent.java6
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java4
-rw-r--r--org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java2
-rw-r--r--org.eclipse.jubula.communication/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java3
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java3
-rw-r--r--org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.jubula.launch.rcp.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.launch.ui/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.launch/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.rc.rcp.e4/src/org/eclipse/jubula/rc/rcp/e4/starter/AbstractProcessor.java2
-rw-r--r--org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java2
-rw-r--r--org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java2
-rw-r--r--org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF6
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/AbstractToolkitProvider.java4
-rw-r--r--org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/IToolKitProvider.java3
-rw-r--r--org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.provider.base/src/org/eclipse/jubula/toolkit/provider/base/ToolkitProvider.java4
-rw-r--r--org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.provider.concrete/src/org/eclipse/jubula/toolkit/provider/concrete/ToolkitProvider.java18
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF13
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/ToolkitProvider.java4
-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/ToolkitProvider.java4
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF9
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/RCPToolkitProvider.java4
-rw-r--r--org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF5
-rw-r--r--org.eclipse.jubula.toolkit.provider.swing/src/org/eclipse/jubula/toolkit/provider/swing/ToolkitProvider.java4
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF10
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/SWTToolkitProvider.java4
-rw-r--r--org.eclipse.jubula.toolkit.provider.win/META-INF/MANIFEST.MF11
-rw-r--r--org.eclipse.jubula.toolkit.provider.win/src/org/eclipse/jubula/toolkit/provider/win/ToolKitProvider.java4
-rw-r--r--org.eclipse.jubula.tools/META-INF/MANIFEST.MF4
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/ToolkitConstants.java4
85 files changed, 113 insertions, 236 deletions
diff --git a/org.eclipse.jubula.app.autagent/.classpath b/org.eclipse.jubula.app.autagent/.classpath
index e27e06c9a..64c5e31b7 100644
--- a/org.eclipse.jubula.app.autagent/.classpath
+++ b/org.eclipse.jubula.app.autagent/.classpath
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="resources/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
diff --git a/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF
index 3632f7eb6..72e46e71e 100644
--- a/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.autagent/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.jubula.app.autagent.Activator
Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.communication;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.autagent;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.app.autrun/.classpath b/org.eclipse.jubula.app.autrun/.classpath
index 2f8342847..304e86186 100644
--- a/org.eclipse.jubula.app.autrun/.classpath
+++ b/org.eclipse.jubula.app.autrun/.classpath
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry exported="true" kind="lib" path="resources/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jubula.app.autrun/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.autrun/META-INF/MANIFEST.MF
index 81c2916c6..6716bbe39 100644
--- a/org.eclipse.jubula.app.autrun/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.autrun/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.osgi;bundle-version="[3.6.1,4.0.0)",
org.eclipse.equinox.app;bundle-version="[1.3.1,2.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.communication;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.autagent;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.app.dashboard/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.dashboard/META-INF/MANIFEST.MF
index b7a521808..f978bffc8 100644
--- a/org.eclipse.jubula.app.dashboard/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.dashboard/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.equinox.app;bundle-version="[1.3.100,2.0.0)",
org.eclipse.rap.ui;bundle-version="[1.4.0,2.0.0)",
org.eclipse.core.jobs;bundle-version="[3.0.0,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.eclipse.jubula.client.core;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF b/org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF
index 9f869bea4..fb06344fe 100644
--- a/org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app.testexec/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.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.client.cmd;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.app/META-INF/MANIFEST.MF b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
index 2f54ef4da..8d0d6c402 100644
--- a/org.eclipse.jubula.app/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.app/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
org.eclipse.platform;bundle-version="[3.6.1,5.0.0)",
javax.persistence;bundle-version="[2.0.3,2.1.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.core;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java
index f80ca336e..fb34244d0 100644
--- a/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java
+++ b/org.eclipse.jubula.app/src/org/eclipse/jubula/app/Launcher.java
@@ -19,7 +19,6 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Properties;
-import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
@@ -45,8 +44,6 @@ import org.eclipse.ui.internal.ide.ChooseWorkspaceDialog;
import org.eclipse.ui.internal.ide.IDEWorkbenchMessages;
import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
import org.eclipse.ui.internal.ide.StatusUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -74,9 +71,6 @@ public class Launcher implements IApplication {
*/
private static final Integer EXIT_RELAUNCH = new Integer(24);
- /** for log messages */
- private static Logger log = LoggerFactory.getLogger(Launcher.class);
-
/**
* Creates a new Application.
*/
@@ -183,15 +177,6 @@ public class Launcher implements IApplication {
}
/**
- * {@inheritDoc}
- */
- public void setInitializationData(IConfigurationElement config,
- String propertyName, Object data) {
- // do nothing
- }
-
-
- /**
* Creates the display used by the application.
*
* @return the display used by the application
@@ -223,7 +208,7 @@ public class Launcher implements IApplication {
Object instanceLocationCheck = checkInstanceLocation(shell);
if (instanceLocationCheck != null) {
WorkbenchPlugin.unsetSplashShell(display);
- Platform.endSplash();
+ context.applicationRunning();
return instanceLocationCheck;
}
@@ -448,23 +433,25 @@ public class Launcher implements IApplication {
try {
// the operation will fail if the url is not a valid
// instance data area, so other checking is unneeded
- if (instanceLoc.setURL(workspaceUrl, true)) {
+ if (instanceLoc.set(workspaceUrl, true)) {
launchData.writePersistedData();
writeWorkspaceVersion();
return null;
}
} catch (IllegalStateException e) {
MessageDialog.openError(shell,
- IDEWorkbenchMessages
- .IDEApplication_workspaceCannotBeSetTitle,
- IDEWorkbenchMessages
- .IDEApplication_workspaceCannotBeSetMessage);
+ IDEWorkbenchMessages.
+ IDEApplication_workspaceCannotBeSetTitle,
+ IDEWorkbenchMessages.
+ IDEApplication_workspaceCannotBeSetMessage);
return EXIT_OK;
+ } catch (IOException e) {
+ // fall through
}
// by this point it has been determined that the workspace is
// already in use -- force the user to choose again
MessageDialog.openError(shell, IDEWorkbenchMessages
- .IDEApplication_workspaceInUseTitle,
+ .IDEApplication_workspaceInUseTitle,
IDEWorkbenchMessages.IDEApplication_workspaceInUseMessage);
}
}
diff --git a/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF b/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF
index b91eabd40..2f2123032 100644
--- a/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.autagent/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Export-Package: org.eclipse.jubula.autagent,
org.eclipse.jubula.autagent.test
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
index a6ebc7bdd..f8736acf4 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java
@@ -249,19 +249,19 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
protected abstract String getServerClassName();
/**
- * @param cmds The command List. May <b>not</b> be <ocde>null</code>.
+ * @param cmds The command List. May <b>not</b> be <code>null</code>.
* @param locale The <code>Locale</code> for the AUT.
* May be <code>null</code> if no locale was specified.
*/
protected void addLocale(List cmds, Locale locale) {
if (locale != null) {
- if (locale.getCountry() != null
- && locale.getCountry().length() > 0) {
- cmds.add(JAVA_COUNTRY_PROPERTY + locale.getCountry());
+ String country = locale.getCountry();
+ if (country != null && country.length() > 0) {
+ cmds.add(JAVA_COUNTRY_PROPERTY + country);
}
- if (locale.getLanguage() != null
- && locale.getLanguage().length() > 0) {
- cmds.add(JAVA_LANGUAGE_PROPERTY + locale.getLanguage());
+ String language = locale.getLanguage();
+ if (language != null && language.length() > 0) {
+ cmds.add(JAVA_LANGUAGE_PROPERTY + language);
}
}
}
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
index a83f9da0a..ffc707d58 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartHtmlAutServerCommand.java
@@ -17,8 +17,6 @@ import java.util.Vector;
import org.eclipse.jubula.autagent.AutStarter;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -44,10 +42,6 @@ public class StartHtmlAutServerCommand extends AbstractStartPseudoJavaAUT {
BROWSER_TO_CMD_MAP.put("Chrome", "*googlechrome"); //$NON-NLS-1$ //$NON-NLS-2$
}
- /** the logger */
- private static final Logger LOG = LoggerFactory
- .getLogger(StartHtmlAutServerCommand.class);
-
/**
* {@inheritDoc}
*/
diff --git a/org.eclipse.jubula.client.alm.mylyn.core/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.alm.mylyn.core/META-INF/MANIFEST.MF
index 8ab59c0c9..686d9f3f4 100644
--- a/org.eclipse.jubula.client.alm.mylyn.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.alm.mylyn.core/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.client.alm.mylyn.core.Activator
Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.mylyn.commons.net;bundle-version="[3.8.0,4.0.0)",
org.eclipse.mylyn.tasks.core;bundle-version="[3.8.0,4.0.0)",
org.eclipse.mylyn.tasks.ui;bundle-version="[3.8.0,4.0.0)",
diff --git a/org.eclipse.jubula.client.alm.mylyn.core/build.properties b/org.eclipse.jubula.client.alm.mylyn.core/build.properties
index 033f74ac5..826bf169e 100644
--- a/org.eclipse.jubula.client.alm.mylyn.core/build.properties
+++ b/org.eclipse.jubula.client.alm.mylyn.core/build.properties
@@ -9,5 +9,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml,\
about.html
diff --git a/org.eclipse.jubula.client.alm.mylyn.core/plugin.xml b/org.eclipse.jubula.client.alm.mylyn.core/plugin.xml
deleted file mode 100644
index 6789331f8..000000000
--- a/org.eclipse.jubula.client.alm.mylyn.core/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<!--
- Copyright (c) 2013 BREDEX GmbH.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
- -->
-<plugin>
-
-</plugin>
diff --git a/org.eclipse.jubula.client.alm.mylyn.ui.bridge/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.alm.mylyn.ui.bridge/META-INF/MANIFEST.MF
index a2488bbdb..ad6c059ec 100644
--- a/org.eclipse.jubula.client.alm.mylyn.ui.bridge/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.alm.mylyn.ui.bridge/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle:
org.eclipse.mylyn.tasks.core;bundle-version="[3.4.1,4.0.0)",
org.eclipse.mylyn.monitor.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.mylyn.monitor.core;bundle-version="[3.4.0,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.core;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.client.alm.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.alm.mylyn.ui/META-INF/MANIFEST.MF
index f6d738437..ece43b277 100644
--- a/org.eclipse.jubula.client.alm.mylyn.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.alm.mylyn.ui/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.mylyn.context.ui;bundle-version="[3.4.1,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.6.1,4.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.5.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.alm.mylyn.core;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.core;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.client.analyze/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.analyze/META-INF/MANIFEST.MF
index b1a2a2c4e..76b5fccae 100644
--- a/org.eclipse.jubula.client.analyze/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.analyze/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.client.analyze.Activator
Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0.v20110110,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.eclipse.core.commands;bundle-version="[3.6.0,4.0.0)"
diff --git a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
index aebeb8926..16ecc6486 100644
--- a/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.archive/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
javax.persistence;bundle-version="[2.0.3,2.1.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.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.client.core;bundle-version="[2.2.0,2.3.0)"
diff --git a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java
index b56778f3d..4e995de26 100644
--- a/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java
+++ b/org.eclipse.jubula.client.autagent/src/org/eclipse/jubula/client/autagent/preferences/PreferenceInitializer.java
@@ -32,7 +32,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences preferenceNode =
- new DefaultScope().getNode(Activator.PLUGIN_ID);
+ DefaultScope.INSTANCE.getNode(Activator.PLUGIN_ID);
preferenceNode.putInt(PREF_EMBEDDED_AGENT_PORT,
DEFAULT_EMBEDDED_AGENT_PORT);
}
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 ee11b9216..937e0acfa 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
@@ -56,7 +56,7 @@ public class EmbeddedAutAgentPreferencePage extends PreferencePage
*/
public void init(IWorkbench workbench) {
setPreferenceStore(new ScopedPreferenceStore(
- new InstanceScope(), Activator.PLUGIN_ID));
+ InstanceScope.INSTANCE, Activator.PLUGIN_ID));
}
@Override
diff --git a/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
index f472ce05a..93bd0e7ca 100644
--- a/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.cmd/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.core;bundle-version="[2.2.0,2.3.0)"
Export-Package: org.eclipse.jubula.client.cmd,
diff --git a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
index c44b00bf8..92ac4b587 100644
--- a/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.core/META-INF/MANIFEST.MF
@@ -64,7 +64,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.persistence.jpa;bundle-version="[2.3.0,2.4.0)",
org.eclipse.persistence.asm;bundle-version="[2.3.0,2.4.0)",
org.eclipse.persistence.jpa.osgi;bundle-version="[2.3.0,2.4.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.toolkit.common;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java
index d36b6be32..7c1f52b27 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestExecution.java
@@ -765,7 +765,6 @@ public class TestExecution {
m_currentCap = cap;
ITestSuitePO ts = (ITestSuitePO)m_trav.getRoot();
IAUTMainPO aut = ts.getAut();
- IObjectMappingPO om = aut.getObjMap();
Component comp = compSystem.findComponent(cap.getComponentType());
// Find the component name. It may be overridden in one or
// more ExecTestCase nodes.
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java
index 1a7e652b8..fbff80db4 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/NodePO.java
@@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
InsertProgressListener.class, RemoveProgressListener.class })
abstract class NodePO implements INodePO {
/** the logger */
- protected static final Logger LOG = LoggerFactory
+ private static final Logger LOG = LoggerFactory
.getLogger(NodePO.class);
/** Persistence (JPA / EclipseLink) OID */
@@ -230,7 +230,7 @@ abstract class NodePO implements INodePO {
if (LOG.isErrorEnabled() && parent == null) {
try {
throw new IllegalArgumentException(
- "The parent of the INodePO (GUID " + getGuid()
+ "The parent of the INodePO (GUID " + getGuid() //$NON-NLS-1$
+ ") is not intended to be set to null."); //$NON-NLS-1$
} catch (IllegalArgumentException e) {
LOG.info(ExceptionUtils.getFullStackTrace(e), e);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
index 720fda412..e49dd8c9b 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/Persistor.java
@@ -215,7 +215,7 @@ public class Persistor {
message = MessageIDs.E_UNEXPECTED_EXCEPTION;
}
return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- StringConstants.EMPTY, e);
+ message.toString(), e);
} catch (JBException e) {
if (e.getErrorId().equals(MessageIDs.E_NO_DB_CONNECTION)) {
message = MessageIDs.E_NO_DB_CONNECTION;
@@ -224,7 +224,7 @@ public class Persistor {
message = MessageIDs.E_DB_IN_USE;
}
return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
- StringConstants.EMPTY, e);
+ message.toString(), e);
}
}
};
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/DatabaseConnectionInitializer.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/DatabaseConnectionInitializer.java
index 98f35cb73..bf3ea789b 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/DatabaseConnectionInitializer.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/preferences/database/DatabaseConnectionInitializer.java
@@ -35,7 +35,7 @@ public class DatabaseConnectionInitializer extends
@Override
public void initializeDefaultPreferences() {
IEclipsePreferences preferenceNode =
- new DefaultScope().getNode(Activator.PLUGIN_ID);
+ DefaultScope.INSTANCE.getNode(Activator.PLUGIN_ID);
preferenceNode.put(
DatabaseConnectionConverter.PREF_DATABASE_CONNECTIONS,
DatabaseConnectionConverter.convert(
diff --git a/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF
index 932444737..2642d4576 100644
--- a/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.inspector.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.eclipse.jubula.client.core
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.communication;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.core;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF
index a8a133305..9f996fee4 100644
--- a/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.teststyle/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.client.teststyle.Activator
Bundle-Vendor: Eclipse Jubula
Bundle-Localization: plugin
-Require-Bundle: org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+Require-Bundle: org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.ui;bundle-version="[3.6.1,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
diff --git a/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF
index 83ee938f3..a0f76013c 100644
--- a/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui.rap/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.equinox.common;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.commands;bundle-version="[3.6.0,4.0.0)",
org.eclipse.rap.jface;bundle-version="[1.4.0,2.0.0)",
diff --git a/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
index 1150f11c8..d40b6f82d 100644
--- a/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui.rcp/META-INF/MANIFEST.MF
@@ -63,7 +63,7 @@ Require-Bundle: org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.apache.commons.collections;bundle-version="[3.2.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
javax.persistence;bundle-version="[2.0.3,2.1.0)",
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java
index e071d46f0..a24f1b0cd 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/businessprocess/ProjectUIBP.java
@@ -106,7 +106,7 @@ public class ProjectUIBP {
LOG.error(e1.getLocalizedMessage(), e1);
}
} else {
- LOG.error("Node not found");
+ LOG.error("Node not found"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ChooseHTMLWindowContributionItem.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ChooseHTMLWindowContributionItem.java
index ced07c965..7b713820e 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ChooseHTMLWindowContributionItem.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/contributionitems/ChooseHTMLWindowContributionItem.java
@@ -21,18 +21,12 @@ import org.eclipse.jubula.client.ui.rcp.utils.HTMLAutWindowManager;
import org.eclipse.jubula.client.ui.utils.CommandHelper;
import org.eclipse.ui.actions.CompoundContributionItem;
import org.eclipse.ui.menus.CommandContributionItem;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Populates the dropdown list for the HTML window chooser toolbar item
* @author BREDEX GmbH
*
*/
public class ChooseHTMLWindowContributionItem extends CompoundContributionItem {
- /** The logger */
- private static final Logger LOG =
- LoggerFactory.getLogger(ChooseHTMLWindowContributionItem.class);
-
/**
* {@inheritDoc}
*/
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewViewInstanceHandler.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewViewInstanceHandler.java
index eaa0411b4..41abd98ab 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewViewInstanceHandler.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/NewViewInstanceHandler.java
@@ -29,7 +29,7 @@ public class NewViewInstanceHandler extends AbstractHandler {
private static final String SECONDARY_ID_PREFIX = "instance_"; //$NON-NLS-1$
/** {@inheritDoc} */
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) {
IWorkbenchWindow activeWorkbenchWindow = HandlerUtil
.getActiveWorkbenchWindow(event);
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/SetAsMainViewInstanceHandler.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/SetAsMainViewInstanceHandler.java
index 93f0c46ad..0b2fc10f6 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/SetAsMainViewInstanceHandler.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/SetAsMainViewInstanceHandler.java
@@ -12,7 +12,6 @@ package org.eclipse.jubula.client.ui.rcp.handlers;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jubula.client.ui.rcp.controllers.MultipleTCBTracker;
import org.eclipse.jubula.client.ui.rcp.views.TestCaseBrowser;
import org.eclipse.ui.IWorkbenchPart;
@@ -23,7 +22,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
*/
public class SetAsMainViewInstanceHandler extends AbstractHandler {
/** {@inheritDoc} */
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) {
IWorkbenchPart activePart = HandlerUtil.getActivePart(event);
if (activePart instanceof TestCaseBrowser) {
TestCaseBrowser tcb = (TestCaseBrowser) activePart;
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java
index c3d10a778..255daaef8 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/properties/ProjectALMPropertyPage.java
@@ -46,9 +46,6 @@ import org.eclipse.swt.widgets.Label;
* @created 08.02.2005
*/
public class ProjectALMPropertyPage extends AbstractProjectPropertyPage {
- /** the default width */
- private static final int DEFAULT_CONTROL_WIDTH = 500;
-
/**
* @author BREDEX GmbH
*/
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/sourceprovider/HTMLAutSourceProvider.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/sourceprovider/HTMLAutSourceProvider.java
index 3922702c1..9f1de2fae 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/sourceprovider/HTMLAutSourceProvider.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/sourceprovider/HTMLAutSourceProvider.java
@@ -32,16 +32,13 @@ import org.eclipse.ui.ISources;
* 1. is it an HTML AuT
* 2. the window count of the browser
* @author BREDEX GmbH
- *
*/
public class HTMLAutSourceProvider extends AbstractJBSourceProvider implements
IOMAUTListener, IOMStateListener, IOMWindowsListener {
-
/**
* the id of this source provider
*/
public static final String ID = "org.eclipse.jubula.client.ui.rcp.sourceprovider.HTMLAutSourceProvider"; //$NON-NLS-1$
-
/**
* ID of variable that indicates whether the client is currently connected
@@ -57,12 +54,9 @@ public class HTMLAutSourceProvider extends AbstractJBSourceProvider implements
public static final String WINDOW_TITLES =
"org.eclipse.jubula.client.ui.rcp.variable.html.windowCount"; //$NON-NLS-1$
- /** is it an HTML aut in OMM */
+ /** is it an HTML AUT in OMM */
private boolean m_isHTMLAut = false;
- /** last selected Window */
- private String m_lastSelectedWindow = null;
-
/**
* Constructor for adding listeners to the DataEventDispatcher
*/
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/JBPropertiesView.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/JBPropertiesView.java
index 597016bfa..9f1a07266 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/JBPropertiesView.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/views/JBPropertiesView.java
@@ -106,6 +106,7 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.eclipse.ui.part.Page;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySheetPage;
@@ -1000,11 +1001,11 @@ public class JBPropertiesView extends Page implements IDataChangedListener,
helpId = ContextHelpIds.JB_PROPERTIES_VIEW;
}
- Plugin.getHelpSystem().setHelp(m_treeViewer.getControl(), helpId);
- if (Plugin.getHelpSystem().isContextHelpDisplayed()
- || Plugin.getView(Constants.ECLIPSE_HELP_VIEW_ID)
- != null) {
- Plugin.getHelpSystem().displayHelp(helpId);
+ IWorkbenchHelpSystem helpSystem = Plugin.getHelpSystem();
+ helpSystem.setHelp(m_treeViewer.getControl(), helpId);
+ if (helpSystem.isContextHelpDisplayed()
+ || Plugin.getView(Constants.ECLIPSE_HELP_VIEW_ID) != null) {
+ helpSystem.displayHelp(helpId);
}
}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/WinAutConfigComponent.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/WinAutConfigComponent.java
index 3e976ac02..f54004617 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/WinAutConfigComponent.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/widgets/autconfig/WinAutConfigComponent.java
@@ -27,6 +27,7 @@ import org.eclipse.jubula.client.ui.rcp.utils.Utils;
import org.eclipse.jubula.client.ui.utils.LayoutUtil;
import org.eclipse.jubula.client.ui.widgets.UIComponentHelper;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -188,7 +189,7 @@ public class WinAutConfigComponent extends AutConfigComponent {
protected void populateBasicArea(Map<String, String> data) {
super.populateBasicArea(data);
// AUT type
- int autTypeIndex = new Integer("0"
+ int autTypeIndex = new Integer("0" //$NON-NLS-1$
+ StringUtils.defaultString(
data.get(AutConfigConstants.AUT_TYPE)));
m_comboAutType.select(autTypeIndex);
@@ -397,7 +398,8 @@ public class WinAutConfigComponent extends AutConfigComponent {
if (source.equals(m_comboAutType)) {
setVisibilityByAutTypeAndResize();
putConfigValue(AutConfigConstants.AUT_TYPE,
- "" + m_comboAutType.getSelectionIndex());
+ StringConstants.EMPTY
+ + m_comboAutType.getSelectionIndex());
} else if (source.equals(m_execTextField)
|| source.equals(m_modernUiAppName)
|| source.equals(m_autArgsTextField)) {
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java
index 79f8dd7dc..68305c87b 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/AUTSettingWizardPage.java
@@ -178,7 +178,7 @@ public class AUTSettingWizardPage extends WizardPage {
descriptionLabel.setText(
Messages.AUTSettingWizardPageSelectLanguagesOfTD);
ControlDecorator.decorateInfo(descriptionLabel,
- "ControlDecorator.NewProjectAUTLanguage", false);
+ "ControlDecorator.NewProjectAUTLanguage", false); //$NON-NLS-1$
m_chooseLists = new ListElementChooserComposite(
innerComposite,
Messages.AUTSettingWizardPageUpperLabel,
@@ -374,7 +374,7 @@ public class AUTSettingWizardPage extends WizardPage {
newLabel(rightComposite, StringConstants.EMPTY);
ControlDecorator.decorateInfo(newLabel(leftComposite,
Messages.AUTSettingWizardPageToolkit),
- "ControlDecorator.NewProjectAUTToolkit", false);
+ "ControlDecorator.NewProjectAUTToolkit", false); //$NON-NLS-1$
try {
m_autToolKitComboBox = ControlFactory.createAutToolkitCombo(
rightComposite, m_project, m_autMain.getToolkit());
diff --git a/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
index 8850121ad..b0126821b 100644
--- a/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.client.ui/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
javax.persistence;bundle-version="[2.0.3,2.1.0)",
org.eclipse.persistence.jpa;bundle-version="[2.3.0,2.4.0)",
org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java
index 2724101a1..5d9df612f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/DatabaseConnectionPreferencePage.java
@@ -112,7 +112,7 @@ public class DatabaseConnectionPreferencePage extends PreferencePage
*/
public void init(IWorkbench workbench) {
setPreferenceStore(new ScopedPreferenceStore(
- new InstanceScope(), Activator.PLUGIN_ID));
+ InstanceScope.INSTANCE, Activator.PLUGIN_ID));
}
@Override
diff --git a/org.eclipse.jubula.communication/META-INF/MANIFEST.MF b/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
index 2d2494785..e30fb3c1c 100644
--- a/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.communication/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Export-Package: org.eclipse.jubula.communication,
org.eclipse.jubula.communication.writer
Require-Bundle: org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java
index 69c9dcf28..80a131bf8 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendAUTListOfSupportedComponentsMessage.java
@@ -27,9 +27,6 @@ import org.eclipse.jubula.tools.xml.businessmodell.Profile;
* @created 04.10.2004
*/
public final class SendAUTListOfSupportedComponentsMessage extends Message {
- /** static version */
- private static final double VERSION = 1.0;
-
// the data of this message BEGIN
/** The list of supported components and their implementation classes. */
private List m_components = new ArrayList();
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java
index db448c69f..0bed882f0 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendDirectoryResponseMessage.java
@@ -36,9 +36,6 @@ public class SendDirectoryResponseMessage extends Message {
/** state */
public static final int IO_ERROR = 2;
- /** static version */
- private static final double VERSION = 1.0;
-
/** m_base */
private String m_base;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java
index da97a0d77..7b95653ad 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerLogResponseMessage.java
@@ -32,9 +32,6 @@ public class ServerLogResponseMessage extends Message {
/** configuration problem */
public static final int CONFIG_ERROR = 4;
- /** Static version */
- private static final double VERSION = 1.0;
-
/** the server log contents */
private String m_serverLog;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java
index 3846a7e03..f26fef670 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowDialogMessage.java
@@ -37,9 +37,6 @@ public class ServerShowDialogMessage extends Message {
/** closes the checkmode dialog */
public static final int ACT_CLOSE_CHECK_DIALOG = 4;
- /** static version */
- private static final double VERSION = 1.0;
-
/** action/dialog that should be executed */
private int m_action = 0;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java
index 7fa39f4d8..e1165e36d 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ServerShowObservConsoleMessage.java
@@ -26,9 +26,6 @@ public class ServerShowObservConsoleMessage extends Message {
/** closes the recordedAction dialog */
public static final int ACT_CLOSE_ACTION_SHELL = 2;
- /** static version */
- private static final double VERSION = 1.0;
-
/** action/dialog that should be executed */
private int m_action = 0;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java
index 1206615ba..12856932e 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowObservInfoMessage.java
@@ -19,9 +19,6 @@ import org.eclipse.jubula.tools.constants.CommandConstants;
* @created 27.08.2004
*/
public class ShowObservInfoMessage extends Message {
- /** Static version */
- private static final double VERSION = 1.0;
-
/** additional Message */
private String m_extraMsg;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java
index aa5524ace..626a8934d 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/ShowRecordedActionMessage.java
@@ -19,9 +19,6 @@ import org.eclipse.jubula.tools.constants.CommandConstants;
* @created 27.08.2004
*/
public class ShowRecordedActionMessage extends Message {
- /** Static version */
- private static final double VERSION = 1.0;
-
/** if the action is recorded */
private boolean m_recorded;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java
index dd7c64746..140a341b8 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StartAUTServerStateMessage.java
@@ -91,9 +91,6 @@ public class StartAUTServerStateMessage extends Message {
/** the constant used, when no reason is set */
private static final int UNKNOWN = MAX_CONSTANT;
- /** static version */
- private static final double VERSION = 1.0;
-
/** the reason */
private int m_reason;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java
index 2c038b84e..6cfc603be 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java
@@ -21,9 +21,6 @@ import org.eclipse.jubula.tools.registration.AutIdentifier;
* @created 18.12.2007
*/
public class StopAUTServerMessage extends Message {
- /** Static version */
- private static final double VERSION = 1.1;
-
/** autId */
private AutIdentifier m_autId;
diff --git a/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF b/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF
index c085a7112..beccca979 100644
--- a/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.documentation.gen/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.cli;bundle-version="[1.2.0,2.0.0)",
org.apache.oro;bundle-version="[2.0.8,3.0.0)",
org.slf4j.jcl;bundle-version="[1.5.11,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)"
diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF
index e617a5531..3cd57331c 100644
--- a/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.examples.extension.rcp.toolkit/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ 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.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
- org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF b/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF
index ecd85f7a3..e19e1d4a5 100644
--- a/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.examples.extension.swing.toolkit/META-INF/MANIFEST.MF
@@ -8,8 +8,7 @@ Bundle-Localization: plugin
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.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional,
- org.eclipse.ui;bundle-version="[3.6.1,4.0.0)";resolution:=optional
+ org.eclipse.swt;bundle-version="[3.6.1,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Provider.0
diff --git a/org.eclipse.jubula.launch.rcp.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.launch.rcp.ui/META-INF/MANIFEST.MF
index a39cf4cd8..2d559e06f 100644
--- a/org.eclipse.jubula.launch.rcp.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.launch.rcp.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.pde.launching;bundle-version="[3.6.0,4.0.0)",
org.eclipse.pde.ui;bundle-version="[3.6.1,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.launch;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.launch.ui/META-INF/MANIFEST.MF b/org.eclipse.jubula.launch.ui/META-INF/MANIFEST.MF
index 224003929..6311095b5 100644
--- a/org.eclipse.jubula.launch.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.launch.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.debug.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.jubula.launch;bundle-version="[2.2.0,2.3.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/org.eclipse.jubula.launch/META-INF/MANIFEST.MF b/org.eclipse.jubula.launch/META-INF/MANIFEST.MF
index a45a0ed37..6f0d3d0c2 100644
--- a/org.eclipse.jubula.launch/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.launch/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.6.0,4.0.0)",
org.eclipse.debug.core;bundle-version="[3.6.0,4.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.communication;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.autagent;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.autagent;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
index d86827f89..217f17d7c 100644
--- a/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.common/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Export-Package: org.eclipse.jubula.rc.common,
Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
org.apache.oro;bundle-version="[2.0.8,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.communication;bundle-version="[2.2.0,2.3.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/org.eclipse.jubula.rc.rcp.e4/src/org/eclipse/jubula/rc/rcp/e4/starter/AbstractProcessor.java b/org.eclipse.jubula.rc.rcp.e4/src/org/eclipse/jubula/rc/rcp/e4/starter/AbstractProcessor.java
index 82ab3d45a..ad52fd751 100644
--- a/org.eclipse.jubula.rc.rcp.e4/src/org/eclipse/jubula/rc/rcp/e4/starter/AbstractProcessor.java
+++ b/org.eclipse.jubula.rc.rcp.e4/src/org/eclipse/jubula/rc/rcp/e4/starter/AbstractProcessor.java
@@ -46,7 +46,7 @@ public abstract class AbstractProcessor implements EventHandler {
if (!eventBroker.subscribe(UIEvents.UIElement.TOPIC_WIDGET,
this)) {
System.err.println(
- "Could not subscribe to event broker TOPIC_WIDGET!");
+ "Could not subscribe to event broker TOPIC_WIDGET!"); //$NON-NLS-1$
}
}
diff --git a/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF
index 7ec109d87..dd28c471f 100644
--- a/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.swing/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.communication;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.rc.common;bundle-version="[2.2.0,2.3.0)"
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java
index b0f68e8fa..9fecad4c9 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/components/AUTSwingHierarchy.java
@@ -90,7 +90,7 @@ public class AUTSwingHierarchy extends AUTHierarchy
* (de-)registered directly in the thread that handles Swing / AWT events
*/
private static final String ENV_VAR_SYNC_REGISTER_LISTENERS =
- "JB_SYNC_REG_SWING_LISTENERS";
+ "JB_SYNC_REG_SWING_LISTENERS"; //$NON-NLS-1$
/** the logger */
private static AutServerLogger log = new AutServerLogger(
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java
index 314315a14..81b644cec 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordActions.java
@@ -721,7 +721,7 @@ public class RecordActions {
messageCap.addMessageParam(messageParam);
}
- if (StringUtils.isEmpty(id.getComponentName())) { //$NON-NLS-1$
+ if (StringUtils.isEmpty(id.getComponentName())) {
messageCap.setLogicalName(logName);
messageCap.sethasDefaultMapping(true);
}
diff --git a/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF b/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF
index 12bfbe16c..8ea3a97e5 100644
--- a/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.rc.swt/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.apache.commons.beanutils;bundle-version="[1.7.0,2.0.0)",
org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
ch.qos.logback.classic;bundle-version="[1.0.0,2.0.0)",
ch.qos.logback.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java
index 56d0fc551..e2338f609 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/FocusTracker.java
@@ -71,7 +71,7 @@ public class FocusTracker extends BaseSwtEventListener
this.getClass().getClassLoader());
try {
if (log.isDebugEnabled()) {
- log.debug("Event: ", event);
+ log.debug("Event: ", event); //$NON-NLS-1$
}
switch (event.type) {
case SWT.FocusIn:
diff --git a/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
index fd288f4d4..2517dbe2d 100644
--- a/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.common/META-INF/MANIFEST.MF
@@ -4,11 +4,13 @@ Bundle-Name: Jubula Toolkit Support
Bundle-SymbolicName: org.eclipse.jubula.toolkit.common;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.common.PluginStarter
+Bundle-Vendor: Eclipse Jubula
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.core.databinding;bundle-version="[1.3.1,2.0.0)",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)",
org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.jubula.toolkit.common,
org.eclipse.jubula.toolkit.common.businessprocess,
@@ -16,6 +18,4 @@ Export-Package: org.eclipse.jubula.toolkit.common,
org.eclipse.jubula.toolkit.common.monitoring,
org.eclipse.jubula.toolkit.common.utils,
org.eclipse.jubula.toolkit.common.xml.businessprocess
-Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/AbstractToolkitProvider.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/AbstractToolkitProvider.java
index c55d603e1..45a9b053c 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/AbstractToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/AbstractToolkitProvider.java
@@ -12,7 +12,6 @@ package org.eclipse.jubula.toolkit.common;
import java.util.Map;
-import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.swt.widgets.Composite;
/**
@@ -21,8 +20,7 @@ import org.eclipse.swt.widgets.Composite;
public abstract class AbstractToolkitProvider implements IToolKitProvider {
/** {@inheritDoc} */
public Composite getAutConfigDialog(Composite parent, int style,
- Map<String, String> autConfig, String autName)
- throws ToolkitPluginException {
+ Map<String, String> autConfig, String autName) {
return null;
}
}
diff --git a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/IToolKitProvider.java b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/IToolKitProvider.java
index bbdbcd54d..bc5962913 100644
--- a/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/IToolKitProvider.java
+++ b/org.eclipse.jubula.toolkit.common/src/org/eclipse/jubula/toolkit/common/IToolKitProvider.java
@@ -22,6 +22,9 @@ import org.eclipse.swt.widgets.Composite;
* @created 19.04.2007
*/
public interface IToolKitProvider {
+ /** The default path to the ComponentConfiguration.xml */
+ public static final String COMP_CONFIG_PATH = "resources/xml/ComponentConfiguration.xml"; //$NON-NLS-1$
+
/**
* @return the URL to the ComponentConfiguration.xml
*/
diff --git a/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF
index 990f8f632..24f96c342 100644
--- a/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.base/META-INF/MANIFEST.MF
@@ -4,11 +4,10 @@ Bundle-Name: Jubula Toolkit - Abstract
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.base;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.base.Activator
+Bundle-Vendor: Eclipse Jubula
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.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.base/src/org/eclipse/jubula/toolkit/provider/base/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.base/src/org/eclipse/jubula/toolkit/provider/base/ToolkitProvider.java
index 65a408d58..16c010913 100644
--- a/org.eclipse.jubula.toolkit.provider.base/src/org/eclipse/jubula/toolkit/provider/base/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.base/src/org/eclipse/jubula/toolkit/provider/base/ToolkitProvider.java
@@ -15,7 +15,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.AbstractToolkitProvider;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
/**
@@ -34,8 +33,7 @@ public class ToolkitProvider extends AbstractToolkitProvider {
* {@inheritDoc}
*/
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/**
diff --git a/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF
index 519ea8f47..4f94e7ce0 100644
--- a/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.concrete/META-INF/MANIFEST.MF
@@ -4,11 +4,10 @@ Bundle-Name: Jubula Toolkit - Concrete
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.concrete;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.concrete.Activator
+Bundle-Vendor: Eclipse Jubula
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.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.concrete/src/org/eclipse/jubula/toolkit/provider/concrete/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.concrete/src/org/eclipse/jubula/toolkit/provider/concrete/ToolkitProvider.java
index 260c4c34e..3900431d6 100644
--- a/org.eclipse.jubula.toolkit.provider.concrete/src/org/eclipse/jubula/toolkit/provider/concrete/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.concrete/src/org/eclipse/jubula/toolkit/provider/concrete/ToolkitProvider.java
@@ -15,7 +15,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.AbstractToolkitProvider;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
/**
@@ -23,26 +22,17 @@ import org.eclipse.jubula.tools.constants.ToolkitConstants;
* @created 26.04.2007
*/
public class ToolkitProvider extends AbstractToolkitProvider {
-
- /**
- * <code>I18N_PROPERTIES</code>
- */
+ /** <code>I18N_PROPERTIES</code> */
private static final String I18N_PROPERTIES =
"org.eclipse.jubula.toolkit.provider.concrete.I18nStrings"; //$NON-NLS-1$
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
public ResourceBundle getI18nResourceBundle() {
return ResourceBundle.getBundle(I18N_PROPERTIES);
}
-
}
diff --git a/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF
index 62775cd01..1acb35084 100644
--- a/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.html/META-INF/MANIFEST.MF
@@ -4,16 +4,11 @@ Bundle-Name: Jubula Toolkit - HTML
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.html;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.html.Activator
+Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)",
- org.apache.commons.lang;bundle-version="[2.4.0,3.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.core;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jubula.client.ui.rcp;bundle-version="[2.2.0,2.3.0)";resolution:=optional
+ org.eclipse.jubula.client.ui.rcp;bundle-version="[2.2.0,2.3.0)";resolution:=optional,
+ org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/ToolkitProvider.java
index cacad51ba..c1def825f 100644
--- a/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.html/src/org/eclipse/jubula/toolkit/provider/html/ToolkitProvider.java
@@ -17,7 +17,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.IToolKitProvider;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.swt.widgets.Composite;
/**
@@ -41,8 +40,7 @@ public class ToolkitProvider implements IToolKitProvider {
/** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/** {@inheritDoc} */
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 930ada783..7fe1b60dd 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
@@ -4,12 +4,11 @@ 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.Activator
+Bundle-Vendor: Eclipse Jubula
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.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
-Bundle-Vendor: Eclipse Jubula
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
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 c937a0e12..fa9c2226b 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
@@ -15,7 +15,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.AbstractToolkitProvider;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
/**
* @author BREDEX GmbH
@@ -28,8 +27,7 @@ public class ToolkitProvider extends AbstractToolkitProvider {
/** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/** {@inheritDoc} */
diff --git a/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF
index a197332ac..4d2f3c5c6 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.rcp/META-INF/MANIFEST.MF
@@ -4,12 +4,11 @@ Bundle-Name: Jubula Toolkit - RCP
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.rcp;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.rcp.Activator
+Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.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.swt;bundle-version="[2.2.0,2.3.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Jubula
+ org.eclipse.jubula.toolkit.provider.swt;bundle-version="[2.2.0,2.3.0)",
+ org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/RCPToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/RCPToolkitProvider.java
index 8df2e97bf..19373a1e6 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/RCPToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.rcp/src/org/eclipse/jubula/toolkit/provider/rcp/RCPToolkitProvider.java
@@ -15,7 +15,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
import org.eclipse.jubula.toolkit.provider.swt.SWTToolkitProvider;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
/**
* @author BREDEX GmbH
@@ -28,8 +27,7 @@ public class RCPToolkitProvider extends SWTToolkitProvider {
/** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/** {@inheritDoc} */
diff --git a/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF
index 25dc43b9c..a36e61c5b 100644
--- a/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.swing/META-INF/MANIFEST.MF
@@ -4,12 +4,11 @@ Bundle-Name: Jubula Toolkit - Swing
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.swing;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.swing.Activator
+Bundle-Vendor: Eclipse Jubula
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.client.ui.rcp;bundle-version="[2.2.0,2.3.0)";resolution:=optional,
org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.swing/src/org/eclipse/jubula/toolkit/provider/swing/ToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.swing/src/org/eclipse/jubula/toolkit/provider/swing/ToolkitProvider.java
index dcd996728..f0787af47 100644
--- a/org.eclipse.jubula.toolkit.provider.swing/src/org/eclipse/jubula/toolkit/provider/swing/ToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.swing/src/org/eclipse/jubula/toolkit/provider/swing/ToolkitProvider.java
@@ -17,7 +17,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.IToolKitProvider;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.swt.widgets.Composite;
/**
@@ -41,8 +40,7 @@ public class ToolkitProvider implements IToolKitProvider {
/** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/** {@inheritDoc} */
diff --git a/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF
index dcddbaf5f..9218bbd01 100644
--- a/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.swt/META-INF/MANIFEST.MF
@@ -4,16 +4,12 @@ Bundle-Name: Jubula Toolkit - SWT
Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.swt;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.swt.Activator
+Bundle-Vendor: Eclipse Jubula
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)",
- org.apache.commons.lang;bundle-version="[2.4.0,3.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.client.core;bundle-version="[2.2.0,2.3.0)",
org.eclipse.jubula.client.ui.rcp;bundle-version="[2.2.0,2.3.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)"
+ org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Bundle-Vendor: Eclipse Jubula
Bundle-ClassPath: .
Export-Package: org.eclipse.jubula.toolkit.provider.swt
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/SWTToolkitProvider.java b/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/SWTToolkitProvider.java
index d394d2a34..e3d27b92d 100644
--- a/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/SWTToolkitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.swt/src/org/eclipse/jubula/toolkit/provider/swt/SWTToolkitProvider.java
@@ -17,7 +17,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.IToolKitProvider;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.swt.widgets.Composite;
@@ -42,8 +41,7 @@ public class SWTToolkitProvider implements IToolKitProvider {
/** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/** {@inheritDoc} */
diff --git a/org.eclipse.jubula.toolkit.provider.win/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.provider.win/META-INF/MANIFEST.MF
index bed336b2a..152e02249 100644
--- a/org.eclipse.jubula.toolkit.provider.win/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.provider.win/META-INF/MANIFEST.MF
@@ -5,15 +5,10 @@ Bundle-SymbolicName: org.eclipse.jubula.toolkit.provider.win;singleton:=true
Bundle-Version: 2.2.0.qualifier
Bundle-Activator: org.eclipse.jubula.toolkit.provider.win.Activator
Bundle-Vendor: Eclipse Jubula
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)",
- org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.jubula.tools;bundle-version="[2.2.0,2.3.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.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.core;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jubula.client.ui;bundle-version="[2.2.0,2.3.0)",
- org.eclipse.jubula.client.ui.rcp;bundle-version="[2.2.0,2.3.0)";resolution:=optional
+ org.eclipse.jubula.client.ui.rcp;bundle-version="[2.2.0,2.3.0)";resolution:=optional,
+ org.eclipse.jubula.ui.compatibility;bundle-version="[2.2.0,2.3.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
diff --git a/org.eclipse.jubula.toolkit.provider.win/src/org/eclipse/jubula/toolkit/provider/win/ToolKitProvider.java b/org.eclipse.jubula.toolkit.provider.win/src/org/eclipse/jubula/toolkit/provider/win/ToolKitProvider.java
index 838ca237f..b1ac652ea 100644
--- a/org.eclipse.jubula.toolkit.provider.win/src/org/eclipse/jubula/toolkit/provider/win/ToolKitProvider.java
+++ b/org.eclipse.jubula.toolkit.provider.win/src/org/eclipse/jubula/toolkit/provider/win/ToolKitProvider.java
@@ -17,7 +17,6 @@ import java.util.ResourceBundle;
import org.eclipse.jubula.toolkit.common.IToolKitProvider;
import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
-import org.eclipse.jubula.tools.constants.ToolkitConstants;
import org.eclipse.swt.widgets.Composite;
/**
@@ -40,8 +39,7 @@ public class ToolKitProvider implements IToolKitProvider {
/** {@inheritDoc} */
public URL getComponentConfigurationFileURL() {
- return ToolkitUtils.getURL(Activator.getDefault(),
- ToolkitConstants.COMP_CONFIG_PATH);
+ return ToolkitUtils.getURL(Activator.getDefault(), COMP_CONFIG_PATH);
}
/** {@inheritDoc} */
diff --git a/org.eclipse.jubula.tools/META-INF/MANIFEST.MF b/org.eclipse.jubula.tools/META-INF/MANIFEST.MF
index 5ce15ac8a..8aea81cab 100644
--- a/org.eclipse.jubula.tools/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.tools/META-INF/MANIFEST.MF
@@ -24,5 +24,5 @@ Export-Package: com.thoughtworks.xstream,
org.eclipse.jubula.tools.xml.businessmodell,
org.eclipse.jubula.tools.xml.businessprocess
Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Require-Bundle: org.apache.commons.lang;bundle-version="2.4.0",
- org.slf4j.api;bundle-version="[1.5.11,2.0.0)"
+Require-Bundle: org.apache.commons.lang;bundle-version="[2.4.0,3.0.0)",
+ org.slf4j.api;bundle-version="[1.7.2,2.0.0)"
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/ToolkitConstants.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/ToolkitConstants.java
index 091e2640c..2133140f9 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/ToolkitConstants.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/constants/ToolkitConstants.java
@@ -15,13 +15,9 @@ package org.eclipse.jubula.tools.constants;
* @created 20.04.2007
*/
public interface ToolkitConstants {
-
/** The ID of the Extension Point */
public static final String EXT_POINT_ID = "org.eclipse.jubula.toolkit.common.toolkitsupport"; //$NON-NLS-1$
- /** The path to the ComponentConfiguration.xml */
- public static final String COMP_CONFIG_PATH = "resources/xml/ComponentConfiguration.xml"; //$NON-NLS-1$
-
/** The ID of this Plugin */
public static final String PLUGIN_ID = "org.eclipse.jubula.toolkit.common"; //$NON-NLS-1$

Back to the top