As of http://hg.netbeans.org/jet-main/nb-javac/rev/b4e7a57af8df, ClassTree.getKind returns not only Tree.Kind.CLASS, but also Tree.Kind.ANNOTATION_TYPE, Tree.Kind.ENUM and Tree.Kind.INTERFACE - adjusting modules in NetBeans main to that. jdk7 release70_beta_base
authorJan Lahoda <jlahoda@netbeans.org>
Tue, 12 Oct 2010 15:33:58 +0200
branchjdk7
changeset 40227f1f1e394cd7
parent 4020 d223f4f064bd
child 4023 65e6ab712b96
child 4025 17d1a6b4e979
As of http://hg.netbeans.org/jet-main/nb-javac/rev/b4e7a57af8df, ClassTree.getKind returns not only Tree.Kind.CLASS, but also Tree.Kind.ANNOTATION_TYPE, Tree.Kind.ENUM and Tree.Kind.INTERFACE - adjusting modules in NetBeans main to that.
Module owners, please double check the changes.
soa.jca.base/manifest.mf
soa.jca.base/nbproject/project.xml
soa.jca.base/src/org/netbeans/modules/soa/jca/base/OutboundGenerator.java
     1.1 --- a/soa.jca.base/manifest.mf	Thu Sep 16 16:57:10 2010 -0400
     1.2 +++ b/soa.jca.base/manifest.mf	Tue Oct 12 15:33:58 2010 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  Manifest-Version: 1.0
     1.5  AutoUpdate-Show-In-Client: false
     1.6 -OpenIDE-Module-Specification-Version: 6.9
     1.7 +OpenIDE-Module-Specification-Version: 6.10
     1.8  OpenIDE-Module: org.netbeans.modules.soa.jca.base
     1.9  OpenIDE-Module-Layer: org/netbeans/modules/soa/jca/base/layer.xml
    1.10  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/soa/jca/base/Bundle.properties
     2.1 --- a/soa.jca.base/nbproject/project.xml	Thu Sep 16 16:57:10 2010 -0400
     2.2 +++ b/soa.jca.base/nbproject/project.xml	Tue Oct 12 15:33:58 2010 +0200
     2.3 @@ -108,7 +108,7 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>0.13.0.1.5</specification-version>
     2.8 +                        <specification-version>0.67</specification-version>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11                  <dependency>
     3.1 --- a/soa.jca.base/src/org/netbeans/modules/soa/jca/base/OutboundGenerator.java	Thu Sep 16 16:57:10 2010 -0400
     3.2 +++ b/soa.jca.base/src/org/netbeans/modules/soa/jca/base/OutboundGenerator.java	Tue Oct 12 15:33:58 2010 +0200
     3.3 @@ -19,6 +19,7 @@
     3.4  
     3.5  package org.netbeans.modules.soa.jca.base;
     3.6  
     3.7 +import org.netbeans.api.java.source.TreeUtilities;
     3.8  import org.netbeans.modules.soa.jca.base.generator.api.GeneratorUtil;
     3.9  import org.netbeans.modules.soa.jca.base.generator.api.JavacTreeModel;
    3.10  import com.sun.source.tree.AnnotationTree;
    3.11 @@ -898,7 +899,7 @@
    3.12  
    3.13      private boolean hasType(ClassTree classTree, String type) {
    3.14          for (Tree t : classTree.getMembers()) {
    3.15 -            if (t.getKind() == Tree.Kind.CLASS) {
    3.16 +            if (TreeUtilities.CLASS_TREE_KINDS.contains(t.getKind())) {
    3.17                  ClassTree ct = (ClassTree) t;
    3.18                  if (ct.getSimpleName().contentEquals(type)) {
    3.19                      return true;