summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-02-13 07:04:54 (EST)
committer Thomas Watson2013-04-02 13:50:51 (EDT)
commit48da7d1139f868bb3d3adc349578bcdeb0ac1ab2 (patch)
tree9a8f4ccb2056d6fd239bd571d548746ff62ada3a
parent1abecd574ff7536e7e50b74b4686921f44249723 (diff)
downloadrt.equinox.bundles-48da7d1139f868bb3d3adc349578bcdeb0ac1ab2.zip
rt.equinox.bundles-48da7d1139f868bb3d3adc349578bcdeb0ac1ab2.tar.gz
rt.equinox.bundles-48da7d1139f868bb3d3adc349578bcdeb0ac1ab2.tar.bz2
386298: 37 compilation errors after switching org.eclipse.osgi.tests to 1.5 compliance
Migrate to 1.5. Fix the compilation error by providing Dictionary implemented by Hashtable instead of Properties class where required. https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/.classpath2
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs11
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java3
-rw-r--r--bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java3
4 files changed, 10 insertions, 9 deletions
diff --git a/bundles/org.eclipse.equinox.ds.tests/.classpath b/bundles/org.eclipse.equinox.ds.tests/.classpath
index 7fe05fa..932ccfe 100644
--- a/bundles/org.eclipse.equinox.ds.tests/.classpath
+++ b/bundles/org.eclipse.equinox.ds.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/J2SE-1.4"/>
+ <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="src" output="scr_test/tb24" path="bundles_src/tb24"/>
diff --git a/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs
index 32dfe69..c4d38fb 100644
--- a/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.ds.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Mon Dec 15 14:23:49 EET 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -9,15 +8,15 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+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.maxProblemPerUnit=100
-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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
index d629e27..ba8e21d 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
@@ -12,6 +12,7 @@
package org.eclipse.equinox.ds.tests.tb16;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.eclipse.equinox.ds.tests.tbc.PropertiesProvider;
@@ -31,7 +32,7 @@ public class TargetProperties implements PropertiesProvider, ComponentContextPro
Object prop = properties.get("serial.num");
if (prop != null) {
- Properties serviceProps = new Properties();
+ Dictionary<String, Object> serviceProps = new Hashtable<String, Object>();
serviceProps.put("serial.num", prop);
sr = ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps);
}
diff --git a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
index 5c02d20..51a6c43 100644
--- a/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
+++ b/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
@@ -12,6 +12,7 @@
package org.eclipse.equinox.ds.tests.tb17;
import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Properties;
import org.eclipse.equinox.ds.tests.tbc.PropertiesProvider;
@@ -32,7 +33,7 @@ public class Worker implements PropertiesProvider, ComponentContextProvider {
Object prop = properties.get(ComponentConstants.COMPONENT_NAME);
if (prop != null) {
- Properties serviceProps = new Properties();
+ Dictionary<String, Object> serviceProps = new Hashtable<String, Object>();
serviceProps.put(ComponentConstants.COMPONENT_NAME, prop);
sr = ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps);
}