]> source.dussan.org Git - aspectj.git/commitdiff
Moved around to fit in with new way of executing the incremental model tests as junit...
authoraclement <aclement>
Fri, 6 Aug 2004 12:30:09 +0000 (12:30 +0000)
committeraclement <aclement>
Fri, 6 Aug 2004 12:30:09 +0000 (12:30 +0000)
72 files changed:
tests/incremental/model/intertype/changes/secondary/BetaA.20.java [new file with mode: 0644]
tests/incremental/model/intertype/changes/secondary/BetaA.30.java [new file with mode: 0644]
tests/incremental/model/intertype/primary/Alpha.java [deleted file]
tests/incremental/model/intertype/secondary/BetaA.20.java [deleted file]
tests/incremental/model/intertype/secondary/BetaA.30.java [deleted file]
tests/incremental/model/intertype/src/primary/Alpha.java [new file with mode: 0644]
tests/incremental/model/introduction/changes/CloneablePoint.20.java [new file with mode: 0644]
tests/incremental/model/introduction/changes/HashablePoint.30.java [new file with mode: 0644]
tests/incremental/model/introduction/changes/Point.30.java [new file with mode: 0644]
tests/incremental/model/introduction/introduction/CloneablePoint.20.java [deleted file]
tests/incremental/model/introduction/introduction/CloneablePoint.java [deleted file]
tests/incremental/model/introduction/introduction/ComparablePoint.java [deleted file]
tests/incremental/model/introduction/introduction/HashablePoint.30.java [deleted file]
tests/incremental/model/introduction/introduction/HashablePoint.java [deleted file]
tests/incremental/model/introduction/introduction/Point.30.java [deleted file]
tests/incremental/model/introduction/introduction/Point.java [deleted file]
tests/incremental/model/introduction/src/introduction/CloneablePoint.java [new file with mode: 0644]
tests/incremental/model/introduction/src/introduction/ComparablePoint.java [new file with mode: 0644]
tests/incremental/model/introduction/src/introduction/HashablePoint.java [new file with mode: 0644]
tests/incremental/model/introduction/src/introduction/Point.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/changes/primary/Beta.20.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/changes/primary/Beta.delete.60.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/changes/secondary/Delta.40.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/changes/secondary/Delta.delete.60.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/changes/secondary/Gamma.30.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/changes/secondary/Gamma.delete.50.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_addremove/primary/Alpha.java [deleted file]
tests/incremental/model/sourcefiles_addremove/primary/Beta.20.java [deleted file]
tests/incremental/model/sourcefiles_addremove/primary/Beta.delete.60.java [deleted file]
tests/incremental/model/sourcefiles_addremove/secondary/Delta.40.java [deleted file]
tests/incremental/model/sourcefiles_addremove/secondary/Delta.delete.60.java [deleted file]
tests/incremental/model/sourcefiles_addremove/secondary/Gamma.30.java [deleted file]
tests/incremental/model/sourcefiles_addremove/secondary/Gamma.delete.50.java [deleted file]
tests/incremental/model/sourcefiles_addremove/src/primary/Alpha.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/changes/primary/Beta.20.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/changes/secondary/Delta.30.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.40.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.50.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.60.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/primary/Alpha.java [deleted file]
tests/incremental/model/sourcefiles_updating/primary/Beta.20.java [deleted file]
tests/incremental/model/sourcefiles_updating/primary/Beta.java [deleted file]
tests/incremental/model/sourcefiles_updating/secondary/Delta.30.java [deleted file]
tests/incremental/model/sourcefiles_updating/secondary/Delta.java [deleted file]
tests/incremental/model/sourcefiles_updating/secondary/Gamma.40.java [deleted file]
tests/incremental/model/sourcefiles_updating/secondary/Gamma.50.java [deleted file]
tests/incremental/model/sourcefiles_updating/secondary/Gamma.60.java [deleted file]
tests/incremental/model/sourcefiles_updating/secondary/Gamma.java [deleted file]
tests/incremental/model/sourcefiles_updating/src/primary/Alpha.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/src/primary/Beta.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/src/secondary/Delta.java [new file with mode: 0644]
tests/incremental/model/sourcefiles_updating/src/secondary/Gamma.java [new file with mode: 0644]
tests/incremental/model/weaving/changes/primary/BetaA.20.java [new file with mode: 0644]
tests/incremental/model/weaving/changes/primary/BetaA.30.java [new file with mode: 0644]
tests/incremental/model/weaving/changes/primary/BetaA.40.java [new file with mode: 0644]
tests/incremental/model/weaving/primary/Alpha.java [deleted file]
tests/incremental/model/weaving/primary/BetaA.20.java [deleted file]
tests/incremental/model/weaving/primary/BetaA.30.java [deleted file]
tests/incremental/model/weaving/primary/BetaA.40.java [deleted file]
tests/incremental/model/weaving/primary/BetaA.java [deleted file]
tests/incremental/model/weaving/src/primary/Alpha.java [new file with mode: 0644]
tests/incremental/model/weaving/src/primary/BetaA.java [new file with mode: 0644]
tests/incremental/model/weaving2/changes/primary/BetaA.20.java [new file with mode: 0644]
tests/incremental/model/weaving2/changes/primary/BetaA.delete.40.java [new file with mode: 0644]
tests/incremental/model/weaving2/changes/secondary/GammaA.30.java [new file with mode: 0644]
tests/incremental/model/weaving2/primary/Alpha.java [deleted file]
tests/incremental/model/weaving2/primary/BetaA.20.java [deleted file]
tests/incremental/model/weaving2/primary/BetaA.delete.40.java [deleted file]
tests/incremental/model/weaving2/primary/BetaA.java [deleted file]
tests/incremental/model/weaving2/secondary/GammaA.30.java [deleted file]
tests/incremental/model/weaving2/src/primary/Alpha.java [new file with mode: 0644]
tests/incremental/model/weaving2/src/primary/BetaA.java [new file with mode: 0644]

diff --git a/tests/incremental/model/intertype/changes/secondary/BetaA.20.java b/tests/incremental/model/intertype/changes/secondary/BetaA.20.java
new file mode 100644 (file)
index 0000000..abe370e
--- /dev/null
@@ -0,0 +1,8 @@
+package secondary;
+
+import primary.Alpha;
+
+public aspect BetaA {
+  int Alpha.i;
+  String Alpha.s;
+}
diff --git a/tests/incremental/model/intertype/changes/secondary/BetaA.30.java b/tests/incremental/model/intertype/changes/secondary/BetaA.30.java
new file mode 100644 (file)
index 0000000..394c7a9
--- /dev/null
@@ -0,0 +1,7 @@
+package secondary;
+
+import primary.Alpha;
+
+public aspect BetaA {
+  String Alpha.s;
+}
diff --git a/tests/incremental/model/intertype/primary/Alpha.java b/tests/incremental/model/intertype/primary/Alpha.java
deleted file mode 100644 (file)
index 4f77e13..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package primary;
-
-public class Alpha {
-  public static void main(String [] argv) {
-  }
-}
-
diff --git a/tests/incremental/model/intertype/secondary/BetaA.20.java b/tests/incremental/model/intertype/secondary/BetaA.20.java
deleted file mode 100644 (file)
index abe370e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package secondary;
-
-import primary.Alpha;
-
-public aspect BetaA {
-  int Alpha.i;
-  String Alpha.s;
-}
diff --git a/tests/incremental/model/intertype/secondary/BetaA.30.java b/tests/incremental/model/intertype/secondary/BetaA.30.java
deleted file mode 100644 (file)
index 394c7a9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package secondary;
-
-import primary.Alpha;
-
-public aspect BetaA {
-  String Alpha.s;
-}
diff --git a/tests/incremental/model/intertype/src/primary/Alpha.java b/tests/incremental/model/intertype/src/primary/Alpha.java
new file mode 100644 (file)
index 0000000..4f77e13
--- /dev/null
@@ -0,0 +1,7 @@
+package primary;
+
+public class Alpha {
+  public static void main(String [] argv) {
+  }
+}
+
diff --git a/tests/incremental/model/introduction/changes/CloneablePoint.20.java b/tests/incremental/model/introduction/changes/CloneablePoint.20.java
new file mode 100644 (file)
index 0000000..c345098
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+
+Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+Use and copying of this software and preparation of derivative works based
+upon this software are permitted.  Any distribution of this software or
+derivative works must comply with all applicable United States export control
+laws.
+
+This software is made available AS IS, and Xerox Corporation makes no warranty
+about the software, its performance or its conformity to any specification.
+
+*/
+package introduction;
+
+public aspect CloneablePoint {
+
+   declare parents: Point implements Cloneable;
+
+   public Object Point.clone() throws CloneNotSupportedException {
+      // we choose to bring all fields up to date before cloning.
+      makeRectangular();
+      makePolar();
+      return super.clone();
+   }
+
+   public static void main(String[] args){
+      Point p1 = new Point();
+      Point p2 = null;
+
+      p1.setPolar(Math.PI, 1.0);
+      try {
+         p2 = (Point)p1.clone();
+      } catch (CloneNotSupportedException e) {}
+      System.out.println("p1 =" + p1 );
+      System.out.println("p2 =" + p2 );
+
+      p1.rotate(Math.PI / -2);
+      System.out.println("p1 =" + p1 );
+      System.out.println("p2 =" + p2 );
+   }
+}
diff --git a/tests/incremental/model/introduction/changes/HashablePoint.30.java b/tests/incremental/model/introduction/changes/HashablePoint.30.java
new file mode 100644 (file)
index 0000000..39eb33b
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+Use and copying of this software and preparation of derivative works based
+upon this software are permitted.  Any distribution of this software or
+derivative works must comply with all applicable United States export control
+laws.
+
+This software is made available AS IS, and Xerox Corporation makes no warranty
+about the software, its performance or its conformity to any specification.
+*/
+
+package introduction;
+
+import java.util.Hashtable;
+
+public aspect HashablePoint {
+
+   public int Point.hashCode() {
+      return (int) (getX() + getY() % Integer.MAX_VALUE);
+   }
+
+   public boolean Point.equals(Object o) {
+      if (o == this) { return true; }
+      if (!(o instanceof Point)) { return false; }
+      Point other = (Point)o;
+      return (getX() == other.getX()) && (getY() == other.getY());
+   }
+
+   public static void main(String[] args) {
+      Hashtable h = new Hashtable();
+      Point p1 = new Point();
+
+      p1.setRectangular(10, 10);
+      Point p2 = new Point();
+
+      p2.setRectangular(10, 10);
+
+      System.out.println("p1 = " + p1);
+      System.out.println("p2 = " + p2);
+      System.out.println("p1.hashCode() = " + p1.hashCode());
+      System.out.println("p2.hashCode() = " + p2.hashCode());
+
+      h.put(p1, "P1");
+      System.out.println("Got: " + h.get(p2));
+   }
+}
diff --git a/tests/incremental/model/introduction/changes/Point.30.java b/tests/incremental/model/introduction/changes/Point.30.java
new file mode 100644 (file)
index 0000000..609a048
--- /dev/null
@@ -0,0 +1,98 @@
+/*
+  Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+  Use and copying of this software and preparation of derivative works based
+  upon this software are permitted.  Any distribution of this software or
+  derivative works must comply with all applicable United States export control
+  laws.
+
+  This software is made available AS IS, and Xerox Corporation makes no warranty
+  about the software, its performance or its conformity to any specification.
+*/
+
+package introduction;
+
+public class Point {
+
+   protected double x = 0;
+   protected double y = 0;
+   protected double theta = 0;
+   protected double rho = 0;
+
+   protected boolean polar = true;
+   protected boolean rectangular = true;
+
+   public double getX(){
+      makeRectangular();
+      return x;
+   }
+
+   public double getY(){
+      makeRectangular();
+      return y;
+   }
+
+   public double getTheta(){
+      makePolar();
+      return theta;
+   }
+
+   public double getRho(){
+      makePolar();
+      return rho;
+   }
+
+   public void setRectangular(double newX, double newY){
+      x = newX;
+      y = newY;
+      rectangular = true;
+      polar = false;
+   }
+
+   public void setPolar(double newTheta, double newRho){
+      theta = newTheta;
+      rho = newRho;
+      rectangular = false;
+      polar = true;
+   }
+
+   public void rotate(double angle){
+      setPolar(theta + angle, rho);
+   }
+
+   public void offset(double deltaX, double deltaY){
+      setRectangular(x + deltaX, y + deltaY);
+   }
+
+   protected void makePolar(){
+      if (!polar){
+        theta = Math.atan2(y,x);
+        rho = y / Math.sin(theta);
+        polar = true;
+      }
+   }
+
+   protected void makeRectangular(){
+      if (!rectangular) {
+        x = rho * Math.sin(theta);
+        y = rho * Math.cos(theta);
+        rectangular = true;
+      }
+   }
+
+   public String toString(){
+      return "(" + getX() + ", " + getY() + ")[" 
+        + getTheta() + " : " + getRho() + "]";
+   }
+
+   public static void main(String[] args){
+      Point p1 = new Point();
+      System.out.println("p1 =" + p1);
+      p1.setRectangular(5,2);
+      System.out.println("p1 =" + p1);
+      p1.setPolar( Math.PI / 4.0 , 1.0);
+      System.out.println("p1 =" + p1);
+      p1.setPolar( 0.3805 , 5.385);
+      System.out.println("p1 =" + p1);
+   }
+}
diff --git a/tests/incremental/model/introduction/introduction/CloneablePoint.20.java b/tests/incremental/model/introduction/introduction/CloneablePoint.20.java
deleted file mode 100644 (file)
index c345098..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-
-Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted.  Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
-
-*/
-package introduction;
-
-public aspect CloneablePoint {
-
-   declare parents: Point implements Cloneable;
-
-   public Object Point.clone() throws CloneNotSupportedException {
-      // we choose to bring all fields up to date before cloning.
-      makeRectangular();
-      makePolar();
-      return super.clone();
-   }
-
-   public static void main(String[] args){
-      Point p1 = new Point();
-      Point p2 = null;
-
-      p1.setPolar(Math.PI, 1.0);
-      try {
-         p2 = (Point)p1.clone();
-      } catch (CloneNotSupportedException e) {}
-      System.out.println("p1 =" + p1 );
-      System.out.println("p2 =" + p2 );
-
-      p1.rotate(Math.PI / -2);
-      System.out.println("p1 =" + p1 );
-      System.out.println("p2 =" + p2 );
-   }
-}
diff --git a/tests/incremental/model/introduction/introduction/CloneablePoint.java b/tests/incremental/model/introduction/introduction/CloneablePoint.java
deleted file mode 100644 (file)
index c345098..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-
-Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted.  Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
-
-*/
-package introduction;
-
-public aspect CloneablePoint {
-
-   declare parents: Point implements Cloneable;
-
-   public Object Point.clone() throws CloneNotSupportedException {
-      // we choose to bring all fields up to date before cloning.
-      makeRectangular();
-      makePolar();
-      return super.clone();
-   }
-
-   public static void main(String[] args){
-      Point p1 = new Point();
-      Point p2 = null;
-
-      p1.setPolar(Math.PI, 1.0);
-      try {
-         p2 = (Point)p1.clone();
-      } catch (CloneNotSupportedException e) {}
-      System.out.println("p1 =" + p1 );
-      System.out.println("p2 =" + p2 );
-
-      p1.rotate(Math.PI / -2);
-      System.out.println("p1 =" + p1 );
-      System.out.println("p2 =" + p2 );
-   }
-}
diff --git a/tests/incremental/model/introduction/introduction/ComparablePoint.java b/tests/incremental/model/introduction/introduction/ComparablePoint.java
deleted file mode 100644 (file)
index a2893db..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted.  Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
-*/
-
-package introduction;
-
-public aspect ComparablePoint {
-
-   declare parents: Point implements Comparable;
-
-   public int Point.compareTo(Object o) {
-      return (int) (this.getRho() - ((Point)o).getRho());
-   }
-
-   public static void main(String[] args){
-      Point p1 = new Point();
-      Point p2 = new Point();
-
-      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
-
-      p1.setRectangular(2,5);
-      p2.setRectangular(2,5);
-      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
-
-      p2.setRectangular(3,6);
-      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
-
-      p1.setPolar(Math.PI, 4);
-      p2.setPolar(Math.PI, 4);
-      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
-
-      p1.rotate(Math.PI / 4.0);
-      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
-
-      p1.offset(1,1);
-      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
-   }
-}
diff --git a/tests/incremental/model/introduction/introduction/HashablePoint.30.java b/tests/incremental/model/introduction/introduction/HashablePoint.30.java
deleted file mode 100644 (file)
index 39eb33b..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted.  Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
-*/
-
-package introduction;
-
-import java.util.Hashtable;
-
-public aspect HashablePoint {
-
-   public int Point.hashCode() {
-      return (int) (getX() + getY() % Integer.MAX_VALUE);
-   }
-
-   public boolean Point.equals(Object o) {
-      if (o == this) { return true; }
-      if (!(o instanceof Point)) { return false; }
-      Point other = (Point)o;
-      return (getX() == other.getX()) && (getY() == other.getY());
-   }
-
-   public static void main(String[] args) {
-      Hashtable h = new Hashtable();
-      Point p1 = new Point();
-
-      p1.setRectangular(10, 10);
-      Point p2 = new Point();
-
-      p2.setRectangular(10, 10);
-
-      System.out.println("p1 = " + p1);
-      System.out.println("p2 = " + p2);
-      System.out.println("p1.hashCode() = " + p1.hashCode());
-      System.out.println("p2.hashCode() = " + p2.hashCode());
-
-      h.put(p1, "P1");
-      System.out.println("Got: " + h.get(p2));
-   }
-}
diff --git a/tests/incremental/model/introduction/introduction/HashablePoint.java b/tests/incremental/model/introduction/introduction/HashablePoint.java
deleted file mode 100644 (file)
index 39eb33b..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-Use and copying of this software and preparation of derivative works based
-upon this software are permitted.  Any distribution of this software or
-derivative works must comply with all applicable United States export control
-laws.
-
-This software is made available AS IS, and Xerox Corporation makes no warranty
-about the software, its performance or its conformity to any specification.
-*/
-
-package introduction;
-
-import java.util.Hashtable;
-
-public aspect HashablePoint {
-
-   public int Point.hashCode() {
-      return (int) (getX() + getY() % Integer.MAX_VALUE);
-   }
-
-   public boolean Point.equals(Object o) {
-      if (o == this) { return true; }
-      if (!(o instanceof Point)) { return false; }
-      Point other = (Point)o;
-      return (getX() == other.getX()) && (getY() == other.getY());
-   }
-
-   public static void main(String[] args) {
-      Hashtable h = new Hashtable();
-      Point p1 = new Point();
-
-      p1.setRectangular(10, 10);
-      Point p2 = new Point();
-
-      p2.setRectangular(10, 10);
-
-      System.out.println("p1 = " + p1);
-      System.out.println("p2 = " + p2);
-      System.out.println("p1.hashCode() = " + p1.hashCode());
-      System.out.println("p2.hashCode() = " + p2.hashCode());
-
-      h.put(p1, "P1");
-      System.out.println("Got: " + h.get(p2));
-   }
-}
diff --git a/tests/incremental/model/introduction/introduction/Point.30.java b/tests/incremental/model/introduction/introduction/Point.30.java
deleted file mode 100644 (file)
index 609a048..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-  Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-  Use and copying of this software and preparation of derivative works based
-  upon this software are permitted.  Any distribution of this software or
-  derivative works must comply with all applicable United States export control
-  laws.
-
-  This software is made available AS IS, and Xerox Corporation makes no warranty
-  about the software, its performance or its conformity to any specification.
-*/
-
-package introduction;
-
-public class Point {
-
-   protected double x = 0;
-   protected double y = 0;
-   protected double theta = 0;
-   protected double rho = 0;
-
-   protected boolean polar = true;
-   protected boolean rectangular = true;
-
-   public double getX(){
-      makeRectangular();
-      return x;
-   }
-
-   public double getY(){
-      makeRectangular();
-      return y;
-   }
-
-   public double getTheta(){
-      makePolar();
-      return theta;
-   }
-
-   public double getRho(){
-      makePolar();
-      return rho;
-   }
-
-   public void setRectangular(double newX, double newY){
-      x = newX;
-      y = newY;
-      rectangular = true;
-      polar = false;
-   }
-
-   public void setPolar(double newTheta, double newRho){
-      theta = newTheta;
-      rho = newRho;
-      rectangular = false;
-      polar = true;
-   }
-
-   public void rotate(double angle){
-      setPolar(theta + angle, rho);
-   }
-
-   public void offset(double deltaX, double deltaY){
-      setRectangular(x + deltaX, y + deltaY);
-   }
-
-   protected void makePolar(){
-      if (!polar){
-        theta = Math.atan2(y,x);
-        rho = y / Math.sin(theta);
-        polar = true;
-      }
-   }
-
-   protected void makeRectangular(){
-      if (!rectangular) {
-        x = rho * Math.sin(theta);
-        y = rho * Math.cos(theta);
-        rectangular = true;
-      }
-   }
-
-   public String toString(){
-      return "(" + getX() + ", " + getY() + ")[" 
-        + getTheta() + " : " + getRho() + "]";
-   }
-
-   public static void main(String[] args){
-      Point p1 = new Point();
-      System.out.println("p1 =" + p1);
-      p1.setRectangular(5,2);
-      System.out.println("p1 =" + p1);
-      p1.setPolar( Math.PI / 4.0 , 1.0);
-      System.out.println("p1 =" + p1);
-      p1.setPolar( 0.3805 , 5.385);
-      System.out.println("p1 =" + p1);
-   }
-}
diff --git a/tests/incremental/model/introduction/introduction/Point.java b/tests/incremental/model/introduction/introduction/Point.java
deleted file mode 100644 (file)
index 609a048..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-  Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
-
-  Use and copying of this software and preparation of derivative works based
-  upon this software are permitted.  Any distribution of this software or
-  derivative works must comply with all applicable United States export control
-  laws.
-
-  This software is made available AS IS, and Xerox Corporation makes no warranty
-  about the software, its performance or its conformity to any specification.
-*/
-
-package introduction;
-
-public class Point {
-
-   protected double x = 0;
-   protected double y = 0;
-   protected double theta = 0;
-   protected double rho = 0;
-
-   protected boolean polar = true;
-   protected boolean rectangular = true;
-
-   public double getX(){
-      makeRectangular();
-      return x;
-   }
-
-   public double getY(){
-      makeRectangular();
-      return y;
-   }
-
-   public double getTheta(){
-      makePolar();
-      return theta;
-   }
-
-   public double getRho(){
-      makePolar();
-      return rho;
-   }
-
-   public void setRectangular(double newX, double newY){
-      x = newX;
-      y = newY;
-      rectangular = true;
-      polar = false;
-   }
-
-   public void setPolar(double newTheta, double newRho){
-      theta = newTheta;
-      rho = newRho;
-      rectangular = false;
-      polar = true;
-   }
-
-   public void rotate(double angle){
-      setPolar(theta + angle, rho);
-   }
-
-   public void offset(double deltaX, double deltaY){
-      setRectangular(x + deltaX, y + deltaY);
-   }
-
-   protected void makePolar(){
-      if (!polar){
-        theta = Math.atan2(y,x);
-        rho = y / Math.sin(theta);
-        polar = true;
-      }
-   }
-
-   protected void makeRectangular(){
-      if (!rectangular) {
-        x = rho * Math.sin(theta);
-        y = rho * Math.cos(theta);
-        rectangular = true;
-      }
-   }
-
-   public String toString(){
-      return "(" + getX() + ", " + getY() + ")[" 
-        + getTheta() + " : " + getRho() + "]";
-   }
-
-   public static void main(String[] args){
-      Point p1 = new Point();
-      System.out.println("p1 =" + p1);
-      p1.setRectangular(5,2);
-      System.out.println("p1 =" + p1);
-      p1.setPolar( Math.PI / 4.0 , 1.0);
-      System.out.println("p1 =" + p1);
-      p1.setPolar( 0.3805 , 5.385);
-      System.out.println("p1 =" + p1);
-   }
-}
diff --git a/tests/incremental/model/introduction/src/introduction/CloneablePoint.java b/tests/incremental/model/introduction/src/introduction/CloneablePoint.java
new file mode 100644 (file)
index 0000000..c345098
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+
+Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+Use and copying of this software and preparation of derivative works based
+upon this software are permitted.  Any distribution of this software or
+derivative works must comply with all applicable United States export control
+laws.
+
+This software is made available AS IS, and Xerox Corporation makes no warranty
+about the software, its performance or its conformity to any specification.
+
+*/
+package introduction;
+
+public aspect CloneablePoint {
+
+   declare parents: Point implements Cloneable;
+
+   public Object Point.clone() throws CloneNotSupportedException {
+      // we choose to bring all fields up to date before cloning.
+      makeRectangular();
+      makePolar();
+      return super.clone();
+   }
+
+   public static void main(String[] args){
+      Point p1 = new Point();
+      Point p2 = null;
+
+      p1.setPolar(Math.PI, 1.0);
+      try {
+         p2 = (Point)p1.clone();
+      } catch (CloneNotSupportedException e) {}
+      System.out.println("p1 =" + p1 );
+      System.out.println("p2 =" + p2 );
+
+      p1.rotate(Math.PI / -2);
+      System.out.println("p1 =" + p1 );
+      System.out.println("p2 =" + p2 );
+   }
+}
diff --git a/tests/incremental/model/introduction/src/introduction/ComparablePoint.java b/tests/incremental/model/introduction/src/introduction/ComparablePoint.java
new file mode 100644 (file)
index 0000000..a2893db
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+Use and copying of this software and preparation of derivative works based
+upon this software are permitted.  Any distribution of this software or
+derivative works must comply with all applicable United States export control
+laws.
+
+This software is made available AS IS, and Xerox Corporation makes no warranty
+about the software, its performance or its conformity to any specification.
+*/
+
+package introduction;
+
+public aspect ComparablePoint {
+
+   declare parents: Point implements Comparable;
+
+   public int Point.compareTo(Object o) {
+      return (int) (this.getRho() - ((Point)o).getRho());
+   }
+
+   public static void main(String[] args){
+      Point p1 = new Point();
+      Point p2 = new Point();
+
+      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
+
+      p1.setRectangular(2,5);
+      p2.setRectangular(2,5);
+      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
+
+      p2.setRectangular(3,6);
+      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
+
+      p1.setPolar(Math.PI, 4);
+      p2.setPolar(Math.PI, 4);
+      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
+
+      p1.rotate(Math.PI / 4.0);
+      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
+
+      p1.offset(1,1);
+      System.out.println("p1 =?= p2 :" + p1.compareTo(p2));
+   }
+}
diff --git a/tests/incremental/model/introduction/src/introduction/HashablePoint.java b/tests/incremental/model/introduction/src/introduction/HashablePoint.java
new file mode 100644 (file)
index 0000000..39eb33b
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+Use and copying of this software and preparation of derivative works based
+upon this software are permitted.  Any distribution of this software or
+derivative works must comply with all applicable United States export control
+laws.
+
+This software is made available AS IS, and Xerox Corporation makes no warranty
+about the software, its performance or its conformity to any specification.
+*/
+
+package introduction;
+
+import java.util.Hashtable;
+
+public aspect HashablePoint {
+
+   public int Point.hashCode() {
+      return (int) (getX() + getY() % Integer.MAX_VALUE);
+   }
+
+   public boolean Point.equals(Object o) {
+      if (o == this) { return true; }
+      if (!(o instanceof Point)) { return false; }
+      Point other = (Point)o;
+      return (getX() == other.getX()) && (getY() == other.getY());
+   }
+
+   public static void main(String[] args) {
+      Hashtable h = new Hashtable();
+      Point p1 = new Point();
+
+      p1.setRectangular(10, 10);
+      Point p2 = new Point();
+
+      p2.setRectangular(10, 10);
+
+      System.out.println("p1 = " + p1);
+      System.out.println("p2 = " + p2);
+      System.out.println("p1.hashCode() = " + p1.hashCode());
+      System.out.println("p2.hashCode() = " + p2.hashCode());
+
+      h.put(p1, "P1");
+      System.out.println("Got: " + h.get(p2));
+   }
+}
diff --git a/tests/incremental/model/introduction/src/introduction/Point.java b/tests/incremental/model/introduction/src/introduction/Point.java
new file mode 100644 (file)
index 0000000..609a048
--- /dev/null
@@ -0,0 +1,98 @@
+/*
+  Copyright (c) Xerox Corporation 1998-2002.  All rights reserved.
+
+  Use and copying of this software and preparation of derivative works based
+  upon this software are permitted.  Any distribution of this software or
+  derivative works must comply with all applicable United States export control
+  laws.
+
+  This software is made available AS IS, and Xerox Corporation makes no warranty
+  about the software, its performance or its conformity to any specification.
+*/
+
+package introduction;
+
+public class Point {
+
+   protected double x = 0;
+   protected double y = 0;
+   protected double theta = 0;
+   protected double rho = 0;
+
+   protected boolean polar = true;
+   protected boolean rectangular = true;
+
+   public double getX(){
+      makeRectangular();
+      return x;
+   }
+
+   public double getY(){
+      makeRectangular();
+      return y;
+   }
+
+   public double getTheta(){
+      makePolar();
+      return theta;
+   }
+
+   public double getRho(){
+      makePolar();
+      return rho;
+   }
+
+   public void setRectangular(double newX, double newY){
+      x = newX;
+      y = newY;
+      rectangular = true;
+      polar = false;
+   }
+
+   public void setPolar(double newTheta, double newRho){
+      theta = newTheta;
+      rho = newRho;
+      rectangular = false;
+      polar = true;
+   }
+
+   public void rotate(double angle){
+      setPolar(theta + angle, rho);
+   }
+
+   public void offset(double deltaX, double deltaY){
+      setRectangular(x + deltaX, y + deltaY);
+   }
+
+   protected void makePolar(){
+      if (!polar){
+        theta = Math.atan2(y,x);
+        rho = y / Math.sin(theta);
+        polar = true;
+      }
+   }
+
+   protected void makeRectangular(){
+      if (!rectangular) {
+        x = rho * Math.sin(theta);
+        y = rho * Math.cos(theta);
+        rectangular = true;
+      }
+   }
+
+   public String toString(){
+      return "(" + getX() + ", " + getY() + ")[" 
+        + getTheta() + " : " + getRho() + "]";
+   }
+
+   public static void main(String[] args){
+      Point p1 = new Point();
+      System.out.println("p1 =" + p1);
+      p1.setRectangular(5,2);
+      System.out.println("p1 =" + p1);
+      p1.setPolar( Math.PI / 4.0 , 1.0);
+      System.out.println("p1 =" + p1);
+      p1.setPolar( 0.3805 , 5.385);
+      System.out.println("p1 =" + p1);
+   }
+}
diff --git a/tests/incremental/model/sourcefiles_addremove/changes/primary/Beta.20.java b/tests/incremental/model/sourcefiles_addremove/changes/primary/Beta.20.java
new file mode 100644 (file)
index 0000000..1ef401c
--- /dev/null
@@ -0,0 +1,11 @@
+package primary;
+
+public class Beta {
+  public static void main(String[] argv) {
+    sayhi();
+  }
+
+  public static void sayhi() {
+    System.err.println("Hi");
+  }
+}
diff --git a/tests/incremental/model/sourcefiles_addremove/changes/primary/Beta.delete.60.java b/tests/incremental/model/sourcefiles_addremove/changes/primary/Beta.delete.60.java
new file mode 100644 (file)
index 0000000..1ef401c
--- /dev/null
@@ -0,0 +1,11 @@
+package primary;
+
+public class Beta {
+  public static void main(String[] argv) {
+    sayhi();
+  }
+
+  public static void sayhi() {
+    System.err.println("Hi");
+  }
+}
diff --git a/tests/incremental/model/sourcefiles_addremove/changes/secondary/Delta.40.java b/tests/incremental/model/sourcefiles_addremove/changes/secondary/Delta.40.java
new file mode 100644 (file)
index 0000000..ed410ed
--- /dev/null
@@ -0,0 +1,5 @@
+package secondary;
+
+public class Delta {
+  public static void foo() {  }
+}
diff --git a/tests/incremental/model/sourcefiles_addremove/changes/secondary/Delta.delete.60.java b/tests/incremental/model/sourcefiles_addremove/changes/secondary/Delta.delete.60.java
new file mode 100644 (file)
index 0000000..ed410ed
--- /dev/null
@@ -0,0 +1,5 @@
+package secondary;
+
+public class Delta {
+  public static void foo() {  }
+}
diff --git a/tests/incremental/model/sourcefiles_addremove/changes/secondary/Gamma.30.java b/tests/incremental/model/sourcefiles_addremove/changes/secondary/Gamma.30.java
new file mode 100644 (file)
index 0000000..edbe716
--- /dev/null
@@ -0,0 +1,7 @@
+package secondary;
+
+aspect Gamma {
+  before(): call(* *(..)) {
+  }
+}
+
diff --git a/tests/incremental/model/sourcefiles_addremove/changes/secondary/Gamma.delete.50.java b/tests/incremental/model/sourcefiles_addremove/changes/secondary/Gamma.delete.50.java
new file mode 100644 (file)
index 0000000..edbe716
--- /dev/null
@@ -0,0 +1,7 @@
+package secondary;
+
+aspect Gamma {
+  before(): call(* *(..)) {
+  }
+}
+
diff --git a/tests/incremental/model/sourcefiles_addremove/primary/Alpha.java b/tests/incremental/model/sourcefiles_addremove/primary/Alpha.java
deleted file mode 100644 (file)
index 5e60f4f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-package primary;
-
-public class Alpha {
-    public static void main (String[] args) {
-    }
-}
diff --git a/tests/incremental/model/sourcefiles_addremove/primary/Beta.20.java b/tests/incremental/model/sourcefiles_addremove/primary/Beta.20.java
deleted file mode 100644 (file)
index 1ef401c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-package primary;
-
-public class Beta {
-  public static void main(String[] argv) {
-    sayhi();
-  }
-
-  public static void sayhi() {
-    System.err.println("Hi");
-  }
-}
diff --git a/tests/incremental/model/sourcefiles_addremove/primary/Beta.delete.60.java b/tests/incremental/model/sourcefiles_addremove/primary/Beta.delete.60.java
deleted file mode 100644 (file)
index 1ef401c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-package primary;
-
-public class Beta {
-  public static void main(String[] argv) {
-    sayhi();
-  }
-
-  public static void sayhi() {
-    System.err.println("Hi");
-  }
-}
diff --git a/tests/incremental/model/sourcefiles_addremove/secondary/Delta.40.java b/tests/incremental/model/sourcefiles_addremove/secondary/Delta.40.java
deleted file mode 100644 (file)
index ed410ed..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-package secondary;
-
-public class Delta {
-  public static void foo() {  }
-}
diff --git a/tests/incremental/model/sourcefiles_addremove/secondary/Delta.delete.60.java b/tests/incremental/model/sourcefiles_addremove/secondary/Delta.delete.60.java
deleted file mode 100644 (file)
index ed410ed..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-package secondary;
-
-public class Delta {
-  public static void foo() {  }
-}
diff --git a/tests/incremental/model/sourcefiles_addremove/secondary/Gamma.30.java b/tests/incremental/model/sourcefiles_addremove/secondary/Gamma.30.java
deleted file mode 100644 (file)
index edbe716..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package secondary;
-
-aspect Gamma {
-  before(): call(* *(..)) {
-  }
-}
-
diff --git a/tests/incremental/model/sourcefiles_addremove/secondary/Gamma.delete.50.java b/tests/incremental/model/sourcefiles_addremove/secondary/Gamma.delete.50.java
deleted file mode 100644 (file)
index edbe716..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package secondary;
-
-aspect Gamma {
-  before(): call(* *(..)) {
-  }
-}
-
diff --git a/tests/incremental/model/sourcefiles_addremove/src/primary/Alpha.java b/tests/incremental/model/sourcefiles_addremove/src/primary/Alpha.java
new file mode 100644 (file)
index 0000000..5e60f4f
--- /dev/null
@@ -0,0 +1,7 @@
+
+package primary;
+
+public class Alpha {
+    public static void main (String[] args) {
+    }
+}
diff --git a/tests/incremental/model/sourcefiles_updating/changes/primary/Beta.20.java b/tests/incremental/model/sourcefiles_updating/changes/primary/Beta.20.java
new file mode 100644 (file)
index 0000000..4efd977
--- /dev/null
@@ -0,0 +1,13 @@
+package primary;
+
+// Method added beyond what was in Beta.java
+
+public class Beta {
+  public static void main(String[] argv) {
+    sayhi();
+  }
+
+  public static void sayhi() {
+    System.err.println("Hi");
+  }
+}
diff --git a/tests/incremental/model/sourcefiles_updating/changes/secondary/Delta.30.java b/tests/incremental/model/sourcefiles_updating/changes/secondary/Delta.30.java
new file mode 100644 (file)
index 0000000..f54b3f7
--- /dev/null
@@ -0,0 +1,10 @@
+package secondary;
+
+// Extra class added over Delta.java
+
+public class Delta {
+  public static void foo() {  }
+}
+
+class DeltaExtra {
+}
diff --git a/tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.40.java b/tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.40.java
new file mode 100644 (file)
index 0000000..7e508af
--- /dev/null
@@ -0,0 +1,10 @@
+package secondary;
+
+aspect Gamma {
+  before(): call(* *(..)) {
+  }
+
+  after(): call(* *(..)) {
+  }
+}
+
diff --git a/tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.50.java b/tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.50.java
new file mode 100644 (file)
index 0000000..a380f86
--- /dev/null
@@ -0,0 +1,13 @@
+package secondary;
+
+aspect Gamma {
+
+  pointcut calls(): call(* *(..));
+
+  before(): calls() {
+  }
+
+  after(): calls() {
+  }
+}
+
diff --git a/tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.60.java b/tests/incremental/model/sourcefiles_updating/changes/secondary/Gamma.60.java
new file mode 100644 (file)
index 0000000..de4cf6d
--- /dev/null
@@ -0,0 +1,8 @@
+package secondary;
+
+aspect Gamma {
+
+  pointcut calls(): call(* *(..));
+
+}
+
diff --git a/tests/incremental/model/sourcefiles_updating/primary/Alpha.java b/tests/incremental/model/sourcefiles_updating/primary/Alpha.java
deleted file mode 100644 (file)
index 5e60f4f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-package primary;
-
-public class Alpha {
-    public static void main (String[] args) {
-    }
-}
diff --git a/tests/incremental/model/sourcefiles_updating/primary/Beta.20.java b/tests/incremental/model/sourcefiles_updating/primary/Beta.20.java
deleted file mode 100644 (file)
index 4efd977..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package primary;
-
-// Method added beyond what was in Beta.java
-
-public class Beta {
-  public static void main(String[] argv) {
-    sayhi();
-  }
-
-  public static void sayhi() {
-    System.err.println("Hi");
-  }
-}
diff --git a/tests/incremental/model/sourcefiles_updating/primary/Beta.java b/tests/incremental/model/sourcefiles_updating/primary/Beta.java
deleted file mode 100644 (file)
index 86dc7df..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package primary;
-
-public class Beta {
-  public static void main(String[] argv) {
-  }
-
-}
diff --git a/tests/incremental/model/sourcefiles_updating/secondary/Delta.30.java b/tests/incremental/model/sourcefiles_updating/secondary/Delta.30.java
deleted file mode 100644 (file)
index f54b3f7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-package secondary;
-
-// Extra class added over Delta.java
-
-public class Delta {
-  public static void foo() {  }
-}
-
-class DeltaExtra {
-}
diff --git a/tests/incremental/model/sourcefiles_updating/secondary/Delta.java b/tests/incremental/model/sourcefiles_updating/secondary/Delta.java
deleted file mode 100644 (file)
index ed410ed..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-package secondary;
-
-public class Delta {
-  public static void foo() {  }
-}
diff --git a/tests/incremental/model/sourcefiles_updating/secondary/Gamma.40.java b/tests/incremental/model/sourcefiles_updating/secondary/Gamma.40.java
deleted file mode 100644 (file)
index 7e508af..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-package secondary;
-
-aspect Gamma {
-  before(): call(* *(..)) {
-  }
-
-  after(): call(* *(..)) {
-  }
-}
-
diff --git a/tests/incremental/model/sourcefiles_updating/secondary/Gamma.50.java b/tests/incremental/model/sourcefiles_updating/secondary/Gamma.50.java
deleted file mode 100644 (file)
index a380f86..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-package secondary;
-
-aspect Gamma {
-
-  pointcut calls(): call(* *(..));
-
-  before(): calls() {
-  }
-
-  after(): calls() {
-  }
-}
-
diff --git a/tests/incremental/model/sourcefiles_updating/secondary/Gamma.60.java b/tests/incremental/model/sourcefiles_updating/secondary/Gamma.60.java
deleted file mode 100644 (file)
index de4cf6d..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package secondary;
-
-aspect Gamma {
-
-  pointcut calls(): call(* *(..));
-
-}
-
diff --git a/tests/incremental/model/sourcefiles_updating/secondary/Gamma.java b/tests/incremental/model/sourcefiles_updating/secondary/Gamma.java
deleted file mode 100644 (file)
index edbe716..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-package secondary;
-
-aspect Gamma {
-  before(): call(* *(..)) {
-  }
-}
-
diff --git a/tests/incremental/model/sourcefiles_updating/src/primary/Alpha.java b/tests/incremental/model/sourcefiles_updating/src/primary/Alpha.java
new file mode 100644 (file)
index 0000000..5e60f4f
--- /dev/null
@@ -0,0 +1,7 @@
+
+package primary;
+
+public class Alpha {
+    public static void main (String[] args) {
+    }
+}
diff --git a/tests/incremental/model/sourcefiles_updating/src/primary/Beta.java b/tests/incremental/model/sourcefiles_updating/src/primary/Beta.java
new file mode 100644 (file)
index 0000000..86dc7df
--- /dev/null
@@ -0,0 +1,7 @@
+package primary;
+
+public class Beta {
+  public static void main(String[] argv) {
+  }
+
+}
diff --git a/tests/incremental/model/sourcefiles_updating/src/secondary/Delta.java b/tests/incremental/model/sourcefiles_updating/src/secondary/Delta.java
new file mode 100644 (file)
index 0000000..ed410ed
--- /dev/null
@@ -0,0 +1,5 @@
+package secondary;
+
+public class Delta {
+  public static void foo() {  }
+}
diff --git a/tests/incremental/model/sourcefiles_updating/src/secondary/Gamma.java b/tests/incremental/model/sourcefiles_updating/src/secondary/Gamma.java
new file mode 100644 (file)
index 0000000..edbe716
--- /dev/null
@@ -0,0 +1,7 @@
+package secondary;
+
+aspect Gamma {
+  before(): call(* *(..)) {
+  }
+}
+
diff --git a/tests/incremental/model/weaving/changes/primary/BetaA.20.java b/tests/incremental/model/weaving/changes/primary/BetaA.20.java
new file mode 100644 (file)
index 0000000..74ff748
--- /dev/null
@@ -0,0 +1,16 @@
+package primary;
+
+public aspect BetaA {
+
+  pointcut m1call(): call(* m1(..));
+
+  before(): m1call() {
+    System.err.println("m1 got called");
+  }
+
+  pointcut m2call(): call(* m2(..));
+
+  before(): m2call() {
+    System.err.println("m2 got called");
+  }
+}
diff --git a/tests/incremental/model/weaving/changes/primary/BetaA.30.java b/tests/incremental/model/weaving/changes/primary/BetaA.30.java
new file mode 100644 (file)
index 0000000..eeba653
--- /dev/null
@@ -0,0 +1,10 @@
+package primary;
+
+public aspect BetaA {
+
+  pointcut m2call(): call(* m2(..));
+
+  before(): m2call() {
+    System.err.println("m2 got called");
+  }
+}
diff --git a/tests/incremental/model/weaving/changes/primary/BetaA.40.java b/tests/incremental/model/weaving/changes/primary/BetaA.40.java
new file mode 100644 (file)
index 0000000..706cebb
--- /dev/null
@@ -0,0 +1,5 @@
+package primary;
+
+public aspect BetaA {
+
+}
diff --git a/tests/incremental/model/weaving/primary/Alpha.java b/tests/incremental/model/weaving/primary/Alpha.java
deleted file mode 100644 (file)
index e51f9f9..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-package primary;
-
-public class Alpha {
-  public static void main(String[] argv) {
-    Alpha instance = new Alpha();
-    instance.m1();
-    instance.m2();
-    instance.m3();
-  }
-
-  public void m1() {
-  }
-
-  public boolean m2() {
-    return false;
-  }
-
-  public String m3() {
-    return "";
-  }
-}
diff --git a/tests/incremental/model/weaving/primary/BetaA.20.java b/tests/incremental/model/weaving/primary/BetaA.20.java
deleted file mode 100644 (file)
index 74ff748..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-package primary;
-
-public aspect BetaA {
-
-  pointcut m1call(): call(* m1(..));
-
-  before(): m1call() {
-    System.err.println("m1 got called");
-  }
-
-  pointcut m2call(): call(* m2(..));
-
-  before(): m2call() {
-    System.err.println("m2 got called");
-  }
-}
diff --git a/tests/incremental/model/weaving/primary/BetaA.30.java b/tests/incremental/model/weaving/primary/BetaA.30.java
deleted file mode 100644 (file)
index eeba653..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-package primary;
-
-public aspect BetaA {
-
-  pointcut m2call(): call(* m2(..));
-
-  before(): m2call() {
-    System.err.println("m2 got called");
-  }
-}
diff --git a/tests/incremental/model/weaving/primary/BetaA.40.java b/tests/incremental/model/weaving/primary/BetaA.40.java
deleted file mode 100644 (file)
index 706cebb..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-package primary;
-
-public aspect BetaA {
-
-}
diff --git a/tests/incremental/model/weaving/primary/BetaA.java b/tests/incremental/model/weaving/primary/BetaA.java
deleted file mode 100644 (file)
index 333c5f1..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-package primary;
-
-public aspect BetaA {
-
-  pointcut m1call(): call(* m1(..));
-
-  before(): m1call() {
-    System.err.println("m1 got called");
-  }
-}
diff --git a/tests/incremental/model/weaving/src/primary/Alpha.java b/tests/incremental/model/weaving/src/primary/Alpha.java
new file mode 100644 (file)
index 0000000..e51f9f9
--- /dev/null
@@ -0,0 +1,21 @@
+package primary;
+
+public class Alpha {
+  public static void main(String[] argv) {
+    Alpha instance = new Alpha();
+    instance.m1();
+    instance.m2();
+    instance.m3();
+  }
+
+  public void m1() {
+  }
+
+  public boolean m2() {
+    return false;
+  }
+
+  public String m3() {
+    return "";
+  }
+}
diff --git a/tests/incremental/model/weaving/src/primary/BetaA.java b/tests/incremental/model/weaving/src/primary/BetaA.java
new file mode 100644 (file)
index 0000000..333c5f1
--- /dev/null
@@ -0,0 +1,10 @@
+package primary;
+
+public aspect BetaA {
+
+  pointcut m1call(): call(* m1(..));
+
+  before(): m1call() {
+    System.err.println("m1 got called");
+  }
+}
diff --git a/tests/incremental/model/weaving2/changes/primary/BetaA.20.java b/tests/incremental/model/weaving2/changes/primary/BetaA.20.java
new file mode 100644 (file)
index 0000000..1c73c6b
--- /dev/null
@@ -0,0 +1,8 @@
+package primary;
+
+public aspect BetaA {
+  pointcut handlers(): handler(Throwable);
+  before(): handlers() {
+    System.err.println("xxx");
+  }
+}
diff --git a/tests/incremental/model/weaving2/changes/primary/BetaA.delete.40.java b/tests/incremental/model/weaving2/changes/primary/BetaA.delete.40.java
new file mode 100644 (file)
index 0000000..1c73c6b
--- /dev/null
@@ -0,0 +1,8 @@
+package primary;
+
+public aspect BetaA {
+  pointcut handlers(): handler(Throwable);
+  before(): handlers() {
+    System.err.println("xxx");
+  }
+}
diff --git a/tests/incremental/model/weaving2/changes/secondary/GammaA.30.java b/tests/incremental/model/weaving2/changes/secondary/GammaA.30.java
new file mode 100644 (file)
index 0000000..be2bec7
--- /dev/null
@@ -0,0 +1,8 @@
+package primary;
+
+public aspect GammaA {
+  pointcut handlers(): handler(Throwable);
+  before(): handlers() {
+    System.err.println("xxx");
+  }
+}
diff --git a/tests/incremental/model/weaving2/primary/Alpha.java b/tests/incremental/model/weaving2/primary/Alpha.java
deleted file mode 100644 (file)
index ab7e82c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-package primary;
-
-public class Alpha {
-  public static void main(String[]argv) {
-    try {
-      System.err.println("aaa");
-    } catch (Throwable t) {
-      System.err.println("Caught:"+t);
-    }
-  }
-}
diff --git a/tests/incremental/model/weaving2/primary/BetaA.20.java b/tests/incremental/model/weaving2/primary/BetaA.20.java
deleted file mode 100644 (file)
index 1c73c6b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package primary;
-
-public aspect BetaA {
-  pointcut handlers(): handler(Throwable);
-  before(): handlers() {
-    System.err.println("xxx");
-  }
-}
diff --git a/tests/incremental/model/weaving2/primary/BetaA.delete.40.java b/tests/incremental/model/weaving2/primary/BetaA.delete.40.java
deleted file mode 100644 (file)
index 1c73c6b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package primary;
-
-public aspect BetaA {
-  pointcut handlers(): handler(Throwable);
-  before(): handlers() {
-    System.err.println("xxx");
-  }
-}
diff --git a/tests/incremental/model/weaving2/primary/BetaA.java b/tests/incremental/model/weaving2/primary/BetaA.java
deleted file mode 100644 (file)
index 1b8b1d7..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-package primary;
-
-public aspect BetaA {
-}
diff --git a/tests/incremental/model/weaving2/secondary/GammaA.30.java b/tests/incremental/model/weaving2/secondary/GammaA.30.java
deleted file mode 100644 (file)
index be2bec7..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-package primary;
-
-public aspect GammaA {
-  pointcut handlers(): handler(Throwable);
-  before(): handlers() {
-    System.err.println("xxx");
-  }
-}
diff --git a/tests/incremental/model/weaving2/src/primary/Alpha.java b/tests/incremental/model/weaving2/src/primary/Alpha.java
new file mode 100644 (file)
index 0000000..ab7e82c
--- /dev/null
@@ -0,0 +1,11 @@
+package primary;
+
+public class Alpha {
+  public static void main(String[]argv) {
+    try {
+      System.err.println("aaa");
+    } catch (Throwable t) {
+      System.err.println("Caught:"+t);
+    }
+  }
+}
diff --git a/tests/incremental/model/weaving2/src/primary/BetaA.java b/tests/incremental/model/weaving2/src/primary/BetaA.java
new file mode 100644 (file)
index 0000000..1b8b1d7
--- /dev/null
@@ -0,0 +1,4 @@
+package primary;
+
+public aspect BetaA {
+}