All features except VariableArguments now works in the InteractionsPane when you are using the Jsr14 v.2.4 compiler. I have not found out why it creates the mismatching arguments when you try to use varargs when the jsr14 is enabled. It should not be any different than using java 1.5. We translate the varargs into an arraytype. For now, due to the release coming up, I have put in a check for it in TypeChecker15, to give the user a message that VarArgs is currently not supported in anything else than java 1.5 or higher. This check will be removed when I have located the problem.

dyrby76 · dyrby76 · commit f8d559eff1bd · 2005-04-21T12:41:22.000Z
git-svn-id: file:///tmp/test-svn/trunk@3065 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/dynamicjava/src/koala/Version.java b/dynamicjava/src/koala/Version.java
@@ -53,7 +53,7 @@
  * This file is copied to Version.java by the build process, which also
  * fills in the right values of the date and time.
  *
- * This javadoc corresponds to build drjava-20050413-0716;
+ * This javadoc corresponds to build drjava-20050421-1237;
  *
  * @version $Id$
  */
@@ -62,7 +62,7 @@ public abstract class Version {
    * This string will be automatically expanded upon "ant commit".
    * Do not edit it by hand!
    */
-  private static final String BUILD_TIME_STRING = "20050413-0716";
+  private static final String BUILD_TIME_STRING = "20050421-1237";
 
   /** A {@link Date} version of the build time. */
   private static final Date BUILD_TIME = _getBuildDate();
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker14.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker14.java
@@ -103,6 +103,9 @@ protected void checkGenericReferenceType(ReferenceType node) {
    * @param node - the MethodDeclaration which may or may not contain variable arguments
    */
   protected void checkVarArgs(MethodDeclaration node) {
+    if(true){
+    throw new RuntimeException("What the hell!!!");
+    }
     if(node.isVarArgs())
       throw new WrongVersionException("Methods with variable arguments are only allowed in Java 1.5 or higher");
   }
diff --git a/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker15.java b/dynamicjava/src/koala/dynamicjava/interpreter/TypeChecker15.java
@@ -139,10 +139,18 @@ protected void checkGenericReferenceType(ReferenceType node) {
   
   /**
    * Does nothing - Variable Arguments are allowed in 1.5
+   * Variable Arguments are currently Not working with jsr14 in the interactionspane
+   * This check here can be deleted when this is fixed.
+   * This is temporarily included to ensure decent feedback to the users of our new beta.
    * @param node - unused
    */
   protected void checkVarArgs(MethodDeclaration node) { 
-   
+    try {
+      java.lang.reflect.Method.class.getMethod("isVarArgs", new Class<?>[]{});
+    }
+    catch (Throwable t) {
+      throw new WrongVersionException("Variable Arguments are currently only supported in the InteractionsPane for Java Version 1.5 or better.");
+    }    
   }
   
   /**
diff --git a/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java b/dynamicjava/src/koala/dynamicjava/util/TigerUtilities.java
@@ -110,8 +110,8 @@ public static void resetVersion() {
     try {
       //Class.forName("java.lang.Enum");
 //      Class.forName("com.sun.javadoc.ParameterizedType");
-      
-      java.lang.reflect.Method.class.getMethod("isVarArgs", new Class<?>[]{});
+      Integer.valueOf(5);  //This method only exists in jsr14 and java 1.5+ isVarArgs doesnt
+      //java.lang.reflect.Method.class.getMethod("isVarArgs", new Class<?>[]{});
       _tigerEnabled = true;
     }
     catch (Throwable t) {
@@ -174,7 +174,7 @@ public static boolean isVarArgs(Constructor c) {
    * @return boolean that is true if tiger is enabled and <code>c.isEnum()</code>
    */
   public static boolean isEnum(Class<?> c) {
-    System.out.println("enabled: "+_tigerEnabled+", "+c+".super: "+c.getSuperclass());
+      //    System.out.println("enabled: "+_tigerEnabled+", "+c+".super: "+c.getSuperclass());
     return _tigerEnabled && c.getSuperclass()!=null && (c.getSuperclass().getName().equals("java.lang.Enum"));
     
     // The following is what it should be.  The reason why this commented is that
