Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java4
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/AbstractStartJavaAut.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java25
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java6
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java7
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java2
-rw-r--r--org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java2
-rw-r--r--org.eclipse.jubula.client.archive/.project7
-rw-r--r--org.eclipse.jubula.client.archive/.settings/org.eclipse.jdt.core.prefs67
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java38
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java33
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java35
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java1
-rw-r--r--org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/messages.properties1
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/NullComponentNameMapper.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java5
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java21
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java4
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionOMEditor.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/AbstractComponentNameViewerUpdater.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java41
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMDropTargetListener.java18
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMEditorDndSupport.java123
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/MonitoringValuePropertySource.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java4
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EditParametersDialog.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java3
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingConfigComponent.java24
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java41
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ExtractTestCaseHandler.java7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/AbstractOpenHandler.java1
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/OpenTestJobEditorHandler.java3
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java12
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/Messages.java1
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/messages.properties1
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestDataPreferencePage.java21
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestResultPreferencePage.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/CentralTestDataLabelProvider.java3
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/AbstractShowWhereUsedQuery.java1
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/ShowWhereUsedComponentNameQuery.java5
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AvailableAutSourceProvider.java7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/RemoteFileStore.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractJBTreeView.java15
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/JBPropertiesView.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestResultTreeView.java7
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java9
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/AbstractDataSetPage.java8
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java1
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ComponentNamesTableComposite.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java2
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ImportTestDataSetsWizard.java6
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportXLSTestdataWizardPage.java29
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java4
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java1
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java2
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java1
-rw-r--r--org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/StopAUTServerMessage.java2
-rw-r--r--org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/control/DvdCopyRadioButtonToClipboardAction.java2
-rw-r--r--org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/Resources.java2
-rw-r--r--org.eclipse.jubula.examples.extension.rcp.toolkit/build.properties17
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/build.properties23
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.project.configuration/settings/1.4/org.eclipse.jdt.core.prefs67
-rw-r--r--org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs67
-rw-r--r--org.eclipse.jubula.rc.common.agent/build.properties2
-rw-r--r--org.eclipse.jubula.rc.common/build.properties2
-rw-r--r--org.eclipse.jubula.rc.rcp/build.properties3
-rw-r--r--org.eclipse.jubula.rc.swing/build.properties2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java2
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordHelper.java18
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/RobotAwtImpl.java22
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JListHelper.java21
-rw-r--r--org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/WindowHelper.java10
-rw-r--r--org.eclipse.jubula.rc.swt/build.properties3
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtHierarchyContainer.java1
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/SwtRobot.java5
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/AbstractSwtImplClass.java7
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/CComboBoxHelper.java45
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/DropdownButtonImplClass.java94
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/MenuUtil.java16
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TableImplClass.java3
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/ToolItemImplClass.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java6
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordHelperSWT.java26
-rw-r--r--org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java68
-rw-r--r--org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml2
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ConverterException.java36
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/registration/AutIdentifier.java8
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/ConfigVersion.java32
105 files changed, 410 insertions, 991 deletions
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java
index bdd0a562f..1a40c48ef 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/agent/AutAgent.java
@@ -148,8 +148,8 @@ public class AutAgent {
/**
* {@inheritDoc}
*/
- public void initConnection(final Socket socket,
- final BufferedReader reader) throws IOException {
+ public void initConnection(final Socket socket,
+ final BufferedReader reader) {
new Thread("Register autrun") { //$NON-NLS-1$
/**
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 63b150da9..84da37683 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
@@ -389,17 +389,17 @@ public abstract class AbstractStartJavaAut extends AbstractStartToolkitAut {
});
URL[] urls;
if (extJars != null) {
- LOG.error("jars are " + extJars);
+ LOG.error("jars are " + extJars); //$NON-NLS-1$
urls = new URL[extJars.length];
for (int i = 0; i < extJars.length; i++) {
try {
urls[i] = extJars[i].toURI().toURL();
} catch (MalformedURLException e) {
- LOG.error("URL is malformed", e);
+ LOG.error("URL is malformed", e); //$NON-NLS-1$
}
}
} else {
- LOG.error("no ext jars");
+ LOG.error("no ext jars"); //$NON-NLS-1$
urls = new URL[0];
}
return urls;
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java
index ae76a166f..fa5e52dca 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartRcpAutServerCommand.java
@@ -210,7 +210,7 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
EnvironmentUtils.getProcessEnvironment(),
IStartAut.PROPERTY_DELIMITER);
}
- Vector envList = new Vector(Arrays.asList(envArray));
+ Vector<String> envList = new Vector<String>(Arrays.asList(envArray));
envList.addAll(getConnectionProperties(
parameters, StartSwtAutServerCommand.ENV_VAR_PREFIX,
StartSwtAutServerCommand.ENV_VALUE_SEP));
@@ -237,10 +237,10 @@ public class StartRcpAutServerCommand extends AbstractStartJavaAut {
* property values.
* @return the list of properties.
*/
- private List getConnectionProperties(Map parameters,
+ private List<String> getConnectionProperties(Map parameters,
String propPrefix, String valueSeparator) {
- List props = new ArrayList();
+ List<String> props = new ArrayList<String>();
StringBuffer sb = new StringBuffer();
if (AutStarter.getInstance().getAutCommunicator() != null) {
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
index de51559a1..ac742c5ea 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwingAutServerCommand.java
@@ -373,31 +373,6 @@ public class StartSwingAutServerCommand extends AbstractStartJavaAut {
}
/**
- * Gets/loads external jars from the ext directory
- * @return the absolute path
- */
- private String getExtJarPath() {
-
- final File extDir = new File(CommandConstants.EXT_JARS_PATH);
- final StringBuffer paths = new StringBuffer(extDir.getAbsolutePath());
- final File[] extJars = extDir.listFiles(new FilenameFilter() {
- public boolean accept(File dir, String name) {
- return name.endsWith(".jar"); //$NON-NLS-1$
- }
- });
-
- if (extJars != null) {
- for (int i = 0; i < extJars.length; i++) {
- File f = extJars[i];
- paths.append(PATH_SEPARATOR);
- paths.append(f.getAbsolutePath());
- }
- }
- return paths.toString();
-
- }
-
- /**
* Gets the absolute path of the GDAgent.jar file.
* @return the absolute path
*/
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java
index dfc7b5633..aac79ecb5 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/commands/StartSwtAutServerCommand.java
@@ -61,7 +61,7 @@ public class StartSwtAutServerCommand extends StartSwingAutServerCommand {
EnvironmentUtils.getProcessEnvironment(),
IStartAut.PROPERTY_DELIMITER);
}
- Vector envList = new Vector(Arrays.asList(envArray));
+ Vector<String> envList = new Vector<String>(Arrays.asList(envArray));
envList.addAll(getConnectionProperties(
parameters, ENV_VAR_PREFIX, ENV_VALUE_SEP));
envArray = (String [])envList.toArray(new String [envList.size()]);
@@ -77,10 +77,10 @@ public class StartSwtAutServerCommand extends StartSwingAutServerCommand {
* property values.
* @return the list of properties.
*/
- private List getConnectionProperties(Map parameters,
+ private List<String> getConnectionProperties(Map parameters,
String propPrefix, String valueSeparator) {
- List props = new ArrayList();
+ List<String> props = new ArrayList<String>();
StringBuffer sb = new StringBuffer();
sb = new StringBuffer();
sb.append(propPrefix).append(RcpAccessorConstants.KEYBOARD_LAYOUT)
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java
index be9212c18..1566d54c5 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/gui/ManualTestStepOptionPane.java
@@ -120,13 +120,6 @@ public class ManualTestStepOptionPane extends JOptionPane {
}
/**
- * Constructor
- */
- private ManualTestStepOptionPane() {
- // hide
- }
-
- /**
* @param message the message
* @param messageType the message type
* @param optiontype the option type
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java
index b91d9b7a5..9ede5ff36 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/monitoring/BuildMonitoringReportCommand.java
@@ -50,7 +50,7 @@ public class BuildMonitoringReportCommand implements ICommand {
byte[] report = agent.buildMonitoringReport();
SendMonitoringReportMessage message = new SendMonitoringReportMessage();
if (report.length > MonitoringConstants.MAX_REPORT_SIZE) {
- LOG.warn("Monitoring report is too large to send.");
+ LOG.warn("Monitoring report is too large to send."); //$NON-NLS-1$
BufferedOutputStream bos = null;
try {
File fileToWrite = File.createTempFile("report", ".zip"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
index 3994b1f41..f9d66ef55 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ChooseCheckModeDialogBP.java
@@ -130,7 +130,7 @@ public class ChooseCheckModeDialogBP {
}
dialog.setLocation((screenSize.width - frameSize.width) / 2,
(screenSize.height - frameSize.height) / 2);
- dialog.show();
+ dialog.setVisible(true);
dialog.toFront();
}
});
diff --git a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java
index d84613eae..25205c782 100644
--- a/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java
+++ b/org.eclipse.jubula.autagent/src/org/eclipse/jubula/autagent/remote/dialogs/ObservationConsoleBP.java
@@ -69,7 +69,7 @@ public class ObservationConsoleBP {
- shell.getWidth()), (screenSize.height
- shell.getHeight()) - 30);
- shell.show();
+ shell.setVisible(true);
}
});
} catch (InterruptedException e) {
diff --git a/org.eclipse.jubula.client.archive/.project b/org.eclipse.jubula.client.archive/.project
index f284bd928..1ef058cd4 100644
--- a/org.eclipse.jubula.client.archive/.project
+++ b/org.eclipse.jubula.client.archive/.project
@@ -41,11 +41,4 @@
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
- <linkedResources>
- <link>
- <name>.settings</name>
- <type>2</type>
- <locationURI>WORKSPACE_LOC/jubula/org.eclipse.jubula.project.configuration/settings/1.5</locationURI>
- </link>
- </linkedResources>
</projectDescription>
diff --git a/org.eclipse.jubula.client.archive/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.client.archive/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..f44008ecc
--- /dev/null
+++ b/org.eclipse.jubula.client.archive/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,67 @@
+#Fri Sep 16 15:06:55 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java
index 3fe77a27a..6d94672cc 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlImporter.java
@@ -183,13 +183,13 @@ class XmlImporter {
new SimpleDateFormat(DATE_PATTERN);
Converter stringConverter = new Converter() {
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unused" })
protected Class getDefaultType() {
return String.class;
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unused" })
protected Object convertToType(
Class type, Object value) throws Throwable {
return value.toString();
@@ -737,7 +737,7 @@ class XmlImporter {
for (NamedTestData testDataCube : xml.getNamedTestDataList()) {
checkCancel();
proj.getTestDataCubeCont().addTestDataCube(createTestDataCube(
- testDataCube, proj, assignNewGuid, mapper));
+ testDataCube, assignNewGuid, mapper));
}
for (Category catXml : xml.getCategoryList()) {
checkCancel();
@@ -1267,7 +1267,7 @@ class XmlImporter {
cap.setComment(xml.getComment());
}
if (xml.getTestdata() != null) {
- ITDManager tdman = fillTDManager(cap, xml, proj);
+ ITDManager tdman = fillTDManager(cap, xml);
cap.setDataManager(tdman);
}
return cap;
@@ -1523,11 +1523,9 @@ class XmlImporter {
* The existent TDManager of the CAP is filled with the TestData
* @param owner The CAP.
* @param xmlCap The abstraction of the XML CAP (see Apache XML Beans)
- * @param proj The current Project
* @return the filled TDManager of the given owner
*/
- private ITDManager fillTDManager(IParamNodePO owner, Cap xmlCap,
- IProjectPO proj) {
+ private ITDManager fillTDManager(IParamNodePO owner, Cap xmlCap) {
final ITDManager tdman = owner.getDataManager();
List<ParamDescription> parDescList = xmlCap
@@ -1634,18 +1632,14 @@ class XmlImporter {
* XML element used as prameter. The method generates all dependend objects
* as well.
* @param xml Abstraction of the XML element (see Apache XML Beans).
- * @param proj The IProjectPO which is currently build. The instance is
- * needed by some objects to verify that their data confirms to project
- * specification (for instance languages).
* @param assignNewGuids <code>true</code> if the parameters were given
* new unique IDs. Otherwise <code>false</code>.
* @param mapper Mapper to resolve param names.
* @return a persistent object generated from the information in the XML
* element
*/
- private IParameterInterfacePO createTestDataCube(
- NamedTestData xml, IProjectPO proj, boolean assignNewGuids,
- IParamNameMapper mapper) {
+ private IParameterInterfacePO createTestDataCube(NamedTestData xml,
+ boolean assignNewGuids, IParamNameMapper mapper) {
ITestDataCubePO testDataCube =
PoMaker.createTestDataCubePO(xml.getName());
@@ -1663,9 +1657,8 @@ class XmlImporter {
mapper);
}
}
- testDataCube.setDataManager(
- createTDManager(testDataCube, xml.getTestData(),
- proj, assignNewGuids));
+ testDataCube.setDataManager(createTDManager(testDataCube,
+ xml.getTestData(), assignNewGuids));
return testDataCube;
}
@@ -1678,14 +1671,11 @@ class XmlImporter {
* the test data, otherwise a new TDManager is created.
* @return a persistent object generated from the information in the XML
* element
- * @param proj The IProjectPO which is currently build. The instance is
- * needed by some objects to verify that their data confirms to project
- * specification (for instance languages).
* @param assignNewGuids <code>true</code> if the parameters were given
* new unique IDs. Otherwise <code>false</code>.
*/
private ITDManager createTDManager(IParameterInterfacePO owner,
- TestData xml, IProjectPO proj, boolean assignNewGuids) {
+ TestData xml, boolean assignNewGuids) {
List<String> uniqueIds = new ArrayList<String>(
xml.getUniqueIdsList());
@@ -1791,8 +1781,8 @@ class XmlImporter {
}
}
}
- tc.setDataManager(createTDManager(tc, xml.getTestdata(), proj,
- assignNewGuid));
+ tc.setDataManager(
+ createTDManager(tc, xml.getTestdata(), assignNewGuid));
return tc;
}
@@ -1930,8 +1920,8 @@ class XmlImporter {
// ExecTestCasePO doesn't have an own parameter list.
// It uses generally the parameter from the associated
// SpecTestCase.
- exec.setDataManager(createTDManager(exec, xml.getTestdata(), proj,
- assignNewGuid));
+ exec.setDataManager(createTDManager(exec, xml.getTestdata(),
+ assignNewGuid));
}
for (CompNames overriddenXml : xml.getOverriddenNamesList()) {
final ICompNamesPairPO compName = PoMaker.createCompNamesPairPO(
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java
index df0d320d8..103253188 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/XmlStorage.java
@@ -29,8 +29,6 @@ import java.util.TimerTask;
import javax.persistence.PersistenceException;
import org.apache.commons.lang.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -50,11 +48,12 @@ import org.eclipse.jubula.client.core.persistence.PMSaveException;
import org.eclipse.jubula.client.core.progress.IProgressConsole;
import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.ConverterException;
import org.eclipse.jubula.tools.exception.InvalidDataException;
import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author BREDEX GmbH
@@ -269,8 +268,7 @@ public class XmlStorage {
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor,
IProgressConsole io)
- throws PMReadException, JBVersionException, InterruptedException,
- ConverterException {
+ throws PMReadException, JBVersionException, InterruptedException {
return load(xmlString, assignNewGuid, null, null, paramNameMapper,
compNameCache, monitor, io);
@@ -304,8 +302,7 @@ public class XmlStorage {
public static IProjectPO load(String xmlString, boolean assignNewGuid,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor)
- throws PMReadException, JBVersionException, InterruptedException,
- ConverterException {
+ throws PMReadException, JBVersionException, InterruptedException {
return load(xmlString, assignNewGuid, null, null, paramNameMapper,
compNameCache, monitor, new NullImportOutput());
}
@@ -346,8 +343,7 @@ public class XmlStorage {
Integer majorVersion, Integer minorVersion,
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor)
- throws PMReadException, JBVersionException, InterruptedException,
- ConverterException {
+ throws PMReadException, JBVersionException, InterruptedException {
return load(xmlString, assignNewGuid, majorVersion, minorVersion,
paramNameMapper, compNameCache,
monitor, new NullImportOutput());
@@ -392,8 +388,7 @@ public class XmlStorage {
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, IProgressMonitor monitor,
IProgressConsole io)
- throws PMReadException, JBVersionException, InterruptedException,
- ConverterException {
+ throws PMReadException, JBVersionException, InterruptedException {
ContentDocument contentDoc;
try {
@@ -535,11 +530,6 @@ public class XmlStorage {
String xml = buildXmlHeader()
+ XmlStorage.save(proj, includeTestResultSummaries, monitor);
- if (xml == null) {
- // Operation cancelled
- return null;
- }
-
if (fileName == null) {
return xml;
}
@@ -796,8 +786,7 @@ public class XmlStorage {
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, boolean assignNewGuids,
IProgressMonitor monitor, IProgressConsole io) throws PMReadException,
- JBVersionException,
- InterruptedException, ConverterException {
+ JBVersionException, InterruptedException {
return load(readProjectFile(fileURL), assignNewGuids, paramNameMapper,
compNameCache, monitor, io);
@@ -832,8 +821,7 @@ public class XmlStorage {
IParamNameMapper paramNameMapper,
IWritableComponentNameCache compNameCache, boolean assignNewGuids,
IProgressMonitor monitor) throws PMReadException,
- JBVersionException,
- InterruptedException, ConverterException {
+ JBVersionException, InterruptedException {
return load(readProjectFile(fileURL), assignNewGuids, paramNameMapper,
compNameCache, monitor, new NullImportOutput());
@@ -845,7 +833,7 @@ public class XmlStorage {
* @param project The project for which the work is predicted.
* @return The predicted amount of work required to save a project.
*/
- public static int getWorkToSave(IProjectPO project) throws PMException {
+ public static int getWorkToSave(IProjectPO project) {
return new XmlExporter(new NullProgressMonitor())
.getPredictedWork(project);
}
@@ -856,8 +844,7 @@ public class XmlStorage {
* @return The predicted amount of work required to save the
* given projects.
*/
- public static int getWorkToSave(List<IProjectPO> projectsToSave)
- throws PMException {
+ public static int getWorkToSave(List<IProjectPO> projectsToSave) {
int totalWork = 0;
for (IProjectPO project : projectsToSave) {
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
index df319b8d3..4beb8fad6 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/businessprocess/FileStorageBP.java
@@ -62,13 +62,13 @@ import org.eclipse.jubula.client.core.model.ITestSuitePO;
import org.eclipse.jubula.client.core.model.NodeMaker;
import org.eclipse.jubula.client.core.persistence.CompNamePM;
import org.eclipse.jubula.client.core.persistence.GeneralStorage;
-import org.eclipse.jubula.client.core.persistence.Persistor;
import org.eclipse.jubula.client.core.persistence.ISpecPersistable;
import org.eclipse.jubula.client.core.persistence.IncompatibleTypeException;
import org.eclipse.jubula.client.core.persistence.NodePM;
import org.eclipse.jubula.client.core.persistence.PMException;
import org.eclipse.jubula.client.core.persistence.PMReadException;
import org.eclipse.jubula.client.core.persistence.PMSaveException;
+import org.eclipse.jubula.client.core.persistence.Persistor;
import org.eclipse.jubula.client.core.persistence.ProjectPM;
import org.eclipse.jubula.client.core.progress.IProgressConsole;
import org.eclipse.jubula.toolkit.common.businessprocess.ToolkitSupportBP;
@@ -76,7 +76,6 @@ import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.toolkit.common.utils.ToolkitUtils;
import org.eclipse.jubula.toolkit.common.xml.businessprocess.ComponentBuilder;
import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.ConverterException;
import org.eclipse.jubula.tools.exception.GDConfigXmlException;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.JBVersionException;
@@ -193,13 +192,6 @@ public class FileStorageBP {
m_console.writeErrorLine(NLS.bind(
Messages.ImportFileActionErrorImportFailed,
fileName));
- } catch (ConverterException e) {
- m_console.writeErrorLine(NLS.bind(
- Messages.ImportFileActionErrorImportFailed,
- fileName));
- ErrorMessagePresenter.getPresenter().showErrorMessage(
- e, null, new String[] {Messages
- .ImportFileActionErrorMissingDepProj});
}
}
showFinishedReadingProjects(m_console);
@@ -456,16 +448,6 @@ public class FileStorageBP {
public boolean wasImportSuccessful() {
return m_wasImportSuccessful;
}
-
- /**
- *
- * @return <code>true</code> if the currently open project should
- * be refreshed after the import. Otherwise
- * <code>false</code>
- */
- public boolean isRefreshRequired() {
- return m_isRefreshRequired;
- }
/**
* @param proj
@@ -865,9 +847,6 @@ public class FileStorageBP {
/** indicates what part(s) of the project(s) will be imported */
private int m_elements;
- /** whether a refresh is required after import */
- private boolean m_isRefreshRequired;
-
/** mapping: projects to import => corresponding name mapper List */
private Map<IProjectPO, List<INameMapper>> m_projectToMapperMap;
@@ -909,7 +888,6 @@ public class FileStorageBP {
boolean openProject) {
m_elements = elements;
- m_isRefreshRequired = false;
m_projectToMapperMap = projectToMapperMap;
m_projectToCompCacheMap = projectToCompCacheMap;
m_console = console;
@@ -948,7 +926,6 @@ public class FileStorageBP {
break;
}
}
- m_isRefreshRequired = op.isRefreshRequired();
} else {
new PartsImportOperation(m_projectToMapperMap,
m_projectToCompCacheMap, m_elements, m_console)
@@ -961,16 +938,6 @@ public class FileStorageBP {
monitor.done();
}
}
-
- /**
- *
- * @return <code>true</code> if the currently open project should
- * be refreshed after the import. Otherwise
- * <code>false</code>
- */
- public boolean isRefreshRequired() {
- return m_isRefreshRequired;
- }
}
/**
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java
index 7dd0be7b3..32f8185fd 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/Messages.java
@@ -46,7 +46,6 @@ public class Messages extends NLS {
public static String ImportFileActionErrorImportFailed;
public static String ImportFileActionErrorImportFailedProject;
public static String ImportFileActionErrorIncompatibleToolkits;
- public static String ImportFileActionErrorMissingDepProj;
public static String ImportFileActionInfoFinishedImport;
public static String ImportFileActionInfoFinishedImportProject;
public static String ImportFileActionInfoFinishedReadingProjects;
diff --git a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/messages.properties b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/messages.properties
index 341f4f291..014221900 100644
--- a/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/messages.properties
+++ b/org.eclipse.jubula.client.archive/src/org/eclipse/jubula/client/archive/i18n/messages.properties
@@ -32,7 +32,6 @@ ImportFileActionDoubleProjName=The Project name already exists in the Database.
ImportFileActionErrorImportFailed=\tImport aborted\: {0}.
ImportFileActionErrorImportFailedProject=\tError occurred while importing {0}\:\n{1}.
ImportFileActionErrorIncompatibleToolkits=\tCould not import Test Cases from Project "{0}". The Project Toolkit "{1}" is not compatible with the Toolkit "{2}" of the current Project.
-ImportFileActionErrorMissingDepProj=The Projects or Test Cases you are trying to import reference other Projects \n(i.e. they contain reused Projects). \nPlease import these Projects into the database first.
ImportFileActionInfoFinishedImport=Finished importing projects.
ImportFileActionInfoFinishedImportProject=\tFinished importing {0}.
ImportFileActionInfoFinishedReadingProjects=\tFinished reading projects.
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java
index ffe069d22..047e899cc 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesDecorator.java
@@ -225,10 +225,9 @@ public class ComponentNamesDecorator implements IWritableComponentNameCache {
}
/**
- *
* {@inheritDoc}
*/
- public void removeReuse(String guid) throws PMException {
+ public void removeReuse(String guid) {
Integer timesReused = m_reuseChanged.get(guid);
if (timesReused == null) {
m_reuseChanged.put(guid, -1);
@@ -438,7 +437,7 @@ public class ComponentNamesDecorator implements IWritableComponentNameCache {
* {@inheritDoc}
*/
public void initCache(Set<String> guids) {
- Set ids = new HashSet();
+ Set<Long> ids = new HashSet<Long>();
// Collect ids
for (String guid : guids) {
IComponentNamePO cnPo =
@@ -453,7 +452,7 @@ public class ComponentNamesDecorator implements IWritableComponentNameCache {
"select compName from ComponentNamePO as compName where compName.id in :ids"); //$NON-NLS-1$
for (ValueListIterator iter = new ValueListIterator(
- new ArrayList(ids)); iter.hasNext();) {
+ new ArrayList<Long>(ids)); iter.hasNext();) {
q.setParameter("ids", iter.nextList()); //$NON-NLS-1$
List <IComponentNamePO> list = q.getResultList();
for (IComponentNamePO cn : list) {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/NullComponentNameMapper.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/NullComponentNameMapper.java
index e1a3cfce1..95e99e19c 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/NullComponentNameMapper.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/NullComponentNameMapper.java
@@ -39,9 +39,10 @@ public class NullComponentNameMapper implements IWritableComponentNameMapper {
/**
* {@inheritDoc}
*/
- public void changeReuse(IComponentNameReuser oldUser,
- IComponentNameReuser newUser,
- String compNameGuid) {
+ public void changeReuse(
+ @SuppressWarnings("unused") IComponentNameReuser oldUser,
+ @SuppressWarnings("unused") IComponentNameReuser newUser,
+ @SuppressWarnings("unused") String compNameGuid) {
// Null implementation
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java
index a3c6d5fe0..5e62d4b6f 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/TestresultSummaryBP.java
@@ -175,7 +175,7 @@ public class TestresultSummaryBP {
int nodeSequence = startingNodeSequence;
TestResultNode resultNode = result;
ITestResultPO keyword = PoMaker.createTestResultPO();
- fillNode(keyword, resultNode, sess);
+ fillNode(keyword, resultNode);
keyword.setKeywordLevel(nodeLevel);
keyword.setKeywordSequence(nodeSequence);
keyword.setInternalTestResultSummaryID(summaryId);
@@ -194,10 +194,8 @@ public class TestresultSummaryBP {
* fill result node
* @param keyword ITestResultPO
* @param node ITestResultPO
- * @param sess the session to use (required e.g. BLOBs)
*/
- private void fillNode(ITestResultPO keyword, TestResultNode node,
- EntityManager sess) {
+ private void fillNode(ITestResultPO keyword, TestResultNode node) {
INodePO inode = node.getNode();
keyword.setKeywordName(node.getNode().getName());
keyword.setInternalKeywordGuid(inode.getGuid());
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java
index 0b7e2209e..6ad5481a9 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/CAPRecordedCommand.java
@@ -502,7 +502,7 @@ public class CAPRecordedCommand implements ICommand {
public String removeMnemonics(String name) {
String fixedName = name;
if (fixedName != null) {
- fixedName = fixedName.replaceAll("&", StringConstants.EMPTY); //$NON-NLS-2$
+ fixedName = fixedName.replaceAll("&", StringConstants.EMPTY); //$NON-NLS-1$
}
return fixedName;
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java
index 811af2cae..f6ae426f6 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/commands/ProcessDirCommand.java
@@ -46,8 +46,7 @@ public class ProcessDirCommand implements ICommand {
* {@inheritDoc}
*/
public void timeout() {
-
-
+ // currently empty
}
/**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java
index f6626273b..05a288258 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompIdentifierPO.java
@@ -136,14 +136,15 @@ class CompIdentifierPO extends ComponentIdentifier implements
*/
public ICompIdentifierPO makePoClone() {
ICompIdentifierPO clone = new CompIdentifierPO();
- clone.setHierarchyNames(new ArrayList(
+ clone.setHierarchyNames(new ArrayList<Object>(
getHierarchyNames()));
clone.setComponentClassName(getComponentClassName());
if (getComponentClassName() != null) {
clone.setSupportedClassName(getComponentClassName());
}
if (getNeighbours() != null) {
- clone.setNeighbours(new ArrayList(getNeighbours()));
+ clone.setNeighbours(new ArrayList<Object>(
+ getNeighbours()));
}
if (getParentProjectId() != null) {
clone.setParentProjectId(getParentProjectId());
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java
index dc9c03ecb..265552f3e 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/CompNamesPairPO.java
@@ -64,7 +64,7 @@ class CompNamesPairPO implements ICompNamesPairPO {
/**
* For Persistence (JPA / EclipseLink)
*/
- private CompNamesPairPO() {
+ CompNamesPairPO() {
// OK
}
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java
index 9b7196a3c..594eea6f7 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/ObjectMappingProfilePO.java
@@ -124,8 +124,9 @@ class ObjectMappingProfilePO implements IObjectMappingProfilePO {
* @param contextFactor the new percentage weight for the context factor.
*/
private void setHbmContextFactor(double contextFactor) {
- m_pcs.firePropertyChange("contextFactor", this.m_contextFactor, //$NON-NLS-1$
- this.m_contextFactor = contextFactor);
+ double oldValue = m_contextFactor;
+ m_contextFactor = contextFactor;
+ m_pcs.firePropertyChange("contextFactor", oldValue, m_contextFactor); //$NON-NLS-1$
}
/**
@@ -134,8 +135,9 @@ class ObjectMappingProfilePO implements IObjectMappingProfilePO {
* @param nameFactor the new percentage weight for the name factor.
*/
private void setHbmNameFactor(double nameFactor) {
- m_pcs.firePropertyChange("nameFactor", this.m_nameFactor, //$NON-NLS-1$
- this.m_nameFactor = nameFactor);
+ double oldValue = m_nameFactor;
+ m_nameFactor = nameFactor;
+ m_pcs.firePropertyChange("nameFactor", oldValue, m_nameFactor); //$NON-NLS-1$
}
/**
@@ -144,17 +146,18 @@ class ObjectMappingProfilePO implements IObjectMappingProfilePO {
* @param pathFactor the new percentage weight for the path factor.
*/
private void setHbmPathFactor(double pathFactor) {
- m_pcs.firePropertyChange("pathFactor", this.m_pathFactor, //$NON-NLS-1$
- this.m_pathFactor = pathFactor);
+ double oldValue = m_pathFactor;
+ m_pathFactor = pathFactor;
+ m_pcs.firePropertyChange("pathFactor", oldValue, m_pathFactor); //$NON-NLS-1$
}
/**
* {@inheritDoc}
*/
public void setThreshold(double threshold) {
- m_pcs.firePropertyChange("threshold", //$NON-NLS-1$
- this.m_threshold,
- this.m_threshold = threshold);
+ double oldValue = m_threshold;
+ m_threshold = threshold;
+ m_pcs.firePropertyChange("threshold", oldValue, m_threshold); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java
index 993a6b2bf..e924b6b19 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/persistence/MonitoringValuePM.java
@@ -13,7 +13,6 @@ package org.eclipse.jubula.client.core.persistence;
import java.util.Map;
import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
import org.apache.commons.collections.MapUtils;
import org.eclipse.jubula.client.core.model.ITestResultSummaryPO;
@@ -47,8 +46,7 @@ public class MonitoringValuePM {
EntityManager session = Persistor.instance().openSession();
ITestResultSummaryPO summary;
try {
- EntityTransaction tx = Persistor.instance()
- .getTransaction(session);
+ Persistor.instance().getTransaction(session);
summary = session.find(PoMaker.getTestResultSummaryClass(),
summaryID);
} finally {
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java
index 19e26977c..2d966e19a 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/utils/Traverser.java
@@ -844,8 +844,6 @@ public class Traverser {
private static class EventObject {
/** <code>m_eventExecTc</code> managed eventExecTestCase */
private IEventExecTestCasePO m_eventExecTc;
- /** <code>m_eventType</code> associated eventType */
- private String m_eventType;
/** <code>m_stackPos</code> place of discovery of eventExecTestCase in execStack */
private int m_stackPos;
@@ -855,7 +853,6 @@ public class Traverser {
*/
private EventObject(IEventExecTestCasePO eventExecTc, int stackPos) {
m_eventExecTc = eventExecTc;
- m_eventType = eventExecTc.getEventType();
m_stackPos = stackPos;
}
/**
@@ -865,12 +862,6 @@ public class Traverser {
return m_eventExecTc;
}
/**
- * @return Returns the eventType.
- */
- public String getEventType() {
- return m_eventType;
- }
- /**
* @return Returns the stackPos.
*/
public int getStackPos() {
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionOMEditor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionOMEditor.java
index ca940d00f..53ff25166 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionOMEditor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/actions/PasteTreeItemActionOMEditor.java
@@ -87,8 +87,6 @@ public class PasteTreeItemActionOMEditor extends AbstractPasteTreeItemAction {
toMove, targetCategory)) {
return;
}
- OMEditorDndSupport.checkAndMoveCategories(
- toMove, targetCategory, ome);
}
} else if (transfer.containsOnlyType(IComponentNamePO.class)) {
// Use logic for dropping Component Names
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/AbstractComponentNameViewerUpdater.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/AbstractComponentNameViewerUpdater.java
index bb5c66dd4..8cf7d419b 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/AbstractComponentNameViewerUpdater.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/AbstractComponentNameViewerUpdater.java
@@ -13,7 +13,6 @@ package org.eclipse.jubula.client.ui.controllers;
import org.eclipse.jubula.client.core.events.DataChangedEvent;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.DataState;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IDataChangedListener;
-import org.eclipse.jubula.client.core.events.DataEventDispatcher.UpdateState;
import org.eclipse.jubula.client.core.model.IComponentNamePO;
import org.eclipse.jubula.client.core.model.IObjectMappingPO;
import org.eclipse.jubula.client.core.model.IPersistentObject;
@@ -36,14 +35,13 @@ public abstract class AbstractComponentNameViewerUpdater
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
/** {@inheritDoc} */
public final void handleDataChanged(IPersistentObject po,
- DataState dataState, UpdateState updateState) {
+ DataState dataState) {
if (po instanceof IComponentNamePO) {
IComponentNamePO compName = (IComponentNamePO)po;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java
index 0ad35c627..6b5884c91 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionContributor.java
@@ -15,8 +15,6 @@ import java.net.UnknownHostException;
import java.util.List;
import org.apache.commons.lang.Validate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jubula.client.core.AUTEvent;
import org.eclipse.jubula.client.core.AUTServerEvent;
@@ -54,7 +52,6 @@ import org.eclipse.jubula.client.ui.provider.labelprovider.OMEditorTreeLabelProv
import org.eclipse.jubula.client.ui.utils.JobUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.tools.constants.DebugConstants;
import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.constants.TimingConstantsClient;
@@ -66,6 +63,8 @@ import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PartInitException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -703,8 +702,7 @@ public class TestExecutionContributor
* @param conf configuration to use for AUT
* @param aut The IAUTMainPO
*/
- public void startAUTaction(final IAUTMainPO aut, final IAUTConfigPO conf)
- throws ToolkitPluginException {
+ public void startAUTaction(final IAUTMainPO aut, final IAUTConfigPO conf) {
Validate.notNull(conf, Messages.ConfigurationMustNotNull);
Job job = new StartAutJob(aut, conf);
JobUtils.executeJob(job, null);
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java
index f06b376c9..beca01b3f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/TestExecutionGUIController.java
@@ -14,8 +14,6 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
@@ -37,19 +35,18 @@ import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.JBThread;
import org.eclipse.jubula.client.ui.utils.JobUtils;
import org.eclipse.jubula.client.ui.utils.ServerManager.Server;
-import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.communication.ICommand;
import org.eclipse.jubula.communication.message.Message;
import org.eclipse.jubula.communication.message.SendCompSystemI18nMessage;
import org.eclipse.jubula.communication.message.StopAUTServerMessage;
-import org.eclipse.jubula.toolkit.common.exception.ToolkitPluginException;
import org.eclipse.jubula.tools.constants.AutConfigConstants;
import org.eclipse.jubula.tools.constants.CommandConstants;
import org.eclipse.jubula.tools.exception.CommunicationException;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
-import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.jubula.tools.registration.AutIdentifier;
import org.eclipse.osgi.util.NLS;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -86,28 +83,22 @@ public class TestExecutionGUIController {
@Override
public void run() {
- try {
- if (aut.getToolkit()
- .equals(CommandConstants.RCP_TOOLKIT)) {
- AutIdentifier autId = new AutIdentifier(
- conf.getConfigMap().get(
- AutConfigConstants.AUT_ID));
- m_infoRCPTask = new RCPAUTStartDelayNagTask(autId);
- Timer timer = new Timer();
- try {
- timer.schedule(m_infoRCPTask, NAGGER_TIMEOUT);
- } catch (IllegalStateException e) {
- // do nothing if task has already been cancelled
- }
+ if (aut.getToolkit()
+ .equals(CommandConstants.RCP_TOOLKIT)) {
+ AutIdentifier autId = new AutIdentifier(
+ conf.getConfigMap().get(
+ AutConfigConstants.AUT_ID));
+ m_infoRCPTask = new RCPAUTStartDelayNagTask(autId);
+ Timer timer = new Timer();
+ try {
+ timer.schedule(m_infoRCPTask, NAGGER_TIMEOUT);
+ } catch (IllegalStateException e) {
+ // do nothing if task has already been cancelled
}
-
- TestExecutionContributor.getInstance().startAUTaction(
- aut, conf);
- } catch (ToolkitPluginException tpe) {
- interrupt();
- Utils.createMessageDialog(
- MessageIDs.E_AUT_TOOLKIT_NOT_AVAILABLE);
}
+
+ TestExecutionContributor.getInstance().startAUTaction(
+ aut, conf);
}
@Override
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMDropTargetListener.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMDropTargetListener.java
index 8d1fe8880..108814072 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMDropTargetListener.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMDropTargetListener.java
@@ -84,7 +84,7 @@ public class OMDropTargetListener extends ViewerDropAdapter {
IObjectMappingCategoryPO.class)) {
// Use logic for dropping categories
List<IObjectMappingCategoryPO> toMove = selection.toList();
- dropCategories(editor, toMove, target);
+ dropCategories(toMove, target);
} else if (containsOnlyType(selection, IComponentNamePO.class)) {
// Use logic for dropping Component Names
List<IComponentNamePO> toMove = selection.toList();
@@ -139,8 +139,6 @@ public class OMDropTargetListener extends ViewerDropAdapter {
/**
*
- * @param editor
- * The editor in which the drop occurred.
* @param toMove
* The categories being moved.
* @param target
@@ -149,8 +147,8 @@ public class OMDropTargetListener extends ViewerDropAdapter {
* @return <code>true</code> if the drop was successful. Otherwise
* <code>false</code>.
*/
- protected boolean dropCategories(ObjectMappingMultiPageEditor editor,
- List<IObjectMappingCategoryPO> toMove, Object target) {
+ protected boolean dropCategories(List<IObjectMappingCategoryPO> toMove,
+ Object target) {
if (target instanceof IObjectMappingCategoryPO) {
IObjectMappingCategoryPO targetCategory =
@@ -158,8 +156,7 @@ public class OMDropTargetListener extends ViewerDropAdapter {
if (!OMEditorDndSupport.isMergeIfNeeded(toMove, targetCategory)) {
return false;
}
- OMEditorDndSupport.checkAndMoveCategories(toMove, targetCategory,
- editor);
+ return false;
}
return true;
@@ -213,12 +210,7 @@ public class OMDropTargetListener extends ViewerDropAdapter {
IObjectMappingCategoryPO.class)) {
// Use logic for validating categories
if (dropTarget instanceof IObjectMappingCategoryPO) {
- IObjectMappingCategoryPO targetCategory =
- (IObjectMappingCategoryPO)dropTarget;
- List<IObjectMappingCategoryPO> toMove =
- selection.toList();
- return OMEditorDndSupport.canMoveCategories(toMove,
- (IObjectMappingCategoryPO)dropTarget, m_editor);
+ return false;
}
return false;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMEditorDndSupport.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMEditorDndSupport.java
index 89ed48b8c..0c8c65420 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMEditorDndSupport.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/dnd/objectmapping/OMEditorDndSupport.java
@@ -354,37 +354,6 @@ public class OMEditorDndSupport {
}
/**
- * Moves the categories in <code>toMove</code> to <code>target</code>.
- *
- * @param toMove The categories to move.
- * @param target The category into which the other categories will be moved.
- * @param editor The editor in which the move occurs.
- */
- public static void checkAndMoveCategories(
- List<IObjectMappingCategoryPO> toMove,
- IObjectMappingCategoryPO target,
- ObjectMappingMultiPageEditor editor) {
-
- // FIXME zeb workaround for delete-orphan mapping om categories to
- // child om categories
- // workaround: disallow moving of categories
-// IObjectMappingCategoryPO newSection =
-// editor.getOmEditorBP().getSection(target);
-// for (IObjectMappingCategoryPO category : toMove) {
-// IObjectMappingCategoryPO oldSection =
-// editor.getOmEditorBP().getSection(category);
-//
-// if (!target.equals(category)
-// && oldSection.equals(newSection)
-// && !editor.getOmEditorBP().existCategory(
-// target, category.getName())) {
-// moveAndMergeCategory(target, category);
-// }
-// }
- // FIXME zeb end workaround
- }
-
- /**
* Checks if there are categories to be merged. Ask User if he wants to merge and
* returns the result
*
@@ -422,98 +391,6 @@ public class OMEditorDndSupport {
return doIt;
}
-
- /**
- * move a category to a target destination, if already one category exists, move
- * children into it
- * @param target The target category.
- * @param srcCategory The category to move/merge.
- */
- private static void moveAndMergeCategory(IObjectMappingCategoryPO target,
- IObjectMappingCategoryPO srcCategory) {
-
- IObjectMappingCategoryPO existingCategory = null;
- srcCategory.getParent().removeCategory(srcCategory);
-
- for (IObjectMappingCategoryPO child
- : target.getUnmodifiableCategoryList()) {
- if (child.getName().equals(srcCategory.getName())) {
- existingCategory = child;
- break;
- }
- }
- if (existingCategory != null) {
- for (IObjectMappingAssoziationPO child
- : new ArrayList<IObjectMappingAssoziationPO>(
- srcCategory.getUnmodifiableAssociationList())) {
-
- srcCategory.removeAssociation(child);
- existingCategory.addAssociation(child);
- }
- for (IObjectMappingCategoryPO child
- : new ArrayList<IObjectMappingCategoryPO>(
- srcCategory.getUnmodifiableCategoryList())) {
- moveAndMergeCategory(existingCategory, child);
- }
- } else {
- target.addCategory(srcCategory);
- }
-
- }
-
- /**
- *
- * @param toMove The categories for which the move operation is
- * to be checked.
- * @param target The target category for which the move operation is to be
- * checked.
- * @param editor The editor in which the move operation would occur.
- * @return <code>true</code> if the arguments represent a valid move
- * operation. Otherwise <code>false</code>.
- */
- public static boolean canMoveCategories(
- List<IObjectMappingCategoryPO> toMove,
- IObjectMappingCategoryPO target,
- ObjectMappingMultiPageEditor editor) {
-
- // FIXME zeb workaround for delete-orphan mapping om categories to
- // child om categories
- // workaround: disallow moving of categories
-// for (IObjectMappingCategoryPO category : toMove) {
-// if (!canMove(category, target, editor)) {
-// return false;
-// }
-// }
-//
-// return true;
- return false;
- // FIXME zeb end workaround
- }
-
- /**
- *
- * @param category The category for which the move operation is
- * to be checked.
- * @param target The target category for which the move operation is to be
- * checked.
- * @param editor The editor in which the move operation would occur.
- * @return <code>true</code> if the arguments represent a valid move
- * operation. Otherwise <code>false</code>.
- */
- private static boolean canMove(
- IObjectMappingCategoryPO category,
- IObjectMappingCategoryPO target,
- ObjectMappingMultiPageEditor editor) {
-
- IObjectMappingCategoryPO newSection = getSection(target);
- IObjectMappingCategoryPO oldSection = getSection(category);
-
- return !target.equals(category)
- && oldSection.equals(newSection)
- && !editor.getOmEditorBP().existCategory(
- target, category.getName());
- }
-
/**
*
* @param toMove The associations for which the move operation is
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/MonitoringValuePropertySource.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/MonitoringValuePropertySource.java
index 37d7b14d4..0be4f4b78 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/MonitoringValuePropertySource.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/controllers/propertysources/MonitoringValuePropertySource.java
@@ -54,7 +54,7 @@ public class MonitoringValuePropertySource implements IPropertySource {
* {@inheritDoc}
*/
public Object getEditableValue() {
- return "editableValue";
+ return "editableValue"; //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java
index c7e68a0a4..888d523be 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/DBLoginDialog.java
@@ -299,11 +299,11 @@ public class DBLoginDialog extends TitleAreaDialog {
new ISelectionChangedListener() {
public void selectionChanged(SelectionChangedEvent event) {
- IStructuredSelection sel =
+ IStructuredSelection csel =
(IStructuredSelection)event.getSelection();
selectSchemaCbxAction();
checkEmbeddedDbOrNoSchemaSelected(
- (DatabaseConnection)sel.getFirstElement());
+ (DatabaseConnection)csel.getFirstElement());
setUserAndPwdVisible(!m_isEmbeddedOrNoSelection);
}
});
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EditParametersDialog.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EditParametersDialog.java
index d2c30d194..660ba322c 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EditParametersDialog.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/dialogs/EditParametersDialog.java
@@ -172,7 +172,7 @@ public final class EditParametersDialog extends AbstractEditParametersDialog {
});
ControlDecorator.decorateInfo(m_lockInterfaceCheckBox,
- "GDControlDecorator.EditParameterLock", false);
+ "GDControlDecorator.EditParameterLock", false); //$NON-NLS-1$
}
/**
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java
index 2e7279790..82f6754b3 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/AbstractJBEditor.java
@@ -652,7 +652,8 @@ public abstract class AbstractJBEditor extends EditorPart implements IJBEditor,
* @param po
* The corresponding NodePO.
*/
- protected void renameGUINode(IPersistentObject po) {
+ protected void renameGUINode(
+ @SuppressWarnings("unused") IPersistentObject po) {
getMainTreeViewer().refresh(true);
// rename the editor based on currently edited node
createPartName();
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingConfigComponent.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingConfigComponent.java
index 1219cfc09..fb670ffe0 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingConfigComponent.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingConfigComponent.java
@@ -72,10 +72,6 @@ public class ObjectMappingConfigComponent {
*/
private class JBEditorUpdateValueStrategy
extends UpdateValueStrategy {
- /**
- * the editor within which this update value strategy does its work
- */
- private IJBEditor m_editor;
/**
* Constructor
@@ -85,19 +81,15 @@ public class ObjectMappingConfigComponent {
*/
public JBEditorUpdateValueStrategy(IJBEditor editor) {
super();
- m_editor = editor;
}
/**
* Constructor
*
* @param updatePolicy The updatePolicy to use.
- * @param editor The editor within which this update value strategy
- * does its work.
*/
- public JBEditorUpdateValueStrategy(int updatePolicy, IJBEditor editor) {
+ public JBEditorUpdateValueStrategy(int updatePolicy) {
super(updatePolicy);
- m_editor = editor;
}
/**
@@ -302,11 +294,6 @@ public class ObjectMappingConfigComponent {
new ModelToSliderConverter();
/**
- * Textfield for m_nameFactor
- */
- private Label m_nameMalusText = null;
-
- /**
* slider for recognitionParameter
*/
private Scale m_threshold = null;
@@ -404,7 +391,7 @@ public class ObjectMappingConfigComponent {
linkFactorSliders(m_bindingContext, factorSliders, editor);
createThresholdSlider(m_sliderComposite, m_bindingContext,
- m_profileObservable, editor);
+ m_profileObservable);
m_bindingContext.updateTargets();
@@ -556,7 +543,7 @@ public class ObjectMappingConfigComponent {
bindingContext.bindValue(uiElement, modelElement,
new JBEditorUpdateValueStrategy(
- UpdateValueStrategy.POLICY_ON_REQUEST, editor)
+ UpdateValueStrategy.POLICY_ON_REQUEST)
.setConverter(m_sliderToModelConverter),
new UpdateValueStrategy()
.setConverter(m_modelToSliderConverter));
@@ -694,11 +681,10 @@ public class ObjectMappingConfigComponent {
* @param masterObservable Observable value used to determine
* which model object is currently
* being observed in detail.
- * @param editor The editor that contains this slider.
*/
private void createThresholdSlider(Composite parent,
DataBindingContext bindingContext,
- IObservableValue masterObservable, IJBEditor editor) {
+ IObservableValue masterObservable) {
String boundProperty =
IObjectMappingProfilePO.PROP_THRESHOLD;
@@ -721,7 +707,7 @@ public class ObjectMappingConfigComponent {
boundProperty,
double.class);
bindingContext.bindValue(uiElement, modelElement,
- new JBEditorUpdateValueStrategy(editor)
+ new UpdateValueStrategy()
.setConverter(m_sliderToModelConverter),
new UpdateValueStrategy()
.setConverter(m_modelToSliderConverter));
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java
index a1b109ff5..d4b68c955 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/editors/ObjectMappingMultiPageEditor.java
@@ -728,35 +728,6 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
}
/**
- *
- * @param toMove The categories on the clipboard.
- * @param targetList The currently selected elements.
- * @return <code>true</code> if the paste operation should be
- * enabled for the given arguments. Otherwise,
- * <code>false</code>.
- */
- private boolean getPasteActionEnablementForCategories(
- List<IObjectMappingCategoryPO> toMove,
- List<Object> targetList) {
-
- for (Object target : targetList) {
- if (target instanceof IObjectMappingCategoryPO) {
- if (!OMEditorDndSupport.canMoveCategories(
- toMove, (IObjectMappingCategoryPO)target,
- ObjectMappingMultiPageEditor.this)) {
-
- return false;
- }
- } else {
- return false;
- }
- }
-
- return true;
- }
-
- /**
- *
* @param targetList The currently selected elements.
* @return <code>true</code> if the paste operation should be
* enabled for the given arguments. Otherwise,
@@ -812,9 +783,7 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
} else if (transfer.containsOnlyType(
IObjectMappingCategoryPO.class)) {
// Use logic for validating categories
- isEnabled = getPasteActionEnablementForCategories(
- transfer.getSelection().toList(),
- sel.toList());
+ isEnabled = false;
} else if (transfer.containsOnlyType(IComponentNamePO.class)) {
// Use logic for validating Component Names
isEnabled = getPasteActionEnablementForCompNames(sel.toList());
@@ -2209,18 +2178,16 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
/** {@inheritDoc} */
- public void handleDataChanged(IPersistentObject po, DataState dataState,
- UpdateState updateState) {
+ public void handleDataChanged(IPersistentObject po, DataState dataState) {
getEditorHelper().handleDataChanged(po, dataState);
if (m_treeViewerUpdater != null) {
- m_treeViewerUpdater.handleDataChanged(po, dataState, updateState);
+ m_treeViewerUpdater.handleDataChanged(po, dataState);
}
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java
index 93787a88a..3d49141d3 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/CreateNewProjectVersionHandler.java
@@ -47,9 +47,6 @@ import org.eclipse.jubula.client.ui.dialogs.VersionDialog;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.DialogUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
-import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.Assert;
-import org.eclipse.jubula.tools.exception.ConverterException;
import org.eclipse.jubula.tools.exception.JBException;
import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
@@ -144,12 +141,6 @@ public class CreateNewProjectVersionHandler extends AbstractHandler {
// should not be occur
log.error(Messages.
ToolkitVersionConflictWhileCreatingNewProjectVersion);
- } catch (ConverterException e) {
- // should not occur
- final String msg = Messages.Exception + StringConstants.SPACE
- + e + StringConstants.SPACE + Messages.ShouldNotOccur;
- log.error(msg);
- Assert.notReached(msg);
} finally {
NodePM.getInstance().setUseCache(false);
monitor.done();
@@ -176,8 +167,7 @@ public class CreateNewProjectVersionHandler extends AbstractHandler {
final ParamNameBPDecorator paramNameMapper,
final IWritableComponentNameCache compNameCache)
throws ProjectDeletedException, PMException,
- InterruptedException, PMReadException, JBVersionException,
- ConverterException {
+ InterruptedException, PMReadException, JBVersionException {
NodePM.getInstance().setUseCache(true);
GeneralStorage.getInstance().validateProjectExists(
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ExtractTestCaseHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ExtractTestCaseHandler.java
index 5a23f03fb..3fa62c7ec 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ExtractTestCaseHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/ExtractTestCaseHandler.java
@@ -202,13 +202,6 @@ public class ExtractTestCaseHandler extends AbstractHandler {
}
/**
- * @param errorMessage The errorMessage to set.
- */
- public void setErrorMessage(String errorMessage) {
- m_errorMessage = errorMessage;
- }
-
- /**
* @param execTestCasePO The execTestCasePO to set.
*/
public void setExecTestCasePO(IExecTestCasePO execTestCasePO) {
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/AbstractOpenHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/AbstractOpenHandler.java
index be3969791..3772a4947 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/AbstractOpenHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/AbstractOpenHandler.java
@@ -72,7 +72,6 @@ public abstract class AbstractOpenHandler extends AbstractHandler {
return true;
}
-
/**
* @param specTc the spec to open the editor for
*/
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/OpenTestJobEditorHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/OpenTestJobEditorHandler.java
index 0ee693eed..3d063a1ae 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/OpenTestJobEditorHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/open/OpenTestJobEditorHandler.java
@@ -13,7 +13,6 @@ package org.eclipse.jubula.client.ui.handlers.open;
import java.util.Iterator;
import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jubula.client.core.model.INodePO;
import org.eclipse.jubula.client.core.model.ITestJobPO;
@@ -38,7 +37,7 @@ public class OpenTestJobEditorHandler extends AbstractOpenHandler {
/**
* {@inheritDoc}
*/
- public Object execute(ExecutionEvent event) throws ExecutionException {
+ public Object execute(ExecutionEvent event) {
TestSuiteBrowser testExecTreeView = (TestSuiteBrowser)Plugin
.getView(Constants.TS_BROWSER_ID);
if (testExecTreeView == null) {
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java
index bf537473e..65df0b7de 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/handlers/project/SaveProjectAsHandler.java
@@ -14,8 +14,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -49,15 +47,14 @@ import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.utils.DialogUtils;
import org.eclipse.jubula.client.ui.utils.Utils;
import org.eclipse.jubula.tools.constants.DebugConstants;
-import org.eclipse.jubula.tools.constants.StringConstants;
-import org.eclipse.jubula.tools.exception.Assert;
-import org.eclipse.jubula.tools.exception.ConverterException;
import org.eclipse.jubula.tools.exception.JBVersionException;
import org.eclipse.jubula.tools.exception.ProjectDeletedException;
import org.eclipse.jubula.tools.jarutils.IVersion;
import org.eclipse.jubula.tools.messagehandling.MessageIDs;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.PlatformUI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -170,11 +167,6 @@ public class SaveProjectAsHandler extends AbstractProjectHandler {
// has a version conflict with installed Toolkit Plugin.
log.error(Messages.
ToolkitVersionConflictWhileSaveProjectAsAction);
- } catch (ConverterException e) { // should not occur
- final String msg = Messages.Exception + StringConstants.SPACE
- + e + StringConstants.SPACE + Messages.ShouldNotOccur;
- log.error(msg);
- Assert.notReached(msg);
} finally {
NodePM.getInstance().setUseCache(false);
Plugin.stopLongRunning();
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/Messages.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/Messages.java
index 54262fec5..638a99ff8 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/Messages.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/Messages.java
@@ -920,7 +920,6 @@ public class Messages extends NLS {
public static String TestDataDecoratorTestSuiteWithoutAUT;
public static String TestDataDecoratorUnsupportedAUTLanguage;
public static String TestDataPreferencePageCharForEsc;
- public static String TestDataPreferencePageCharForFunc;
public static String TestDataPreferencePageCharForRef;
public static String TestDataPreferencePagedescription;
public static String TestDataPreferencePageEscEmpty;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/messages.properties b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/messages.properties
index c5dd80af7..d82f38f03 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/messages.properties
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/i18n/messages.properties
@@ -906,7 +906,6 @@ TestDataDecoratorTestJobIncompl=The Test Job is incomplete.
TestDataDecoratorTestSuiteWithoutAUT=No AUT has been chosen for this Test Suite.
TestDataDecoratorUnsupportedAUTLanguage=The AUT for this Test Suite does not support the currently chosen working language.
TestDataPreferencePageCharForEsc=Escape character\:
-TestDataPreferencePageCharForFunc=Function symbol\:
TestDataPreferencePageCharForRef=Reference symbol\:
TestDataPreferencePagedescription=This is the preference page for the Test Data settings.
TestDataPreferencePageEscEmpty=Please specify a valid escape symbol.
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestDataPreferencePage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestDataPreferencePage.java
index 3a1ebcbf8..22e95d2d3 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestDataPreferencePage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestDataPreferencePage.java
@@ -83,12 +83,8 @@ public class TestDataPreferencePage extends PreferencePage
/** textfield to define character for seperator path */
private CheckedRequiredText m_textPathSep = null;
- /** textfield to define character for function */
- private CheckedRequiredText m_textFunc = null;
-
/**
* Default Constructor
- *
*/
public TestDataPreferencePage() { //
setPreferenceStore(Plugin.getDefault().getPreferenceStore());
@@ -273,23 +269,6 @@ public class TestDataPreferencePage extends PreferencePage
}
/**
- * @param parent parent of this textfield
- */
- private void createFuncTextfield(Composite parent) {
- Label labelFunc = new Label(parent, SWT.NONE);
- labelFunc.setText(Messages.TestDataPreferencePageCharForFunc);
- m_textFunc = new CheckedRequiredText(parent, SWT.SINGLE | SWT.BORDER);
- m_textFunc.setText(getPreferenceStore()
- .getString(Constants.FUNCTION_CHAR_KEY));
- m_textFunc.setTextLimit(ESC_TF_LIMIT);
- GridData textDataFunc = new GridData();
- textDataFunc.widthHint = Dialog.convertWidthInCharsToPixels(
- Layout.getFontMetrics(parent), ESC_TF_LIMIT + 1);
- textDataFunc.horizontalSpan = HORIZONTAL_SPAN;
- m_textFunc.setLayoutData(textDataFunc);
- }
-
- /**
* Initializes the preference page
*
* {@inheritDoc}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestResultPreferencePage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestResultPreferencePage.java
index 7286fd693..6f83093cf 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestResultPreferencePage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/preferences/TestResultPreferencePage.java
@@ -602,14 +602,6 @@ public class TestResultPreferencePage extends PreferencePage
}
/**
- * @return default value
- * @param key preference key
- */
- private int getDefaultPrefsInt(String key) {
- return getPreferenceStore().getDefaultInt(key);
- }
-
- /**
* Method declared on IPreferencePage.
*
* @return performOK
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/CentralTestDataLabelProvider.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/CentralTestDataLabelProvider.java
index 4a1040099..481d8f9d7 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/CentralTestDataLabelProvider.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/provider/labelprovider/CentralTestDataLabelProvider.java
@@ -16,6 +16,7 @@ import org.eclipse.jubula.client.core.model.IParamDescriptionPO;
import org.eclipse.jubula.client.core.model.IParameterInterfacePO;
import org.eclipse.jubula.client.core.model.ITestDataCubePO;
import org.eclipse.jubula.client.ui.constants.IconConstants;
+import org.eclipse.jubula.tools.constants.StringConstants;
import org.eclipse.jubula.tools.i18n.CompSystemI18n;
import org.eclipse.swt.graphics.Image;
@@ -44,7 +45,7 @@ public class CentralTestDataLabelProvider extends GeneralLabelProvider {
.next();
info.append(
CompSystemI18n.getString(descr.getType(), true));
- info.append(":");
+ info.append(StringConstants.COLON);
info.append(descr.getName());
if (iter.hasNext()) {
info.append(SEPARATOR);
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/AbstractShowWhereUsedQuery.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/AbstractShowWhereUsedQuery.java
index 08da616d1..a1767f079 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/AbstractShowWhereUsedQuery.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/AbstractShowWhereUsedQuery.java
@@ -16,4 +16,5 @@ package org.eclipse.jubula.client.ui.search.query;
* @created Jul 27, 2010
*/
public abstract class AbstractShowWhereUsedQuery extends AbstractSearchQuery {
+ // currently empty
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/ShowWhereUsedComponentNameQuery.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/ShowWhereUsedComponentNameQuery.java
index a6d02d9b4..e217ac008 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/ShowWhereUsedComponentNameQuery.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/search/query/ShowWhereUsedComponentNameQuery.java
@@ -109,7 +109,10 @@ public class ShowWhereUsedComponentNameQuery
}
StringBuilder assocSb = new StringBuilder();
if (aut != null) {
- assocSb.append(aut.getName()).append(" / ");
+ assocSb.append(aut.getName())
+ .append(StringConstants.SPACE)
+ .append(StringConstants.SLASH)
+ .append(StringConstants.SPACE);
}
assocSb.append(
assoc.getTechnicalName().getComponentNameToDisplay());
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AvailableAutSourceProvider.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AvailableAutSourceProvider.java
index 41089fd6e..5503396ea 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AvailableAutSourceProvider.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/sourceprovider/AvailableAutSourceProvider.java
@@ -27,7 +27,6 @@ import org.eclipse.jubula.client.core.events.DataEventDispatcher.IProjectLoadedL
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IProjectPropertiesModifyListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IServerConnectionListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.ServerState;
-import org.eclipse.jubula.client.core.events.DataEventDispatcher.UpdateState;
import org.eclipse.jubula.client.core.model.IPersistentObject;
import org.eclipse.jubula.client.core.model.IProjectPO;
import org.eclipse.jubula.client.ui.businessprocess.StartAutBP;
@@ -158,16 +157,14 @@ public class AvailableAutSourceProvider extends AbstractJBSourceProvider
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
/**
* {@inheritDoc}
*/
- public void handleDataChanged(IPersistentObject po, DataState dataState,
- UpdateState updateState) {
+ public void handleDataChanged(IPersistentObject po, DataState dataState) {
if (po instanceof IProjectPO && dataState == DataState.Deleted) {
fireSourceChanged();
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/RemoteFileStore.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/RemoteFileStore.java
index d05939119..dfb0ab5bb 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/RemoteFileStore.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/utils/RemoteFileStore.java
@@ -100,8 +100,7 @@ public class RemoteFileStore extends FileStore {
/**
* {@inheritDoc}
*/
- public IFileInfo fetchInfo(int options, IProgressMonitor monitor)
- throws CoreException {
+ public IFileInfo fetchInfo(int options, IProgressMonitor monitor) {
FileInfo result = new FileInfo(m_path);
result.setDirectory(m_isDirectory);
result.setExists(m_isContentValid);
@@ -155,8 +154,7 @@ public class RemoteFileStore extends FileStore {
/**
* {@inheritDoc}
*/
- public InputStream openInputStream(int options, IProgressMonitor monitor)
- throws CoreException {
+ public InputStream openInputStream(int options, IProgressMonitor monitor) {
return new ByteArrayInputStream(new byte[0]);
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractJBTreeView.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractJBTreeView.java
index 174cacded..af790bce8 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractJBTreeView.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/AbstractJBTreeView.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.jubula.client.ui.views;
-import java.util.List;
-
import javax.persistence.EntityManager;
import org.eclipse.core.runtime.OperationCanceledException;
@@ -36,7 +34,6 @@ import org.eclipse.jubula.client.ui.filter.JBBrowserPatternFilter;
import org.eclipse.jubula.client.ui.filter.JBFilteredTree;
import org.eclipse.jubula.client.ui.i18n.Messages;
import org.eclipse.jubula.client.ui.sorter.NodeNameViewerSorter;
-import org.eclipse.jubula.client.ui.utils.NodeSelection;
import org.eclipse.jubula.client.ui.utils.UIIdentitiyElementComparer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.Clipboard;
@@ -73,18 +70,6 @@ public abstract class AbstractJBTreeView extends ViewPart implements
*/
private Text m_treeFilterText;
- /**
- * <code>m_selElemList</code> list of selected elements. Used for restoring
- * selection state.
- */
- private List<NodeSelection> m_selElemList;
-
- /**
- * <code>m_expElemList</code> list of expanded elements. Used for restoring
- * expansion state.
- */
- private List<Object> m_expElemList;
-
/** the parent composite */
private Composite m_parentComposite;
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/JBPropertiesView.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/JBPropertiesView.java
index a436069e9..1ef4f3f04 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/JBPropertiesView.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/JBPropertiesView.java
@@ -60,7 +60,6 @@ import org.eclipse.jubula.client.core.events.DataEventDispatcher.IDataChangedLis
import org.eclipse.jubula.client.core.events.DataEventDispatcher.ILanguageChangedListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IParamChangedListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IPartClosedListener;
-import org.eclipse.jubula.client.core.events.DataEventDispatcher.UpdateState;
import org.eclipse.jubula.client.core.model.ICapPO;
import org.eclipse.jubula.client.core.model.INodePO;
import org.eclipse.jubula.client.core.model.IPersistentObject;
@@ -487,8 +486,7 @@ public class JBPropertiesView extends Page implements IDataChangedListener,
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
@@ -496,7 +494,7 @@ public class JBPropertiesView extends Page implements IDataChangedListener,
* {@inheritDoc}
*/
public void handleDataChanged(final IPersistentObject po,
- final DataState dataState, final UpdateState updateState) {
+ final DataState dataState) {
Plugin.getDisplay().syncExec(new Runnable() {
public void run() {
// indirection necessary due to Checkstyle BUG
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestResultTreeView.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestResultTreeView.java
index 93caab164..9049cc285 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestResultTreeView.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestResultTreeView.java
@@ -34,7 +34,6 @@ import org.eclipse.jubula.client.core.events.DataEventDispatcher;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.DataState;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IDataChangedListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IProjectLoadedListener;
-import org.eclipse.jubula.client.core.events.DataEventDispatcher.UpdateState;
import org.eclipse.jubula.client.core.model.IPersistentObject;
import org.eclipse.jubula.client.core.model.IProjectPO;
import org.eclipse.jubula.client.core.model.ITestSuitePO;
@@ -405,8 +404,7 @@ public class TestResultTreeView extends ViewPart
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
@@ -414,8 +412,7 @@ public class TestResultTreeView extends ViewPart
* {@inheritDoc}
*/
public void handleDataChanged(final IPersistentObject po,
- final DataState dataState,
- UpdateState updateState) {
+ final DataState dataState) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java
index 6b790b1bb..ed06ca520 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/TestresultSummaryView.java
@@ -1765,7 +1765,7 @@ public class TestresultSummaryView extends ViewPart implements
if (monitoringValueTyp.equals(
MonitoringConstants.DOUBLE_VALUE)) {
return String.format(Locale.getDefault(),
- "%f", monitoringValue);
+ "%f", monitoringValue); //$NON-NLS-1$
}
return StringUtils.defaultString(monitoringValue);
}
@@ -1998,13 +1998,6 @@ public class TestresultSummaryView extends ViewPart implements
public void setFilterType(String filterType) {
m_filterType = filterType;
}
-
- /**
- * @return the filterType
- */
- public String getFilterType() {
- return m_filterType;
- }
}
/**
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/AbstractDataSetPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/AbstractDataSetPage.java
index 6344461ef..6565cfa47 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/AbstractDataSetPage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/dataset/AbstractDataSetPage.java
@@ -33,7 +33,6 @@ import org.eclipse.jubula.client.core.events.DataEventDispatcher.IDataChangedLis
import org.eclipse.jubula.client.core.events.DataEventDispatcher.ILanguageChangedListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IParamChangedListener;
import org.eclipse.jubula.client.core.events.DataEventDispatcher.IProjectLoadedListener;
-import org.eclipse.jubula.client.core.events.DataEventDispatcher.UpdateState;
import org.eclipse.jubula.client.core.model.ICapPO;
import org.eclipse.jubula.client.core.model.IDataSetPO;
import org.eclipse.jubula.client.core.model.IExecTestCasePO;
@@ -1209,6 +1208,7 @@ public abstract class AbstractDataSetPage extends Page
*/
private static class ParameterContentProvider
extends LanguageContentProvider {
+ // currently empty
}
/**
@@ -1366,14 +1366,12 @@ public abstract class AbstractDataSetPage extends Page
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
/** {@inheritDoc} */
- public void handleDataChanged(IPersistentObject po, DataState dataState,
- UpdateState updateState) {
+ public void handleDataChanged(IPersistentObject po, DataState dataState) {
if (dataState == DataState.Deleted
&& po.equals(getParamInterfaceObj())) {
setParamInterfaceObj(null);
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java
index 3d553cf2b..15a51169f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/views/problemview/JBMarkerResolutionGenerator.java
@@ -439,7 +439,6 @@ public class JBMarkerResolutionGenerator implements IMarkerResolutionGenerator {
if (node.toString().equals(
gdObject.toString())) {
ctx.setContinued(false);
- INodePO selectedNode = node;
INodePO editableNode =
node.getParentNode();
if (editableNode == null) {
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ComponentNamesTableComposite.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ComponentNamesTableComposite.java
index 058c2ccbc..ff9915a9f 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ComponentNamesTableComposite.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/ComponentNamesTableComposite.java
@@ -832,16 +832,14 @@ public class ComponentNamesTableComposite extends Composite implements
/** {@inheritDoc} */
public void handleDataChanged(DataChangedEvent... events) {
for (DataChangedEvent e : events) {
- handleDataChanged(e.getPo(), e.getDataState(),
- e.getUpdateState());
+ handleDataChanged(e.getPo(), e.getDataState());
}
}
/**
* {@inheritDoc}
*/
- public void handleDataChanged(IPersistentObject po, DataState dataState,
- UpdateState updateState) {
+ public void handleDataChanged(IPersistentObject po, DataState dataState) {
IExecTestCasePO selectedExecNode = getSelectedExecNode();
if ((selectedExecNode != null) && selectedExecNode.equals(po)) {
m_tableViewer.refresh();
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java
index b1908c88a..5c26057c0 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/widgets/JBText.java
@@ -25,8 +25,6 @@ import org.eclipse.swt.widgets.Text;
* @created 02.03.2006
*/
public class JBText extends Text {
- /** An id to identfiy the GDText object */
- private String m_id;
/**
* @param parent parent
* @param style style
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ImportTestDataSetsWizard.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ImportTestDataSetsWizard.java
index 743499700..349a9fad8 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ImportTestDataSetsWizard.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/ImportTestDataSetsWizard.java
@@ -18,8 +18,6 @@ import org.eclipse.jubula.client.ui.wizards.pages.ImportXLSTestdataWizardPage;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -37,10 +35,6 @@ public class ImportTestDataSetsWizard extends Wizard implements IImportWizard {
/** ID for the "Import CSV Data Set" page */
private static final String IMPORT_XLS_DATA_SET_PAGE_ID = "ImportTestDataSetsWizard.ImportXLSPage"; //$NON-NLS-1$
- /** the logger */
- private static final Logger LOG = LoggerFactory
- .getLogger(ImportTestDataSetsWizard.class);
-
/**
* <code>m_importCSVData</code>
*/
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportXLSTestdataWizardPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportXLSTestdataWizardPage.java
index 3277e4c55..bd2c4ece6 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportXLSTestdataWizardPage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/ImportXLSTestdataWizardPage.java
@@ -519,9 +519,7 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
});
m_sourceNameField.addKeyListener(new KeyListener() {
- /*
- * @see KeyListener.keyPressed
- */
+ /* @see KeyListener.keyPressed */
public void keyPressed(KeyEvent e) {
// If there has been a key pressed then mark as dirty
m_entryChanged = true;
@@ -531,23 +529,19 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
}
}
- /*
- * @see KeyListener.keyReleased
- */
- public void keyReleased(KeyEvent e) { }
+ /* @see KeyListener.keyReleased */
+ public void keyReleased(KeyEvent e) {
+ // currently empty
+ }
});
m_sourceNameField.addFocusListener(new FocusListener() {
- /*
- * @see FocusListener.focusGained(FocusEvent)
- */
+ /* @see FocusListener.focusGained(FocusEvent) */
public void focusGained(FocusEvent e) {
- // Do nothing when getting focus
+ // Do nothing when getting focus
}
- /*
- * @see FocusListener.focusLost(FocusEvent)
- */
+ /* @see FocusListener.focusLost(FocusEvent) */
public void focusLost(FocusEvent e) {
// Clear the flag to prevent constant update
if (m_entryChanged) {
@@ -741,13 +735,6 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
public boolean hasChildren(Object o) {
if (o instanceof MinimizedFileSystemElement) {
- MinimizedFileSystemElement element =
- (MinimizedFileSystemElement)o;
- // if (element.isPopulated()) {
- // return getChildren(element).length > 0;
- // }
-
- // If we have not populated then wait until asked
return true;
}
return false;
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java
index 4d9a6d2c2..de2e178e8 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/CAPTestResponseMessage.java
@@ -99,7 +99,6 @@ public class CAPTestResponseMessage extends Message {
}
/**
- * @deprecated
* @return Returns the returnType.
*/
public String getReturnType() {
@@ -107,7 +106,6 @@ public class CAPTestResponseMessage extends Message {
}
/**
- * @deprecated
* @param returnType
* The returnType to set.
*/
@@ -130,7 +128,6 @@ public class CAPTestResponseMessage extends Message {
}
/**
- * @deprecated Evaluate the test error event instead.
* @return Returns the state.
*/
public int getState() {
@@ -138,7 +135,6 @@ public class CAPTestResponseMessage extends Message {
}
/**
- * @deprecated
* @param state
* The state to set.
*/
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java
index 60b1bd459..328305759 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/GetKeyboardLayoutNameResponseMessage.java
@@ -33,6 +33,7 @@ public class GetKeyboardLayoutNameResponseMessage extends Message {
* @deprecated
*/
public GetKeyboardLayoutNameResponseMessage() {
+ // currently empty
}
/**
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java
index 23f482fc6..e7a3b6d81 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SendMonitoringReportMessage.java
@@ -25,7 +25,7 @@ public class SendMonitoringReportMessage extends Message {
/** Default Constructor */
public SendMonitoringReportMessage() {
-
+ // currently empty
}
/** {@inheritDoc} */
diff --git a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java
index 35b49dc55..fdf366fec 100644
--- a/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java
+++ b/org.eclipse.jubula.communication/src/org/eclipse/jubula/communication/message/SetKeyboardLayoutMessage.java
@@ -33,6 +33,7 @@ public class SetKeyboardLayoutMessage extends Message {
* @deprecated
*/
public SetKeyboardLayoutMessage() {
+ // currently empty
}
/**
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 4eafa86fb..880dd9a06 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
@@ -30,8 +30,6 @@ public class StopAUTServerMessage extends Message {
/**
* Default constructor. Not for use in standard development. Do nothing
* (required by Betwixt).
- *
- * @deprecated
*/
public StopAUTServerMessage() {
// Nothing to initialize
diff --git a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/control/DvdCopyRadioButtonToClipboardAction.java b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/control/DvdCopyRadioButtonToClipboardAction.java
index cea3ec998..c640c3afe 100644
--- a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/control/DvdCopyRadioButtonToClipboardAction.java
+++ b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/control/DvdCopyRadioButtonToClipboardAction.java
@@ -51,7 +51,7 @@ abstract class DvdCopyRadioButtonToClipboardAction extends AbstractAction {
public void actionPerformed(ActionEvent e) {
JRadioButton button = getRadioButton();
String text =
- button.getLabel() + ":" //$NON-NLS-1$
+ button.getText() + ":" //$NON-NLS-1$
+ (button.isSelected() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
// copy text to clipboard
diff --git a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/Resources.java b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/Resources.java
index 6c949ce4c..6b32e32bb 100644
--- a/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/Resources.java
+++ b/org.eclipse.jubula.examples.aut.dvdtool/src/org/eclipse/jubula/examples/aut/dvdtool/resources/Resources.java
@@ -68,7 +68,7 @@ public class Resources {
try {
resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
} catch (MissingResourceException mre) {
- String message = mre.getMessage();
+ mre.printStackTrace();
}
}
diff --git a/org.eclipse.jubula.examples.extension.rcp.toolkit/build.properties b/org.eclipse.jubula.examples.extension.rcp.toolkit/build.properties
index be0536f6b..2e2bb72e7 100644
--- a/org.eclipse.jubula.examples.extension.rcp.toolkit/build.properties
+++ b/org.eclipse.jubula.examples.extension.rcp.toolkit/build.properties
@@ -5,15 +5,14 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-jars.compile.order = .,\
- org.eclipse.jubula.examples.extension.rcp.toolkit.jar
source.. = src/
-bin.includes = org.eclipse.jubula.examples.extension.rcp.toolkit.jar,\
+output.. = bin/
+jars.compile.order = .
+bin.includes = about.html,\
+ META-INF/,\
resources/,\
plugin.xml,\
- plugin.properties,\
- META-INF/,\
- src/org/eclipse/jubula/examples/extension/rcp/toolkit/i18n/i18n.properties
-source.org.eclipse.jubula.examples.extension.rcp.toolkit.jar = src/
-output.org.eclipse.jubula.examples.extension.rcp.toolkit.jar = bin/
-
+ .
+javacSource = 1.5
+javacTarget = 1.5
+javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties b/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties
index c5def4f4b..2e2bb72e7 100644
--- a/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties
+++ b/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties
@@ -5,15 +5,14 @@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
###############################################################################
-jars.compile.order = .,\
- org.eclipse.jubula.examples.extension.swing.toolkit.jar
-source.. = src/
-bin.includes = org.eclipse.jubula.examples.extension.swing.toolkit.jar,\
- resources/,\
- plugin.xml,\
- plugin.properties,\
- META-INF/,\
- src/org/eclipse/jubula/examples/extension/swing/toolkit/i18n/i18n.properties
-source.org.eclipse.jubula.examples.extension.swing.toolkit.jar = src/
-output.org.eclipse.jubula.examples.extension.swing.toolkit.jar = bin/
-
+source.. = src/
+output.. = bin/
+jars.compile.order = .
+bin.includes = about.html,\
+ META-INF/,\
+ resources/,\
+ plugin.xml,\
+ .
+javacSource = 1.5
+javacTarget = 1.5
+javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml
index 2ef675bbc..b4e0bb169 100644
--- a/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.examples.extension.swing.toolkit/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>1</majorVersion>
<minorVersion>36</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<!-- Concrete components -->
diff --git a/org.eclipse.jubula.project.configuration/settings/1.4/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.4/org.eclipse.jdt.core.prefs
index f8fc6695d..a928de53e 100644
--- a/org.eclipse.jubula.project.configuration/settings/1.4/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.project.configuration/settings/1.4/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu May 03 12:00:09 CEST 2007
+#Fri Sep 16 15:17:57 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
@@ -7,7 +7,72 @@ org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=error
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.4
diff --git a/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs
index 3ac0271fe..647b0eb3e 100644
--- a/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.project.configuration/settings/1.5/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Thu Jan 06 12:30:51 CET 2011
+#Fri Sep 16 15:17:29 CEST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -7,6 +7,71 @@ org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=error
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=error
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.jubula.rc.common.agent/build.properties b/org.eclipse.jubula.rc.common.agent/build.properties
index 72b58c0b4..72b542a33 100644
--- a/org.eclipse.jubula.rc.common.agent/build.properties
+++ b/org.eclipse.jubula.rc.common.agent/build.properties
@@ -10,7 +10,7 @@ bin.includes = about.html,\
META-INF/,\
.
source.. = src/
-output.. = bin/
+output.. = target/classes/
javacSource = 1.5
javacTarget = 1.5
javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.rc.common/build.properties b/org.eclipse.jubula.rc.common/build.properties
index 94e33ff5d..ece067f14 100644
--- a/org.eclipse.jubula.rc.common/build.properties
+++ b/org.eclipse.jubula.rc.common/build.properties
@@ -13,7 +13,7 @@ bin.includes = about.html,\
lib/,\
lib/slf4j-jdk14-1.5.11.jar
source.. = src/
-output.. = bin/
+output.. = target/classes/
javacSource = 1.4
javacTarget = 1.4
javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.rc.rcp/build.properties b/org.eclipse.jubula.rc.rcp/build.properties
index 1070b9571..d104e8881 100644
--- a/org.eclipse.jubula.rc.rcp/build.properties
+++ b/org.eclipse.jubula.rc.rcp/build.properties
@@ -28,3 +28,6 @@ bin.includes = about.html,\
jars.compile.order = .
source.. = src/
output.. = bin/
+javacSource = 1.4
+javacTarget = 1.4
+javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.rc.swing/build.properties b/org.eclipse.jubula.rc.swing/build.properties
index 73507d586..dfd927a55 100644
--- a/org.eclipse.jubula.rc.swing/build.properties
+++ b/org.eclipse.jubula.rc.swing/build.properties
@@ -10,7 +10,7 @@ bin.includes = about.html,\
.
jars.compile.order = .
source.. = src/
-output.. = bin/
+output.. = target/classes/
javacSource = 1.4
javacTarget = 1.4
javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
index 54e509ee2..ab0635cdc 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
@@ -79,7 +79,7 @@ public class SwingAUTServer extends AUTServer {
* regular expression to use when waiting for the Event Dispatch Thread
* to start
*/
- private static final String EDT_NAME_REGEX_KEY = "TEST_EDT_NAME_REGEX";
+ private static final String EDT_NAME_REGEX_KEY = "TEST_EDT_NAME_REGEX"; //$NON-NLS-1$
/**
* private constructor
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordHelper.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordHelper.java
index 382f3df3e..9e62b72ac 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordHelper.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/listener/RecordHelper.java
@@ -18,7 +18,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.swing.AbstractButton;
import javax.swing.JComboBox;
@@ -665,23 +664,6 @@ public class RecordHelper {
}
/**
- * method for getting RealizedTypes
- * @param id IComponentIdentifier
- */
- private void getGDComponentTypes(IComponentIdentifier id) {
- org.eclipse.jubula.tools.xml.businessmodell.Component cppp = null;
- cppp = AUTServerConfiguration.getInstance()
- .findComponent(id.getSupportedClassName());
- Set zet = cppp.getAllRealized();
- Iterator it = zet.iterator();
- while (it.hasNext()) {
- org.eclipse.jubula.tools.xml.businessmodell
- .Component com = (org.eclipse.jubula.tools.xml
- .businessmodell.Component)it.next();
- }
- }
-
- /**
* @param border Border
* @return the title of the border
*/
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/RobotAwtImpl.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/RobotAwtImpl.java
index 065993d33..c12410b74 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/RobotAwtImpl.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/driver/RobotAwtImpl.java
@@ -118,16 +118,12 @@ public class RobotAwtImpl implements IRobot {
private class Scroller {
/** The component to scroll to visible. */
private Component m_component;
- /** Bounds inside the component to scroll to visible. */
- private Rectangle m_bounds;
/**
* @param component The component to scroll to visible.
- * @param bounds Bounds inside the component to scroll to visible, <code>null</code> is allowed.
*/
- public Scroller(Component component, Rectangle bounds) {
+ public Scroller(Component component) {
m_component = component;
- m_bounds = bounds;
}
/**
@@ -475,20 +471,6 @@ public class RobotAwtImpl implements IRobot {
}
/**
- * Checks whether the given point lies within the given rectangle. The point
- * is also considered within the rectangle even if the point lies directly
- * on the border of the rectangle.
- *
- * @param bounds The rectangle to use for the check.
- * @param p The point to check.
- * @return <code>true</code> if the given point lies in or on the border of
- * <code>bounds</code>. Otherwise, <code>false</code>.
- */
- private boolean containsInclusive(Rectangle bounds, Point p) {
- return bounds.union(new Rectangle(p)).equals(bounds);
- }
-
- /**
* Returns an adjacent point of <code>a</code> mostly
* inside <code>comp</code>
* @param comp a component
@@ -747,7 +729,7 @@ public class RobotAwtImpl implements IRobot {
if (log.isDebugEnabled()) {
log.debug("Scrolling rectangle to visible: " + rectangle); //$NON-NLS-1$
}
- Scroller scroller = new Scroller(component, bounds);
+ Scroller scroller = new Scroller(component);
scroller.scrollRectToVisible(rectangle);
return null;
}
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JListHelper.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JListHelper.java
index c7561df81..8af967ad9 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JListHelper.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/JListHelper.java
@@ -287,25 +287,4 @@ public class JListHelper {
}
return startingIndex;
}
-
- /**
- * @param switchToGUIThread Should the method switch to the GUI thread? It
- * is safe but maybe inefficient to specify true.
- * @return the String from the Cell Renderer
- */
- public String getText(boolean switchToGUIThread) {
- String[] values =
- getSelectedValues((JList)(m_implClass.getComponent()));
- int size = 0;
- for (int i = 0; i < values.length; ++i) {
- size += values[i].length();
- }
- StringBuffer txt = new StringBuffer(size);
- for (int i = 0; i < values.length; ++i) {
- txt.append(values[i]);
- }
-
- return txt.toString();
- }
-
}
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/WindowHelper.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/WindowHelper.java
index 77c51e7ee..6343bb00d 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/WindowHelper.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/swing/implclasses/WindowHelper.java
@@ -13,8 +13,6 @@ package org.eclipse.jubula.rc.swing.swing.implclasses;
import java.awt.KeyboardFocusManager;
import java.awt.Window;
-import org.eclipse.jubula.rc.common.logger.AutServerLogger;
-
/**
* Utility methods
@@ -23,11 +21,6 @@ import org.eclipse.jubula.rc.common.logger.AutServerLogger;
* @created Jun 21, 2007
*/
public class WindowHelper {
-
- /** the logger */
- private static AutServerLogger log =
- new AutServerLogger(WindowHelper.class);
-
/**
* Constructor
*/
@@ -35,9 +28,7 @@ public class WindowHelper {
// hidden utility Constructor
}
-
/**
- *
* @return The active application window, or <code>null</code> if no
* application window is currently active. If the returned value
* is not <code>null</code>, it is guaranteed to be of type
@@ -47,5 +38,4 @@ public class WindowHelper {
return KeyboardFocusManager.getCurrentKeyboardFocusManager()
.getActiveWindow();
}
-
}
diff --git a/org.eclipse.jubula.rc.swt/build.properties b/org.eclipse.jubula.rc.swt/build.properties
index f327f0519..dfd927a55 100644
--- a/org.eclipse.jubula.rc.swt/build.properties
+++ b/org.eclipse.jubula.rc.swt/build.properties
@@ -7,11 +7,10 @@
###############################################################################
bin.includes = about.html,\
META-INF/,\
- resources/,\
.
jars.compile.order = .
source.. = src/
-output.. = bin/
+output.. = target/classes/
javacSource = 1.4
javacTarget = 1.4
javacErrors.. = -assertIdentifier
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtHierarchyContainer.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtHierarchyContainer.java
index 408151d3a..e790939b2 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtHierarchyContainer.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/components/SwtHierarchyContainer.java
@@ -96,7 +96,6 @@ public class SwtHierarchyContainer extends HierarchyContainer {
/**
* {@inheritDoc}
- * @param listener
*/
public void addContainerListener(SWTEventListener listener) {
super.addContainerListnr(listener);
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/SwtRobot.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/SwtRobot.java
index 583a86a8e..ef383fec1 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/SwtRobot.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/driver/SwtRobot.java
@@ -103,11 +103,10 @@ public class SwtRobot {
private boolean m_shift;
/**
* Constructor
- * @param character the character
* @param keycode the key code
* @param shift the shift
*/
- private CharCode(char character, int keycode, int shift) {
+ private CharCode(int keycode, int shift) {
m_keycode = keycode;
m_shift = (shift == 1);
}
@@ -123,7 +122,7 @@ public class SwtRobot {
keycodes = new HashMap();
for (int i = 0; i < mappings.length; i++) {
keycodes.put(new Character((char)mappings[i][0]), new CharCode(
- (char)mappings[i][0], mappings[i][1], mappings[i][2]));
+ mappings[i][1], mappings[i][2]));
}
} catch (AWTException awte) {
throw new SWTException("(Translated AWTException) " + awte.getMessage()); //$NON-NLS-1$
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/AbstractSwtImplClass.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/AbstractSwtImplClass.java
index 2a048239d..29a805159 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/AbstractSwtImplClass.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/AbstractSwtImplClass.java
@@ -19,7 +19,6 @@ import org.eclipse.jubula.rc.common.driver.IRobotFactory;
import org.eclipse.jubula.rc.common.exception.RobotException;
import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.implclasses.IBaseImplementationClass;
-import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.common.util.KeyStrokeUtil;
import org.eclipse.jubula.rc.swt.driver.KeyCodeConverter;
import org.eclipse.jubula.rc.swt.driver.RobotFactoryConfig;
@@ -51,15 +50,9 @@ public abstract class AbstractSwtImplClass implements IBaseImplementationClass {
/** constants for communication */
protected static final String POS_UNI_PERCENT = "Percent"; //$NON-NLS-1$
- /** the logger */
- private static AutServerLogger log =
- new AutServerLogger(AbstractSwtImplClass.class);
-
/** The robot factory. */
private IRobotFactory m_robotFactory;
-
-
/**
* Gets the Robot factory. The factory is created once per instance.
* @return The Robot factory.
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/CComboBoxHelper.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/CComboBoxHelper.java
index 00cf8261a..b7113559c 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/CComboBoxHelper.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/CComboBoxHelper.java
@@ -364,16 +364,6 @@ public class CComboBoxHelper extends AbstractComboBoxHelper {
}
/**
- * Takes the currently selected item for the combo box selection.
- * Implicitly closes the dropdown list, if it is open.
- */
- private void completeSelection() {
- List dropdownList = getDropdownList();
- m_robot.keyPress(dropdownList, SWT.CR);
- m_robot.keyRelease(dropdownList, SWT.CR);
- }
-
- /**
* {@inheritDoc}
*/
public int getSelectedIndex() {
@@ -412,41 +402,6 @@ public class CComboBoxHelper extends AbstractComboBoxHelper {
}
/**
- * Selects the given index in the combo box's list using the up and down
- * arrow keys.
- *
- * @param index The index of the item to select.
- */
- private void selectIndexWithKeyboard(int index) {
- final CCombo combo = (CCombo)m_implClass.getComponent();
- List dropdownList = getDropdownList();
-
- int selectedIndex = ((Integer)m_eventThreadQueuer.invokeAndWait(
- ComboBoxHelper.class.getName()
- + "comboItemCount", new IRunnable() { //$NON-NLS-1$
- public Object run() throws StepExecutionException {
- return new Integer(combo.getSelectionIndex());
- }
- })).intValue();
-
- while (selectedIndex != index) {
- if (selectedIndex < index) {
- m_robot.keyPress(dropdownList, SWT.ARROW_DOWN);
- m_robot.keyRelease(dropdownList, SWT.ARROW_DOWN);
- selectedIndex++;
- } else {
- m_robot.keyPress(dropdownList, SWT.ARROW_UP);
- m_robot.keyRelease(dropdownList, SWT.ARROW_UP);
- selectedIndex--;
- }
- }
-
- completeSelection();
-
- }
-
- /**
- *
* {@inheritDoc}
*/
protected boolean isComboEnabled() {
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/DropdownButtonImplClass.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/DropdownButtonImplClass.java
deleted file mode 100644
index 0e4a3d3f4..000000000
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/DropdownButtonImplClass.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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
- *
- * Contributors:
- * BREDEX GmbH - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.jubula.rc.swt.implclasses;
-
-import org.eclipse.jubula.rc.swt.utils.SwtUtils;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Menu;
-
-
-/**
- * @author BREDEX GmbH
- * @created 16.04.2007
- */
-public class DropdownButtonImplClass extends ButtonImplClass {
-
- /**
- * Selects an item from the button's dropdown menu.
- *
- * @param str The string representation of the item we want to select.
- */
- public void gdSelectFromDropdown(String str) {
- openDropdownMenu();
-
- int index = getIndexForEntry(str);
-
- selectFromDropdownByIndexImpl(index);
- }
-
- /**
- * @param str string
- * @return 0
- */
- private int getIndexForEntry(String str) {
- return 0;
- }
-
- /**
- *
- * @param index The index of the item we want to select.
- */
- public void gdSelectFromDropdownByIndex(int index) {
- openDropdownMenu();
- selectFromDropdownByIndexImpl(index);
- }
-
- /**
- * Opens the dropdown menu for this component by clicking on its chevron
- * on the righthand side.
- */
- private void openDropdownMenu() {
- gdClickDirect(1, 1, 95, POS_UNI_PERCENT, 50, POS_UNI_PERCENT);
- }
-
- /**
- *
- * @param index The index of the item we want to select.
- */
- private void selectFromDropdownByIndexImpl(int index) {
- // Get location to click (constraints)
- Menu dropdown = getDropdown();
- if (dropdown != null) {
- Rectangle constraints =
- SwtUtils.getWidgetBounds(dropdown.getItem(index));
- getRobot().click(dropdown, constraints);
-
- } else {
- // FIXME zeb:
- // Throw StepExecution or Robot Exception: menu not visible
- System.out.println("null"); //$NON-NLS-1$
- }
-
- }
-
- /**
- *
- * @return the dropdown menu for this button, or <code>null</code> if the
- * menu is not currently visible.
- */
- private Menu getDropdown() {
- // FIXME zeb: Right now we only check directly below the button.
- // This means we will not find the dropdown if it appears
- // somewhere else.
-
- return null;
- }
-}
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/MenuUtil.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/MenuUtil.java
index 4f9d9c833..4a8b3d839 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/MenuUtil.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/MenuUtil.java
@@ -392,22 +392,6 @@ public abstract class MenuUtil extends MenuUtilBase {
}
/**
- * Removes the shortcut sign (&) of the given menu name.
- * @param menuName a menu name
- * @return the menu name without shortcut sign or the given menuName
- * if there is no shortcut sign.
- */
- private static String removeShortcutSign(String menuName) {
- int shortCutIdx = menuName.indexOf("&"); //$NON-NLS-1$
- StringBuffer buf = new StringBuffer(menuName);
- if (shortCutIdx > -1) {
- buf.deleteCharAt(shortCutIdx);
- return buf.toString();
- }
- return menuName;
- }
-
- /**
* Checks whether the given menu item is a separator.
* This method runs in the GUI thread.
* @param menuItem the menu item to check
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TableImplClass.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TableImplClass.java
index a72c5e573..5eb62ee18 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TableImplClass.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/TableImplClass.java
@@ -1149,8 +1149,7 @@ public class TableImplClass extends AbstractControlImplClass
final Cell cell = invokeGetSelectedCell();
// Ensure that the cell is visible.
- Rectangle rectangle = invokeScrollCellToVisible(cell.getRow(), cell
- .getCol());
+ invokeScrollCellToVisible(cell.getRow(), cell.getCol());
// Get the editor for the cell
Control editor = activateEditor(cell);
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/ToolItemImplClass.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/ToolItemImplClass.java
index fca9b2a1f..588c358a9 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/ToolItemImplClass.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/implclasses/ToolItemImplClass.java
@@ -20,7 +20,6 @@ import org.eclipse.jubula.rc.common.exception.StepExecutionException;
import org.eclipse.jubula.rc.common.exception.StepVerifyFailedException;
import org.eclipse.jubula.rc.common.implclasses.MatchUtil;
import org.eclipse.jubula.rc.common.implclasses.Verifier;
-import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.swt.driver.DragAndDropHelperSwt;
import org.eclipse.jubula.rc.swt.interfaces.IToolItemImplClass;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
@@ -44,11 +43,6 @@ import org.eclipse.swt.widgets.ToolItem;
*/
public class ToolItemImplClass extends AbstractSwtImplClass
implements IToolItemImplClass {
-
- /** the logger */
- private static AutServerLogger log =
- new AutServerLogger(ToolItemImplClass.class);
-
/**
* The dropdown menu, or <code>null</code> when the dropdown
* menu is not showing.
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
index d5db966cf..c09803602 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/CheckListener.java
@@ -14,8 +14,6 @@ import java.awt.Point;
import java.util.HashMap;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
import org.eclipse.jubula.communication.message.ServerShowDialogMessage;
import org.eclipse.jubula.rc.common.AUTServer;
@@ -74,10 +72,6 @@ public class CheckListener extends AbstractAutSwtEventListener {
private static AutServerLogger log = new AutServerLogger(
CheckListener.class);
- /** the logger */
- private static final Logger LOG =
- LoggerFactory.getLogger(CheckListener.class);
-
/** active listener */
private boolean m_active = true;
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordHelperSWT.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordHelperSWT.java
index 8daf2adf7..7d7a93115 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordHelperSWT.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordHelperSWT.java
@@ -12,11 +12,9 @@ package org.eclipse.jubula.rc.swt.listener;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.Set;
import org.eclipse.jubula.rc.common.AUTServerConfiguration;
import org.eclipse.jubula.rc.common.implclasses.IndexConverter;
-import org.eclipse.jubula.rc.common.logger.AutServerLogger;
import org.eclipse.jubula.rc.common.util.NameValidator;
import org.eclipse.jubula.rc.swt.components.FindSWTComponentBP;
import org.eclipse.jubula.rc.swt.utils.SwtUtils;
@@ -25,7 +23,6 @@ import org.eclipse.jubula.tools.objects.IComponentIdentifier;
import org.eclipse.jubula.tools.objects.MappingConstants;
import org.eclipse.jubula.tools.utils.StringParsing;
import org.eclipse.jubula.tools.xml.businessmodell.Action;
-import org.eclipse.jubula.tools.xml.businessmodell.Component;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CCombo;
import org.eclipse.swt.custom.CLabel;
@@ -51,19 +48,11 @@ import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.swt.widgets.Widget;
-
-
-
/**
* @author BREDEX GmbH
* @created 23.08.2004
*/
public class RecordHelperSWT {
-
- /** The logging. */
- private static AutServerLogger log =
- new AutServerLogger(RecordHelperSWT.class);
-
/** counter */
private int m_counter = 0;
@@ -725,21 +714,6 @@ public class RecordHelperSWT {
}
/**
- * shows GDComponentType Hierarchy
- * @param id IComponentIdentifier
- */
- private void getGDComponentTypes(IComponentIdentifier id) {
- Component cppp = null;
- cppp = AUTServerConfiguration.getInstance()
- .findComponent(id.getComponentClassName());
- Set zet = cppp.getAllRealized();
- Iterator it = zet.iterator();
- while (it.hasNext()) {
- Component com = (Component)it.next();
- }
- }
-
- /**
* check if menu belongs to menubar
* @param menu Menu
* @return true, if menu belongs to menubar, false otherwise
diff --git a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
index aef83e9b6..20ddf85b4 100644
--- a/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
+++ b/org.eclipse.jubula.rc.swt/src/org/eclipse/jubula/rc/swt/listener/RecordListener.java
@@ -10,39 +10,37 @@
*******************************************************************************/
package org.eclipse.jubula.rc.swt.listener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
-import org.eclipse.jubula.rc.common.AUTServer;
-import org.eclipse.jubula.rc.common.Constants;
-import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
-import org.eclipse.jubula.rc.common.logger.AutServerLogger;
-import org.eclipse.jubula.rc.swt.SwtAUTServer;
-import org.eclipse.jubula.rc.swt.utils.SwtUtils;
-import org.eclipse.jubula.tools.objects.IComponentIdentifier;
-import org.eclipse.jubula.tools.xml.businessmodell.Action;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.CoolBar;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.TabFolder;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.Widget;
+import org.eclipse.jubula.communication.message.ChangeAUTModeMessage;
+import org.eclipse.jubula.rc.common.AUTServer;
+import org.eclipse.jubula.rc.common.Constants;
+import org.eclipse.jubula.rc.common.exception.NoIdentifierForComponentException;
+import org.eclipse.jubula.rc.common.logger.AutServerLogger;
+import org.eclipse.jubula.rc.swt.SwtAUTServer;
+import org.eclipse.jubula.rc.swt.utils.SwtUtils;
+import org.eclipse.jubula.tools.objects.IComponentIdentifier;
+import org.eclipse.jubula.tools.xml.businessmodell.Action;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CCombo;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.CoolBar;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.TabFolder;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+import org.eclipse.swt.widgets.Widget;
@@ -70,10 +68,6 @@ public class RecordListener extends AbstractAutSwtEventListener {
private static AutServerLogger log = new AutServerLogger(
RecordListener.class);
- /** the logger */
- private static final Logger LOG =
- LoggerFactory.getLogger(RecordListener.class);
-
/** widget the popup is occured on */
private Widget m_popupSource = null;
diff --git a/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml
index e228e8b0b..14025b1c2 100644
--- a/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.base/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>4</majorVersion>
<minorVersion>0</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<abstractComponent type="guidancer.abstract.Widget">
diff --git a/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml
index 3746c3128..8445cc269 100644
--- a/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.concrete/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>4</majorVersion>
<minorVersion>6</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<concreteComponent type="guidancer.concrete.GraphicApplication">
diff --git a/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml
index 4fdf7a960..3b9a59009 100644
--- a/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.html/resources/xml/ComponentConfiguration.xml
@@ -17,8 +17,6 @@
<configVersion>
<majorVersion>1</majorVersion>
<minorVersion>1</minorVersion>
- <majorCustomVersion>1</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<!-- Button -->
diff --git a/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml
index e3d45cf47..44198d0fb 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.rcp.gef/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>4</majorVersion>
<minorVersion>1</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<toolkitComponent type="org.eclipse.draw2d.FigureCanvas">
diff --git a/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml
index 491280bd3..ca3659fef 100644
--- a/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.rcp/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>2</majorVersion>
<minorVersion>0</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
diff --git a/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml
index 2b0f6de98..bd116a528 100644
--- a/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.swing/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>4</majorVersion>
<minorVersion>0</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<toolkitComponent
type="com.bredexsw.guidancer.server.implclasses.GraphicApplication" visible="false">
diff --git a/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml b/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml
index 076341556..069572474 100644
--- a/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml
+++ b/org.eclipse.jubula.toolkit.provider.swt/resources/xml/ComponentConfiguration.xml
@@ -13,8 +13,6 @@
<configVersion>
<majorVersion>4</majorVersion>
<minorVersion>1</minorVersion>
- <majorCustomVersion>0</majorCustomVersion>
- <minorCustomVersion>0</minorCustomVersion>
</configVersion>
<!-- Concrete components -->
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ConverterException.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ConverterException.java
deleted file mode 100644
index 3ba9b2467..000000000
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/exception/ConverterException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 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
- *
- * Contributors:
- * BREDEX GmbH - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.jubula.tools.exception;
-
-/**
- * @author BREDEX GmbH
- * @created May 14, 2008
- */
-public class ConverterException extends JBException {
-
- /**
- * @param message The detailed message for this exception.
- * @param id An ErrorMessage.ID.
- */
- public ConverterException(String message, Integer id) {
- super(message, id);
- }
-
- /**
- * @param message The detailed message for this exception.
- * @param cause The throwable object.
- * @param id An ErrorMessage.ID.
- */
- public ConverterException(String message, Throwable cause, Integer id) {
- super(message, cause, id);
- }
-
-}
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/registration/AutIdentifier.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/registration/AutIdentifier.java
index 02d335a24..26cfb9a50 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/registration/AutIdentifier.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/registration/AutIdentifier.java
@@ -31,14 +31,6 @@ public final class AutIdentifier {
/** name of executable used to start the AUT */
private String m_executableName;
- /**
- * Default constructor.
- * Do nothing (required by Betwixt).
- */
- private AutIdentifier() {
- // Nothing to initialize
- }
-
/**
* Constructor
*
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/ConfigVersion.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/ConfigVersion.java
index 458ac8af6..6427d31d9 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/ConfigVersion.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/xml/businessprocess/ConfigVersion.java
@@ -30,16 +30,6 @@ public class ConfigVersion {
private String m_minorV = null;
/**
- * <code>m_majorVersion</code>majorCustomVersion read from client config xml
- */
- private String m_majorCustomV = null;
-
- /**
- * <code>m_minorVersion</code>minorCustomVersion read from client config xml
- */
- private String m_minorCustomV = null;
-
- /**
* <code>m_majorVersion</code>majorVersion read from client config xml
*/
private Integer m_majorVersion = null;
@@ -50,16 +40,6 @@ public class ConfigVersion {
private Integer m_minorVersion = null;
/**
- * <code>m_majorVersion</code>majorCustomVersion read from client config xml
- */
- private Integer m_majorCustomVersion = null;
-
- /**
- * <code>m_minorVersion</code>minorCustomVersion read from client config xml
- */
- private Integer m_minorCustomVersion = null;
-
- /**
*
*/
public ConfigVersion() {
@@ -95,7 +75,8 @@ public class ConfigVersion {
ConfigVersion rhs = (ConfigVersion)obj;
return new EqualsBuilder().append(m_majorVersion, rhs.m_majorVersion)
.append(m_minorVersion, rhs.m_minorVersion).isEquals();
- }
+ }
+
/**
* {@inheritDoc}
*/
@@ -104,7 +85,6 @@ public class ConfigVersion {
.append(m_minorVersion).toHashCode();
}
-
/**
* @param majorVersion The majorVersion to set.
*/
@@ -113,17 +93,9 @@ public class ConfigVersion {
}
/**
- * @param minorCustomVersion The minorCustomVersion to set.
- */
- public void setMinorCustomVersion(Integer minorCustomVersion) {
- m_minorCustomVersion = minorCustomVersion;
- }
-
- /**
* @param minorVersion The minorVersion to set.
*/
public void setMinorVersion(Integer minorVersion) {
m_minorVersion = minorVersion;
}
-
}

Back to the top