ITD inner type tests: replace '_' by '__'

Classes and methods named '_' are no longer allowed in ECJ, obviously
also not for old target versions like 1.5. This probably is due to
the added support for unnamed patterns and classes in the latest
upstream JDT Core merge. Therefore, we simply rename '_' to '__'.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

tests/features169/itdInnerTypes/Construction.java

@@ -1,11 +1,11 @@
 public class Construction {
   public static void main(String []argv) {
-    new _();
+    new __();
     System.out.println("done");
   }
 }
 
 aspect XX {
-  public static class Construction._ {
+  public static class Construction.__ {
   }
 }

tests/features169/itdInnerTypes/Construction3.java

@@ -1,17 +1,17 @@
 aspect Aspect2 {
-  public static class Construction3._ {
+  public static class Construction3.__ {
     String string;
-    public _(String string) { this.string = string;}
+    public __(String string) { this.string = string;}
     public String toString() {
       return string;
     }
   }
-  public static Construction3._ Construction3._() { return new _("abc"); }
+  public static Construction3.__ Construction3.__() { return new __("abc"); }
   public static String Construction3.foo() { return "abc"; }
 }
 public class Construction3 {
   public static void main(String []argv) {
-    Object o = _();
+    Object o = __();
     o = foo();
     System.out.println(o);
   }

tests/features169/itdInnerTypes/Construction4.java

@@ -1,11 +1,11 @@
 aspect Aspect1 {
-  public static Construction4._ Construction4._() { return new _("abc"); }
+  public static Construction4.__ Construction4.__() { return new __("abc"); }
   public static String Construction4.foo() { return "abc"; }
 }
 aspect Aspect2 {
-  public static class Construction4._ {
+  public static class Construction4.__ {
     String string;
-    public _(String string) { this.string = string;}
+    public __(String string) { this.string = string;}
     public String toString() {
       return string;
     }
@@ -13,7 +13,7 @@ aspect Aspect2 {
 } 
 public class Construction4 {
   public static void main(String []argv) {
-    Object o = _();
+    Object o = __();
     o = foo();
     System.out.println(o);
   }

tests/features169/itdInnerTypes/eight/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/eight/Underscorer.aj

@@ -3,11 +3,11 @@ package a.b.c;
 public aspect Underscorer {
   public int Vote.i = 5;
   public String Vote.zzz() { return "abc"; }
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

tests/features169/itdInnerTypes/eight/Vote.java

@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-  public static Vote._ _() { return new Vote._(null); }
+  public static Vote.__ __() { return new Vote.__(null); }
 
   static class RealInner {}
 

tests/features169/itdInnerTypes/five/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/five/Vote_Amender.aj

@@ -1,11 +1,11 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

tests/features169/itdInnerTypes/four/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/four/Vote_Amender.aj

@@ -1,10 +1,10 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
   }
 }

tests/features169/itdInnerTypes/nine/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/nine/Underscorer.aj

@@ -1,13 +1,13 @@
 package a.b.c;
 
 public aspect Underscorer {
-  public Vote._ Vote._()  { return new Vote._(null); }
+  public Vote.__ Vote.__()  { return new Vote.__(null); }
 
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

tests/features169/itdInnerTypes/nine/Vote.java

@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-//  public static Vote._ _() { return new Vote._(null); }
+//  public static Vote.__ __() { return new Vote.__(null); }
 
   static class RealInner {}
 

tests/features169/itdInnerTypes/one/Vote_Amender.aj

@@ -1,6 +1,6 @@
 package a.b.c;
 
 aspect Vote_Amender {
-  static class Vote._ {
+  static class Vote.__ {
   }
 }

tests/features169/itdInnerTypes/separate/Basic.java

@@ -1,11 +1,11 @@
 public class Basic {
   public static void main(String []argv) {
-    new _();
+    new __();
     System.out.println("done");
   }
 }
 
 aspect XX {
-  public static class Basic._ {
+  public static class Basic.__ {
   }
 }

tests/features169/itdInnerTypes/separate/Basic2.java

@@ -1,6 +1,6 @@
 public class Basic2 {
   public static void main(String []argv) {
-    new Basic._();
+    new Basic.__();
     System.out.println("done");
   }
 }

tests/features169/itdInnerTypes/separate2/Basic.java

@@ -1,11 +1,11 @@
 public class Basic {
   public static void main(String []argv) {
-    // new _();
+    // new __();
     System.out.println("done");
   }
 }
 
 aspect XX {
-  public static class Basic._ {
+  public static class Basic.__ {
   }
 }

tests/features169/itdInnerTypes/separate2/Basic2.java

@@ -1,6 +1,6 @@
 public class Basic2 {
   public static void main(String []argv) {
-    new Basic._();
+    new Basic.__();
     System.out.println("done");
   }
 }

tests/features169/itdInnerTypes/seven/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/seven/Underscorer.aj

@@ -1,11 +1,11 @@
 package a.b.c;
 
 public aspect Underscorer {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

tests/features169/itdInnerTypes/seven/Vote.java

@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-  public static Vote._ _() { return new Vote._(null); }
+  public static Vote.__ __() { return new Vote.__(null); }
 
   static class RealInner {}
 

tests/features169/itdInnerTypes/six/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.choice.class)
+@RelatedType(value=Vote.__.choice.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/six/Vote.java

@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Vote {
 
-  public static Vote._ field = new Vote._(null);
+  public static Vote.__ field = new Vote.__(null);
 
   static class RealInner {}
 

tests/features169/itdInnerTypes/six/Vote_Amender.aj

@@ -1,11 +1,11 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     public static class choice {}
     public Ip ip = new Ip();
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
     public class Ip {
       public String fieldName() { return "ip"; }

tests/features169/itdInnerTypes/ten/Aspect1.java

@@ -1,8 +1,8 @@
 aspect Aspect1 {
-  public static class Construction._ {
+  public static class Construction.__ {
     private String string;
-    public _(String string) { this.string = string; }
-    public _() { this.string = "nothing"; }
+    public __(String string) { this.string = string; }
+    public __() { this.string = "nothing"; }
     public String toString() {
       return string; 
     }

tests/features169/itdInnerTypes/ten/Aspect2.java

@@ -1,3 +1,3 @@
 aspect Aspect2 {
-  public Construction._ Construction._() { return new _("abc"); }
+  public Construction.__ Construction.__() { return new __("abc"); }
 }

tests/features169/itdInnerTypes/ten/Construction.java

@@ -1,6 +1,6 @@
 public class Construction {
   public static void main(String []argv) {
-    new _();
-    System.out.println(new _("abcde"));
+    new __();
+    System.out.println(new __("abcde"));
   }
 }

tests/features169/itdInnerTypes/three/Runner.java

@@ -1,11 +1,10 @@
 package a.b.c;
 
-@RelatedType(value=Vote._.class)
+@RelatedType(value=Vote.__.class)
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
     System.out.println(Runner.class.getDeclaredAnnotations()[0]);
   }
 }
-

tests/features169/itdInnerTypes/three/Vote_Amender.aj

@@ -1,10 +1,10 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
     private String choice = "abc";
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
   }
 }

tests/features169/itdInnerTypes/two/Runner.java

@@ -2,7 +2,7 @@ package a.b.c;
 
 public class Runner {
   public static void main(String[]argv) {
-    Vote._ v = new Vote._("wibble");
+    Vote.__ v = new Vote.__("wibble");
     System.out.println(v.getString());
   }
 }

tests/features169/itdInnerTypes/two/Vote_Amender.aj

@@ -1,9 +1,9 @@
 package a.b.c;
 
 public aspect Vote_Amender {
-  public static class Vote._ {
+  public static class Vote.__ {
     private String string;
-    public _(String string) { this.string = string; }
+    public __(String string) { this.string = string; }
     public String getString() { return this.string; }
   }
 }

tests/multiIncremental/prInner4/base/A.aj

@@ -1,5 +1,5 @@
 aspect A {
-  public static class C._ {
+  public static class C.__ {
     public void printmessages() {
       System.out.println("message");
     }

tests/multiIncremental/prInner4/base/C.java

@@ -1,5 +1,5 @@
 public class C {
   public static void main(String []argv) {
-    new _();
+    new __();
   }
 }

tests/multiIncremental/prInner4/inc1/A.aj

@@ -1,5 +1,5 @@
 aspect A {
-  public static class C._ {
+  public static class C.__ {
     public void printmessages() {
       System.out.println("message");
     }

tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml

@@ -66,14 +66,14 @@
    </ajc-test>
 
    <ajc-test dir="features169/itdInnerTypes/nine" title="vote - itd mixture 2">
-     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
+     <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5" vm=""/>
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -83,10 +83,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -96,10 +96,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -109,10 +109,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -122,10 +122,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -135,10 +135,10 @@
      <run class="a.b.c.Runner">
        <stdout>
        <line text="wibble"/>
-       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>
@@ -149,9 +149,9 @@
        <stdout>
        <line text="wibble"/>
        <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_)" vm="-1.8"/>
-       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9-13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_.class)" vm="14-18"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote._.class)" vm="19-"/>
+       <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__.class)" vm="9-13"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$__.class)" vm="14-18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote.__.class)" vm="19-"/>
        </stdout>
      </run>
    </ajc-test>