Updating to Java 1.5
diff --git a/bundles/org.eclipse.e4.languages.javascript.junit/.classpath b/bundles/org.eclipse.e4.languages.javascript.junit/.classpath
index 2fbb7a2..64c5e31 100644
--- a/bundles/org.eclipse.e4.languages.javascript.junit/.classpath
+++ b/bundles/org.eclipse.e4.languages.javascript.junit/.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="output" path="bin"/>
diff --git a/bundles/org.eclipse.e4.languages.javascript.junit/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.e4.languages.javascript.junit/.settings/org.eclipse.jdt.core.prefs
index 2432afb..32946a1 100644
--- a/bundles/org.eclipse.e4.languages.javascript.junit/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.e4.languages.javascript.junit/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Wed Apr 14 14:17:15 EDT 2010
+#Wed Apr 14 15:00:23 EDT 2010
eclipse.preferences.version=1
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.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
diff --git a/bundles/org.eclipse.e4.languages.javascript.junit/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.languages.javascript.junit/META-INF/MANIFEST.MF
index 82d401e..17524aa 100644
--- a/bundles/org.eclipse.e4.languages.javascript.junit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.languages.javascript.junit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: JUnit JavaScript Support
Bundle-SymbolicName: org.eclipse.e4.languages.javascript.junit
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Import-Package: junit.framework,
org.mozilla.javascript
Export-Package: org.eclipse.e4.languages.javascript.junit
diff --git a/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptAssertionFailedError.java b/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptAssertionFailedError.java
index fa69fab..9bf71cd 100644
--- a/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptAssertionFailedError.java
+++ b/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptAssertionFailedError.java
@@ -19,7 +19,7 @@
private void initStackTrace() {
EvaluatorException jsException = new EvaluatorException(null);
- List targetTrace = new ArrayList();
+ List<StackTraceElement> targetTrace = new ArrayList<StackTraceElement>();
StackTraceElement[] traceElements = jsException.getStackTrace();
for (int i = 0; i < traceElements.length; i++) {
diff --git a/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestCase.java b/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestCase.java
index fb81ccc..b2d6e62 100644
--- a/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestCase.java
+++ b/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestCase.java
@@ -36,7 +36,7 @@
private ScriptableObject globalScope;
private String testCaseName;
- private Collection scripts;
+ private Collection<?> scripts;
private ClassLoader applicationClassLoader;
private ClassLoader originalApplicationClassLoader;
private boolean superRunTest = false;
@@ -54,7 +54,7 @@
this(name, testCaseName, null, applicationClassLoader);
}
- public JavaScriptTestCase(String name, String testCaseName, Collection scripts, ClassLoader applicationClassLoader) {
+ public JavaScriptTestCase(String name, String testCaseName, Collection<?> scripts, ClassLoader applicationClassLoader) {
super(name);
this.testCaseName = testCaseName;
this.scripts = scripts;
@@ -149,7 +149,7 @@
private void evalScripts() {
if (scripts == null)
return;
- for (Iterator iterator = scripts.iterator(); iterator.hasNext();) {
+ for (Iterator<?> iterator = scripts.iterator(); iterator.hasNext();) {
Object script = iterator.next();
if (script instanceof String)
eval((String) script, null);
diff --git a/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestSuite.java b/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestSuite.java
index bbccc7d..ccdde2b 100644
--- a/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestSuite.java
+++ b/bundles/org.eclipse.e4.languages.javascript.junit/src/org/eclipse/e4/languages/javascript/junit/JavaScriptTestSuite.java
@@ -22,14 +22,14 @@
public class JavaScriptTestSuite extends TestSuite {
- private Collection scripts;
+ private Collection<?> scripts;
private ClassLoader applicationClassLoader;
- public JavaScriptTestSuite(String testCaseName, Collection scripts) {
+ public JavaScriptTestSuite(String testCaseName, Collection<?> scripts) {
this(testCaseName, scripts, null);
}
- public JavaScriptTestSuite(String testCaseName, Collection scripts, ClassLoader applicationClassLoader) {
+ public JavaScriptTestSuite(String testCaseName, Collection<?> scripts, ClassLoader applicationClassLoader) {
super(testCaseName);
this.scripts = scripts;
this.applicationClassLoader = applicationClassLoader;
@@ -45,7 +45,7 @@
JavaScriptTestCase testCase = new JavaScriptTestCase(null, getName(), scripts, applicationClassLoader);
testCase.setUp();
try {
- ArrayList testFunctionNames = new ArrayList();
+ ArrayList<String> testFunctionNames = new ArrayList<String>();
ScriptableObject testCaseInstance = (ScriptableObject) testCase.createJavaScriptTestCaseInstance(null);
Object[] ids = ScriptableObject.getPropertyIds(testCaseInstance);
for (int i = 0; i < ids.length; i++) {
@@ -61,8 +61,8 @@
}
}
Collections.sort(testFunctionNames);
- for (Iterator iterator = testFunctionNames.iterator(); iterator.hasNext();) {
- String testFunctionName = (String) iterator.next();
+ for (Iterator<String> iterator = testFunctionNames.iterator(); iterator.hasNext();) {
+ String testFunctionName = iterator.next();
addTest(new JavaScriptTestCase(testFunctionName, getName(), scripts, applicationClassLoader));
}
} finally {
