fixed compile errors due to hard references on JDK 1.5
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
index 202c606..0654776 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/RuntimeBridge.java
@@ -22,7 +22,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.IVMInstall2;
import org.eclipse.jdt.launching.JavaRuntime;
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/cactus/CactusModuleArtifactAdapterDelegate.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/cactus/CactusModuleArtifactAdapterDelegate.java
index b834a03..a0a4cd8 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/cactus/CactusModuleArtifactAdapterDelegate.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/cactus/CactusModuleArtifactAdapterDelegate.java
@@ -12,6 +12,7 @@
import java.util.Arrays;
import java.util.Iterator;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IAdaptable;
@@ -107,7 +108,7 @@
}
return null;
} catch (Exception e) {
- assert false : "Unexpected exception: " + e;
+ System.out.println("Unexpected exception: " + e);
return null;
}
}
@@ -177,7 +178,8 @@
String[][] resolvedTypes = declaringType.resolveType(type);
//TODO: Are there legit cases where this would not be the case? We might need to check
//for this and bomb out if the type cannot be unambigiously resolved
- assert resolvedTypes.length == 1 : "The type cannot be unambigiously resolved. Need to handle this case";
+ if (resolvedTypes.length != 1)
+ System.out.println("The type cannot be unambigiously resolved. Need to handle this case");
String[] resolvedType = resolvedTypes[0];
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < resolvedType.length - 1; i++) {
