Updating to recent change in the javac's model
authorJan Lahoda <jlahoda@netbeans.org>
Fri, 15 Apr 2011 23:22:59 +0200
changeset 564f2992d7dfe7e
parent 563 eeab97f23a4b
child 565 1230ec734691
Updating to recent change in the javac's model
api/nbproject/genfiles.properties
api/nbproject/project.xml
api/src/org/netbeans/modules/jackpot30/spi/JavaFix.java
     1.1 --- a/api/nbproject/genfiles.properties	Tue Apr 05 06:43:49 2011 +0200
     1.2 +++ b/api/nbproject/genfiles.properties	Fri Apr 15 23:22:59 2011 +0200
     1.3 @@ -3,6 +3,6 @@
     1.4  build.xml.stylesheet.CRC32=79c3b980@1.28.0.7
     1.5  # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
     1.6  # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
     1.7 -nbproject/build-impl.xml.data.CRC32=9dd73a80
     1.8 +nbproject/build-impl.xml.data.CRC32=efd00257
     1.9  nbproject/build-impl.xml.script.CRC32=c4574e66
    1.10  nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45
     2.1 --- a/api/nbproject/project.xml	Tue Apr 05 06:43:49 2011 +0200
     2.2 +++ b/api/nbproject/project.xml	Fri Apr 15 23:22:59 2011 +0200
     2.3 @@ -47,7 +47,7 @@
     2.4                      <build-prerequisite/>
     2.5                      <compile-dependency/>
     2.6                      <run-dependency>
     2.7 -                        <specification-version>0.8.0.1</specification-version>
     2.8 +                        <specification-version>7.5.0.3</specification-version>
     2.9                      </run-dependency>
    2.10                  </dependency>
    2.11                  <dependency>
     3.1 --- a/api/src/org/netbeans/modules/jackpot30/spi/JavaFix.java	Tue Apr 05 06:43:49 2011 +0200
     3.2 +++ b/api/src/org/netbeans/modules/jackpot30/spi/JavaFix.java	Fri Apr 15 23:22:59 2011 +0200
     3.3 @@ -49,7 +49,6 @@
     3.4  import com.sun.source.tree.CatchTree;
     3.5  import com.sun.source.tree.ClassTree;
     3.6  import com.sun.source.tree.CompoundAssignmentTree;
     3.7 -import com.sun.source.tree.DisjunctiveTypeTree;
     3.8  import com.sun.source.tree.ExpressionStatementTree;
     3.9  import com.sun.source.tree.ExpressionTree;
    3.10  import com.sun.source.tree.LiteralTree;
    3.11 @@ -71,6 +70,7 @@
    3.12  import com.sun.source.tree.Tree;
    3.13  import com.sun.source.tree.Tree.Kind;
    3.14  import com.sun.source.tree.TypeParameterTree;
    3.15 +import com.sun.source.tree.UnionTypeTree;
    3.16  import com.sun.source.util.SourcePositions;
    3.17  import com.sun.source.util.TreePath;
    3.18  import com.sun.source.util.TreePathScanner;
    3.19 @@ -1181,13 +1181,13 @@
    3.20  
    3.21                      wc.rewrite(classTree, nueClassTree);
    3.22                      break;
    3.23 -                case DISJUNCTIVE_TYPE:
    3.24 -                    DisjunctiveTypeTree disjunct = (DisjunctiveTypeTree) parentLeaf;
    3.25 +                case UNION_TYPE:
    3.26 +                    UnionTypeTree disjunct = (UnionTypeTree) parentLeaf;
    3.27                      List<? extends Tree> alternatives = new LinkedList<Tree>(disjunct.getTypeAlternatives());
    3.28  
    3.29                      alternatives.remove(leaf);
    3.30  
    3.31 -                    wc.rewrite(disjunct, make.DisjunctiveType(alternatives));
    3.32 +                    wc.rewrite(disjunct, make.UnionType(alternatives));
    3.33                      break;
    3.34                  case METHOD:
    3.35                      MethodTree mTree = (MethodTree) parentLeaf;