test/tools/javac/multicatch/model/ModelChecker.java

*** 21,31 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 6993963
   * @summary Project Coin: Use precise exception analysis for effectively final catch parameters
   * @library ../../lib
   * @build JavacTestingAbstractProcessor ModelChecker
   * @compile -processor ModelChecker Model01.java
   */
--- 21,31 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 6993963 7025809
   * @summary Project Coin: Use precise exception analysis for effectively final catch parameters
   * @library ../../lib
   * @build JavacTestingAbstractProcessor ModelChecker
   * @compile -processor ModelChecker Model01.java
   */
*** 45,54 ****
--- 45,55 ----
  import javax.lang.model.type.TypeKind;
  import javax.lang.model.type.UnionType;
  import javax.lang.model.type.UnknownTypeException;
  import javax.lang.model.util.SimpleTypeVisitor6;
  import javax.lang.model.util.SimpleTypeVisitor7;
+ import static JavacTestingAbstractProcessor.*;
  
  @SupportedAnnotationTypes("Check")
  public class ModelChecker extends JavacTestingAbstractProcessor {
  
      @Override
*** 105,115 ****
              throw new RuntimeException("Expected UnknownTypeException not thrown.");
          } catch (UnknownTypeException ute) {
              ; // Expected
          }
  
!         UnionType unionType = new SimpleTypeVisitor7<UnionType, Void>(){
              @Override
              protected UnionType defaultAction(TypeMirror e, Void p) {return null;}
  
              @Override
              public UnionType visitUnion(UnionType t, Void p) {return t;}
--- 106,116 ----
              throw new RuntimeException("Expected UnknownTypeException not thrown.");
          } catch (UnknownTypeException ute) {
              ; // Expected
          }
  
!         UnionType unionType = new SimpleTypeVisitor<UnionType, Void>(){
              @Override
              protected UnionType defaultAction(TypeMirror e, Void p) {return null;}
  
              @Override
              public UnionType visitUnion(UnionType t, Void p) {return t;}