Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java8
-rw-r--r--org.eclipse.jubula.client.core.exporter.junit/.project2
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java3
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java7
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultPO.java6
-rw-r--r--org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/progress/IProgressConsole.java9
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java13
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTCEditor.java7
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/ComponentNameBrowserContentProvider.java4
-rw-r--r--org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportXLSTestdataWizardPage.java45
-rw-r--r--org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java2
-rw-r--r--org.eclipse.jubula.examples.api.adder.javafx.osgi/build.properties5
-rw-r--r--org.eclipse.jubula.examples.api.adder.swing.osgi/build.properties5
-rw-r--r--org.eclipse.jubula.examples.extension.rcp.rc/.classpath2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs4
-rw-r--r--org.eclipse.jubula.examples.extension.swing.rc/.classpath2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.rc/build.properties2
-rw-r--r--org.eclipse.jubula.examples.extension.swing.toolkit/build.properties5
-rw-r--r--org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs6
-rw-r--r--org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/JavaFXAUTServer.java4
-rw-r--r--org.eclipse.jubula.rc.swing.tests/.classpath2
-rw-r--r--org.eclipse.jubula.rc.swing.tests/about.html28
-rw-r--r--org.eclipse.jubula.rc.swing.tests/src/org/eclipse/jubula/rc/swing/tester/TestTesterUtil.java2
-rw-r--r--org.eclipse.jubula.toolkit.api/.classpath2
-rw-r--r--org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jubula.toolkit.api/build.properties6
-rw-r--r--org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java3
28 files changed, 70 insertions, 118 deletions
diff --git a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java
index 843e6d4d2..63b1a7bcb 100644
--- a/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java
+++ b/org.eclipse.jubula.client.alm.mylyn.core/src/org/eclipse/jubula/client/alm/mylyn/core/bp/CommentReporter.java
@@ -352,11 +352,15 @@ public class CommentReporter implements ITestresultSummaryEventListener {
*/
private void writeStatus(IProgressConsole c, String taskId,
int changeAmount, String one, String mult) {
+ IStatus status = null;
if (changeAmount > 1) {
- c.writeWarningLine(NLS.bind(mult, changeAmount, taskId));
+ status = new Status(IStatus.WARNING, Activator.ID,
+ NLS.bind(mult, changeAmount, taskId));
} else {
- c.writeLine(NLS.bind(one, taskId));
+ status = new Status(IStatus.OK, Activator.ID,
+ NLS.bind(one, taskId));
}
+ c.writeStatus(status);
}
/**
diff --git a/org.eclipse.jubula.client.core.exporter.junit/.project b/org.eclipse.jubula.client.core.exporter.junit/.project
index c45b2020a..f2a9ed45f 100644
--- a/org.eclipse.jubula.client.core.exporter.junit/.project
+++ b/org.eclipse.jubula.client.core.exporter.junit/.project
@@ -35,7 +35,7 @@
<link>
<name>.settings</name>
<type>2</type>
- <locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.7</locationURI>
+ <locationURI>PARENT-1-PROJECT_LOC/org.eclipse.jubula.project.configuration/settings/1.8</locationURI>
</link>
</linkedResources>
</projectDescription>
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java
index 1714a97cb..d7787cdcd 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/AbstractXMLReportGenerator.java
@@ -75,9 +75,6 @@ public abstract class AbstractXMLReportGenerator {
*/
public static final String NUM_EVENT_HANDLER_STEPS = "numEventHandlerSteps"; //$NON-NLS-1$
- /** Postfix used to indicate a negated CondStruct */
- private static final String NEGATED_POSTFIX = " - NEGATED"; //$NON-NLS-1$
-
/** The logger */
private static final Logger LOG = LoggerFactory.getLogger(
AbstractXMLReportGenerator.class);
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java
index 88fe8a21e..90ead6cec 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/businessprocess/ComponentNamesBP.java
@@ -28,8 +28,6 @@ import org.eclipse.jubula.client.core.persistence.GeneralStorage;
import org.eclipse.jubula.client.core.utils.TreeTraverser;
import org.eclipse.jubula.tools.internal.constants.StringConstants;
import org.eclipse.jubula.tools.internal.exception.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -44,11 +42,6 @@ public class ComponentNamesBP {
public static final String UNKNOWN_COMPONENT_TYPE = "guidancer.abstract.Unknown"; //$NON-NLS-1$
/**
- * <code>log</code> logger for class
- */
- private static Logger log = LoggerFactory.getLogger(ComponentNamesBP.class);
-
- /**
* @author BREDEX GmbH
* @created Apr 16, 2008
*/
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultPO.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultPO.java
index 34c066ef2..fc63d5587 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultPO.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/model/TestResultPO.java
@@ -139,12 +139,6 @@ class TestResultPO implements ITestResultPO {
private String m_taskId;
/**
- * the boolean value to decide whether a TestCase
- * should be handeled as a TestSuite in JUnit
- */
- private boolean m_isJUnitTestSuite;
-
- /**
* <code>m_omHeuristicEquivalence</code>
*/
private double m_omHeuristicEquivalence = -1.0d;
diff --git a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/progress/IProgressConsole.java b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/progress/IProgressConsole.java
index 8bb0d9de1..55ef9a9d1 100644
--- a/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/progress/IProgressConsole.java
+++ b/org.eclipse.jubula.client.core/src/org/eclipse/jubula/client/core/progress/IProgressConsole.java
@@ -23,19 +23,10 @@ public interface IProgressConsole {
* Writes a single line to the console.
*
* @param line The text to write to the console.
- * @deprecated
*/
public void writeLine(String line);
/**
- * Writes a single warning line to the console.
- *
- * @param line The text to write as a warning to the console.
- * @deprecated
- */
- public void writeWarningLine(String line);
-
- /**
* Writes a single error line to the console.
*
* @param line The text to write to the console as an error.
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
index 2c1108555..be2958393 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/editors/ObjectMappingMultiPageEditor.java
@@ -134,8 +134,6 @@ import org.eclipse.ui.dialogs.FilteredTree;
import org.eclipse.ui.part.MultiPageEditorPart;
import org.eclipse.ui.services.IEvaluationService;
import org.eclipse.ui.swt.IFocusService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Editor for managing Object Mapping in Jubula.
@@ -153,10 +151,6 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
/** default sash weights */
private static final int[] DEFAULT_SASH_WEIGHTS = new int[] { 25, 100 };
- /** the logger */
- private static final Logger LOG =
- LoggerFactory.getLogger(ObjectMappingMultiPageEditor.class);
-
/** page index of the split view */
private static final int SPLIT_PAGE_IDX = 0;
@@ -352,13 +346,6 @@ public class ObjectMappingMultiPageEditor extends MultiPageEditorPart
public int getAddedNodeCount() {
return m_addedNodeCount;
}
-
- /**
- * @return Returns the addedNodeCount.
- */
- public List<IObjectMappingAssoziationPO> getAddedNodes() {
- return m_addedNodes;
- }
}
/** the selection provider for this editor */
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTCEditor.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTCEditor.java
index ef3d0a4ec..a2c9e92ac 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTCEditor.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/handlers/delete/DeleteTreeItemHandlerTCEditor.java
@@ -28,8 +28,6 @@ import org.eclipse.jubula.client.ui.rcp.controllers.IEditorOperation;
import org.eclipse.jubula.client.ui.rcp.editors.AbstractJBEditor;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.handlers.HandlerUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
@@ -38,11 +36,6 @@ import org.slf4j.LoggerFactory;
*/
public class DeleteTreeItemHandlerTCEditor
extends AbstractDeleteTreeItemHandler {
- /**
- * <code>log</code> logger for class
- */
- private static Logger log = LoggerFactory.getLogger(
- DeleteTreeItemHandlerTCEditor.class);
/**
* {@inheritDoc}
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/ComponentNameBrowserContentProvider.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/ComponentNameBrowserContentProvider.java
index 1acf7d5db..4f9191759 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/ComponentNameBrowserContentProvider.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/provider/contentprovider/ComponentNameBrowserContentProvider.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
@@ -516,9 +515,6 @@ public class ComponentNameBrowserContentProvider extends TooltipLabelProvider
*/
public class UnusedCompnamesCategory extends AbstractCompNamesCategory {
- /** The children component names */
- private Set<IComponentNamePO> m_compNames;
-
/**
* @param parentID
* the parent project id
diff --git a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportXLSTestdataWizardPage.java b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportXLSTestdataWizardPage.java
index f9c510089..3da8fa7b1 100644
--- a/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportXLSTestdataWizardPage.java
+++ b/org.eclipse.jubula.client.ui.rcp/src/org/eclipse/jubula/client/ui/rcp/wizards/pages/ImportXLSTestdataWizardPage.java
@@ -33,7 +33,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jubula.client.core.businessprocess.ExternalTestDataBP;
-import org.eclipse.jubula.client.core.businessprocess.MapCounter;
import org.eclipse.jubula.client.core.businessprocess.ParameterInterfaceBP;
import org.eclipse.jubula.client.core.businessprocess.importfilter.DataTable;
import org.eclipse.jubula.client.core.events.DataEventDispatcher;
@@ -115,9 +114,6 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
/** All parameter names used */
private Set<String> m_parNames;
- /** Map to count the occurrences of the same parameter name */
- private MapCounter m_counter;
-
/**
* @param fileSystemObjects fileSystemObjects
* @param selection the current selection
@@ -128,7 +124,6 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
m_fileSystemObjects = fileSystemObjects;
m_selection = selection;
m_ctde = ctde;
- m_counter = new MapCounter();
m_parNames = new HashSet<>();
}
@@ -270,27 +265,6 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
}
/**
- * Extends non-unique column names
- * @param name the column name
- * @return the new column name if there is a duplication
- */
- private String getParamName(String name) {
- String currName = name;
- String addOneTo = name;
- while (m_parNames.contains(currName)) {
- addOneTo = currName;
- if (m_counter.get(currName) == null) {
- currName += "_1"; //$NON-NLS-1$
- } else {
- currName += "_" + (m_counter.get(currName) + 1); //$NON-NLS-1$
- }
- }
- m_parNames.add(currName);
- m_counter.add(addOneTo, 1);
- return currName;
- }
-
- /**
* @param po
* the po
* @param datastate
@@ -709,7 +683,7 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
saveWidgetValues();
Iterator resourcesEnum = getSelectedResources().iterator();
- List fileSystemObjects = new ArrayList();
+ List<Object> fileSystemObjects = new ArrayList<Object>();
while (resourcesEnum.hasNext()) {
fileSystemObjects.add(((FileSystemElement)resourcesEnum.next())
.getFileSystemObject());
@@ -1050,7 +1024,8 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
protected void setupSelectionsBasedOnSelectedTypes() {
ProgressMonitorDialog dialog = new ProgressMonitorJobsDialog(
getContainer().getShell());
- final Map selectionMap = new Hashtable();
+ final Map<FileSystemElement, List<FileSystemElement>> selectionMap =
+ new Hashtable<FileSystemElement, List<FileSystemElement>>();
final IElementFilter filter = new IElementFilter() {
public void filterElements(Collection files,
IProgressMonitor monitor) throws InterruptedException {
@@ -1081,10 +1056,11 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
MinimizedFileSystemElement file =
(MinimizedFileSystemElement)fileElement;
if (isExportableExtension(file.getFileNameExtension())) {
- List elements = new ArrayList();
+ List<FileSystemElement> elements =
+ new ArrayList<FileSystemElement>();
FileSystemElement parent = file.getParent();
if (selectionMap.containsKey(parent)) {
- elements = (List)selectionMap.get(parent);
+ elements = selectionMap.get(parent);
}
elements.add(file);
selectionMap.put(parent, elements);
@@ -1109,14 +1085,11 @@ public class ImportXLSTestdataWizardPage extends WizardResourceImportPage {
}
// make sure that all paint operations caused by closing the progress
// dialog get flushed, otherwise extra pixels will remain on the screen
- // until
- // updateSelections is completed
+ // until updateSelections is completed
getShell().update();
- // The updateSelections method accesses SWT widgets so cannot be
- // executed
+ // The updateSelections method accesses SWT widgets so cannot be executed
// as part of the above progress dialog operation since the operation
- // forks
- // a new process.
+ // forks a new process.
if (selectionMap != null) {
updateSelections(selectionMap);
}
diff --git a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java
index 525e0057d..73faf22c1 100644
--- a/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java
+++ b/org.eclipse.jubula.client.ui/src/org/eclipse/jubula/client/ui/wizards/pages/DatabaseConnectionWizardPage.java
@@ -64,6 +64,7 @@ import org.eclipse.ui.PlatformUI;
* @author BREDEX GmbH
* @created May 19, 2010
*/
+@SuppressWarnings("unchecked")
public class DatabaseConnectionWizardPage extends WizardPage {
/**
@@ -186,6 +187,7 @@ public class DatabaseConnectionWizardPage extends WizardPage {
*
* {@inheritDoc}
*/
+
public void createDetailArea(Composite parent,
DataBindingContext dbc) {
diff --git a/org.eclipse.jubula.examples.api.adder.javafx.osgi/build.properties b/org.eclipse.jubula.examples.api.adder.javafx.osgi/build.properties
index cfa7974a2..774eb1439 100644
--- a/org.eclipse.jubula.examples.api.adder.javafx.osgi/build.properties
+++ b/org.eclipse.jubula.examples.api.adder.javafx.osgi/build.properties
@@ -1,6 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
-src.includes = about.html,\
- src/
+ .
+src.includes = about.html
diff --git a/org.eclipse.jubula.examples.api.adder.swing.osgi/build.properties b/org.eclipse.jubula.examples.api.adder.swing.osgi/build.properties
index cfa7974a2..774eb1439 100644
--- a/org.eclipse.jubula.examples.api.adder.swing.osgi/build.properties
+++ b/org.eclipse.jubula.examples.api.adder.swing.osgi/build.properties
@@ -1,6 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
-src.includes = about.html,\
- src/
+ .
+src.includes = about.html
diff --git a/org.eclipse.jubula.examples.extension.rcp.rc/.classpath b/org.eclipse.jubula.examples.extension.rcp.rc/.classpath
index e8ea977a6..5e4c1fe99 100644
--- a/org.eclipse.jubula.examples.extension.rcp.rc/.classpath
+++ b/org.eclipse.jubula.examples.extension.rcp.rc/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath
index e8ea977a6..5e4c1fe99 100644
--- a/org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath
+++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs
index b9dbedb54..8bb4ddf0a 100644
--- a/org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.examples.extension.swing.rc.renderer/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
#Thu Jan 12 11:11:46 CET 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.jubula.examples.extension.swing.rc/.classpath b/org.eclipse.jubula.examples.extension.swing.rc/.classpath
index e8ea977a6..5e4c1fe99 100644
--- a/org.eclipse.jubula.examples.extension.swing.rc/.classpath
+++ b/org.eclipse.jubula.examples.extension.swing.rc/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.examples.extension.swing.rc/build.properties b/org.eclipse.jubula.examples.extension.swing.rc/build.properties
index 10a079be9..6eadc8ab6 100644
--- a/org.eclipse.jubula.examples.extension.swing.rc/build.properties
+++ b/org.eclipse.jubula.examples.extension.swing.rc/build.properties
@@ -11,3 +11,5 @@ bin.includes = META-INF/,\
.,\
about.html
src.includes = about.html
+javacSource = 1.5
+javacTarget = 1.5 \ No newline at end of file
diff --git a/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties b/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties
index d187e0aac..2eae99f92 100644
--- a/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties
+++ b/org.eclipse.jubula.examples.extension.swing.toolkit/build.properties
@@ -14,7 +14,8 @@ bin.includes = about.html,\
plugin.xml,\
.,\
plugin.properties
-javacSource = 1.5
-javacTarget = 1.5
+javacSource = 1.7
+javacTarget = 1.7
javacErrors.. = -assertIdentifier
src.includes = about.html
+jre.compilation.profile = JavaSE-1.7
diff --git a/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs b/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs
index b199e3aee..f7f36edb2 100644
--- a/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jubula.project.configuration/settings/1.6/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -73,4 +73,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
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
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/JavaFXAUTServer.java b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/JavaFXAUTServer.java
index 584812bdb..ad2ae2bee 100644
--- a/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/JavaFXAUTServer.java
+++ b/org.eclipse.jubula.rc.javafx/src/org/eclipse/jubula/rc/javafx/JavaFXAUTServer.java
@@ -33,8 +33,6 @@ import org.eclipse.jubula.tools.internal.constants.AUTServerExitConstants;
import org.eclipse.jubula.tools.internal.exception.JBVersionException;
import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
import org.eclipse.jubula.tools.internal.utils.TimeUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import javafx.stage.Stage;
import javafx.stage.Window;
@@ -63,8 +61,6 @@ import javafx.stage.Window;
* @created 24.09.2013
*/
public class JavaFXAUTServer extends AUTServer {
- /** the logger */
- private static Logger log = LoggerFactory.getLogger(AUTServer.class);
/**
* constructor instantiates the listeners
*/
diff --git a/org.eclipse.jubula.rc.swing.tests/.classpath b/org.eclipse.jubula.rc.swing.tests/.classpath
index 098194ca4..64c5e31b7 100644
--- a/org.eclipse.jubula.rc.swing.tests/.classpath
+++ b/org.eclipse.jubula.rc.swing.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/org.eclipse.jubula.rc.swing.tests/about.html b/org.eclipse.jubula.rc.swing.tests/about.html
new file mode 100644
index 000000000..f1be81099
--- /dev/null
+++ b/org.eclipse.jubula.rc.swing.tests/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 22, 2011</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/org.eclipse.jubula.rc.swing.tests/src/org/eclipse/jubula/rc/swing/tester/TestTesterUtil.java b/org.eclipse.jubula.rc.swing.tests/src/org/eclipse/jubula/rc/swing/tester/TestTesterUtil.java
index b1b180519..50b421d29 100644
--- a/org.eclipse.jubula.rc.swing.tests/src/org/eclipse/jubula/rc/swing/tester/TestTesterUtil.java
+++ b/org.eclipse.jubula.rc.swing.tests/src/org/eclipse/jubula/rc/swing/tester/TestTesterUtil.java
@@ -33,7 +33,7 @@ import org.eclipse.jubula.tools.internal.messagehandling.MessageIDs;
import org.junit.After;
import org.junit.Test;
-@SuppressWarnings("serial")
+@SuppressWarnings({"serial","nls"})
public class TestTesterUtil {
private static class CanvasWithPublicGetText extends Canvas {
diff --git a/org.eclipse.jubula.toolkit.api/.classpath b/org.eclipse.jubula.toolkit.api/.classpath
index 472ee29b1..deb673668 100644
--- a/org.eclipse.jubula.toolkit.api/.classpath
+++ b/org.eclipse.jubula.toolkit.api/.classpath
@@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF b/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
index b92a9df3c..009f1db5c 100644
--- a/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
+++ b/org.eclipse.jubula.toolkit.api/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Jubula Toolkit - API
Bundle-SymbolicName: org.eclipse.jubula.toolkit.api
Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: Eclipse Jubula
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Export-Package: org.eclipse.jubula.toolkit,
diff --git a/org.eclipse.jubula.toolkit.api/build.properties b/org.eclipse.jubula.toolkit.api/build.properties
index 4826b502c..724663847 100644
--- a/org.eclipse.jubula.toolkit.api/build.properties
+++ b/org.eclipse.jubula.toolkit.api/build.properties
@@ -11,8 +11,8 @@ jars.compile.order = .
bin.includes = about.html,\
META-INF/,\
.
-javacSource = 1.5
-javacTarget = 1.5
+javacSource = 1.6
+javacTarget = 1.6
javacErrors.. = -assertIdentifier
-jre.compilation.profile = J2SE-1.5
+jre.compilation.profile = JavaSE-1.6
src.includes = about.html
diff --git a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java
index ba71adcee..71e47cb6c 100644
--- a/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java
+++ b/org.eclipse.jubula.tools/src/org/eclipse/jubula/tools/internal/xml/businessmodell/CompSystem.java
@@ -83,9 +83,6 @@ public class CompSystem {
/** A List of all DataTypes */
private Set<String> m_dataTypes = null;
- /** Set of all parameter */
- private Set<Param> m_parameter = null;
-
/** Default constructor */
public CompSystem() {
init();

Back to the top