commit 51f96f25d7768fd7907b6a1300f60cfe85b0c3d4
author Goktug Gokdogan <goktug@google.com> Fri Nov 06 19:55:35 2015 -0800
committer Goktug Gokdogan <goktug@google.com> Fri Nov 06 19:55:35 2015 -0800
tree 87f6cf4e08ac1c64eadfd84ffee2736cfcb2a3ac
parent dc66a77b7817e5e008fa4752eba9b638fe132314

Restore some behavior for old annotations.

The regression was introduced in
64e3270a9a02eea66fb9beab9e423a14f60b6cec

Change-Id: I3f27ea193f54b50ed8d1b1a69098f42c4274cb32

dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java

diff --git a/dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java b/dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java
index 87dd845..b3ba633 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JsInteropUtil.java
@@ -54,7 +54,8 @@
       exportName = jsPrototype.substring(indexOf + 1);
     }
     boolean isJsType = jsType != null;
-    boolean isClassWideExport = JdtUtil.getAnnotation(annotations, JSEXPORT_CLASS) != null;
+    boolean isClassWideExport =
+        isJsNative || JdtUtil.getAnnotation(annotations, JSEXPORT_CLASS) != null;
     boolean isJsFunction = JdtUtil.getAnnotation(annotations, JSFUNCTION_CLASS) != null;
     boolean canBeImplementedExternally =
         (type instanceof JInterfaceType && (isJsType || isJsFunction))
@@ -116,19 +117,21 @@
   private static void setJsInteropProperties(
       JMember member, Annotation[] annotations, boolean isPropertyAccessor) {
     boolean hasExport = JdtUtil.getAnnotation(annotations, JSEXPORT_CLASS) != null;
+    JsMemberType memberType = getJsMemberType(member, isPropertyAccessor);
+    String namespace = maybeGetJsNamespace(annotations);
+    String exportName = maybeGetJsExportName(annotations);
+    if (hasExport) {
+      member.setJsMemberInfo(memberType, namespace, exportName, true);
+      return;
+    }
 
     /* Apply class wide JsInterop annotations */
 
     boolean ignore = JdtUtil.getAnnotation(annotations, JSNOEXPORT_CLASS) != null;
-    if (ignore || (!member.isPublic() && !isNativeConstructor(member)) || !hasExport) {
+    if (ignore || (!member.isPublic() && !isNativeConstructor(member)) || hasExport) {
       return;
     }
 
-    String namespace = maybeGetJsNamespace(annotations);
-    String exportName = maybeGetJsExportName(annotations);
-    JsMemberType memberType = getJsMemberType(member, isPropertyAccessor);
-    member.setJsMemberInfo(memberType, namespace, exportName, hasExport);
-
     JDeclaredType enclosingType = member.getEnclosingType();
 
     if (enclosingType.isJsType() && member.needsDynamicDispatch()) {