Fix JAnalysisDecoratedType regarding JsInterop.

JAnalysisDecoratedType was supposed to forward most of the methods to the underlying type, however it was inheriting the default implementation of some of the methods introduced for JsInterop from JType. Change-Id: I9b377d680ce1c0b395067680638d4eb676cbe63f
gwtproject · Dec 11, 2015 · 848af07 · 848af07
1 parent 67b5552
commit 848af07
Show file tree

Hide file tree

Showing 6 changed files with 148 additions and 24 deletions.
diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JArrayType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JArrayType.java
@@ -58,6 +58,11 @@ public String getJsniSignatureName() {
     return "[" + elementType.getJsniSignatureName();
   }
 
+  @Override
+  public JEnumType isEnumOrSubclass() {
+    return null;
+  }
+
   public JType getLeafType() {
     if (leafType == null) {
       if (elementType instanceof JArrayType) {
@@ -94,6 +99,16 @@ public boolean canBeImplementedExternally() {
     return getLeafType().canBeImplementedExternally();
   }
 
+  @Override
+  public boolean isJsType() {
+    return false;
+  }
+
+  @Override
+  public boolean isJsFunction() {
+    return false;
+  }
+
   @Override
   public boolean isJsNative() {
     return getLeafType().isJsNative();
@@ -110,6 +125,11 @@ public boolean canBeReferencedExternally() {
         && !getLeafType().isJavaLangObject();
   }
 
+  @Override
+  public boolean isJavaLangObject() {
+    return false;
+  }
+
   @Override
   public boolean replaces(JType originalType) {
     return (originalType instanceof JArrayType)

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JDeclaredType.java
@@ -365,6 +365,11 @@ public Iterable<JMember> getMembers() {
     return Iterables.<JMember>concat(fields, methods);
   }
 
+  @Override
+  public boolean isArrayType() {
+    return false;
+  }
+
   @Override
   public boolean isJsType() {
     return isJsType;

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JInterfaceType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JInterfaceType.java
@@ -76,6 +76,16 @@ public boolean isJsoType() {
     return false;
   }
 
+  @Override
+  public boolean isJavaLangObject() {
+    return false;
+  }
+
+  @Override
+  public JEnumType isEnumOrSubclass() {
+    return null;
+  }
+
   public boolean hasDefaultMethods() {
     assert !isExternal();
     return Iterables.any(getMethods(), new Predicate<JMethod>() {

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JPrimitiveType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JPrimitiveType.java
@@ -74,6 +74,31 @@ public boolean canBeNull() {
     return false;
   }
 
+  @Override
+  public boolean isArrayType() {
+    return false;
+  }
+
+  @Override
+  public boolean isJsType() {
+    return false;
+  }
+
+  @Override
+  public boolean isJsFunction() {
+    return false;
+  }
+
+  @Override
+  public boolean isJsNative() {
+    return false;
+  }
+
+  @Override
+  public boolean canBeImplementedExternally() {
+    return false;
+  }
+
   @Override
   public boolean canBeSubclass() {
     return false;
@@ -98,6 +123,11 @@ public String getJsniSignatureName() {
     return signatureName;
   }
 
+  @Override
+  public JEnumType isEnumOrSubclass() {
+    return null;
+  }
+
   public String getWrapperTypeName() {
     return wrapperTypeName;
   }
@@ -117,6 +147,11 @@ public boolean canBeReferencedExternally() {
     return this != JPrimitiveType.LONG;
   }
 
+  @Override
+  public boolean isJavaLangObject() {
+    return false;
+  }
+
   @Override
   public void traverse(JVisitor visitor, Context ctx) {
     if (visitor.visit(this, ctx)) {

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JReferenceType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JReferenceType.java
@@ -40,6 +40,11 @@ public String getJsniSignatureName() {
           return "N";
         }
 
+        @Override
+        public JEnumType isEnumOrSubclass() {
+          return null;
+        }
+
         @Override
         public boolean isAbstract() {
           return false;
@@ -55,11 +60,46 @@ public boolean isJsoType() {
           return false;
         }
 
+        @Override
+        public boolean isArrayType() {
+          return false;
+        }
+
         @Override
         public boolean isNullType() {
           return true;
         }
 
+        @Override
+        public boolean isJsType() {
+          return false;
+        }
+
+        @Override
+        public boolean isJsFunction() {
+          return false;
+        }
+
+        @Override
+        public boolean isJsNative() {
+          return false;
+        }
+
+        @Override
+        public boolean canBeImplementedExternally() {
+          return false;
+        }
+
+        @Override
+        public boolean canBeReferencedExternally() {
+          return false;
+        }
+
+        @Override
+        public boolean isJavaLangObject() {
+          return false;
+        }
+
         @Override
         public void traverse(JVisitor visitor, Context ctx) {
           if (visitor.visit(this, ctx)) {
@@ -145,11 +185,41 @@ public boolean isArrayType() {
       return ref.isArrayType();
     }
 
+    @Override
+    public boolean isJsType() {
+      return ref.isJsType();
+    }
+
+    @Override
+    public boolean isJsFunction() {
+      return ref.isJsFunction();
+    }
+
     @Override
     public boolean isJsoType() {
       return ref.isJsoType();
     }
 
+    @Override
+    public boolean isJsNative() {
+      return ref.isJsNative();
+    }
+
+    @Override
+    public boolean canBeImplementedExternally() {
+      return ref.canBeImplementedExternally();
+    }
+
+    @Override
+    public boolean canBeReferencedExternally() {
+      return ref.canBeReferencedExternally();
+    }
+
+    @Override
+    public boolean isJavaLangObject() {
+      return ref.isJavaLangObject();
+    }
+
     @Override
     public boolean isExternal() {
       return ref.isExternal();

diff --git a/dev/core/src/com/google/gwt/dev/jjs/ast/JType.java b/dev/core/src/com/google/gwt/dev/jjs/ast/JType.java
@@ -62,9 +62,7 @@ public JType(SourceInfo info, String name) {
    */
   public abstract boolean canBeNull();
 
-  public boolean isArrayType() {
+  public abstract boolean isArrayType();
-    return false;
-  }
 
   /**
    * Returns {@code true} if this is {@link JReferenceType.JNullType.INSTANCE}.
@@ -73,29 +71,17 @@ public boolean isNullType() {
     return false;
   }
 
-  public boolean isJsType() {
+  public abstract boolean isJsType();
-    return false;
-  }
 
-  public boolean isJsFunction() {
+  public abstract boolean isJsFunction();
-    return false;
-  }
 
-  public boolean isJsNative() {
+  public abstract boolean isJsNative();
-    return false;
-  }
 
-  public boolean canBeImplementedExternally() {
+  public abstract boolean canBeImplementedExternally();
-    return false;
-  }
 
-  public boolean canBeReferencedExternally() {
+  public abstract boolean canBeReferencedExternally();
-    return false;
-  }
 
-  public boolean isJavaLangObject() {
+  public abstract boolean isJavaLangObject();
-    return false;
-  }
 
   /**
    * Returns {@code true} if this is a JavaScriptObject type.
@@ -161,9 +147,7 @@ public String getPackageName() {
    * Returns the (closest) enum supertype if the type is a subclass of an enum; it returns
    * {@code this} if {@code this} is a {@link JEnumType} and {@code null} otherwise.
    */
-  public JEnumType isEnumOrSubclass() {
+  public abstract JEnumType isEnumOrSubclass();
-    return null;
-  }
 
   /**
    * Binary name of the type.