1.1 --- a/samples/visitor/02-abstractclass/src-test/org/apidesign/test/visitor/LanguageCheckTest.java Sat Jun 14 22:38:00 2008 +0200
1.2 +++ b/samples/visitor/02-abstractclass/src-test/org/apidesign/test/visitor/LanguageCheckTest.java Sat Jun 14 22:59:00 2008 +0200
1.3 @@ -10,7 +10,7 @@
1.4 public class LanguageCheckTest {
1.5
1.6 // BEGIN: visitor.language.check.exception
1.7 - private static class Valid1_0Language extends Visitor/*version1.0*/ {
1.8 + private static class Valid10Language extends Visitor/*version1.0*/ {
1.9 public void visitPlus(Plus s) {
1.10 s.getFirst().visit(this);
1.11 s.getSecond().visit(this);
1.12 @@ -19,8 +19,8 @@
1.13 }
1.14 }
1.15
1.16 - public static boolean isValid1_0Language(Expression expression) {
1.17 - Valid1_0Language valid = new Valid1_0Language();
1.18 + public static boolean isValid10Language(Expression expression) {
1.19 + Valid10Language valid = new Valid10Language();
1.20 try {
1.21 expression.visit(valid);
1.22 return true; // yes, no unknown elements
1.23 @@ -34,7 +34,7 @@
1.24 Number one = new Number(1);
1.25 Expression expression = new Plus(one, one);
1.26
1.27 - assertTrue("Valid language", isValid1_0Language(expression));
1.28 + assertTrue("Valid language", isValid10Language(expression));
1.29 }
1.30
1.31 @Test public void printOnePlusTwoPlusThree() {
1.32 @@ -43,6 +43,6 @@
1.33 Number three = new Number(3);
1.34 Expression plus = new Plus(one, new Plus(two, three));
1.35
1.36 - assertTrue("Valid language", isValid1_0Language(plus));
1.37 + assertTrue("Valid language", isValid10Language(plus));
1.38 }
1.39 }
2.1 --- a/samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/InvalidLanguageCheckTest.java Sat Jun 14 22:38:00 2008 +0200
2.2 +++ b/samples/visitor/02-abstractclass/src-test2.0/org/apidesign/test/visitor/InvalidLanguageCheckTest.java Sat Jun 14 22:59:00 2008 +0200
2.3 @@ -12,6 +12,6 @@
2.4 Number two = new Number(2);
2.5 Expression minus = new Minus(one, two);
2.6
2.7 - assertFalse("Recognized as invalid 1.0 version of the language", LanguageCheckTest.isValid1_0Language(minus));
2.8 + assertFalse("Recognized as invalid 1.0 version of the language", LanguageCheckTest.isValid10Language(minus));
2.9 }
2.10 }
3.1 --- a/samples/visitor/03-visitunknown/src-test/org/apidesign/test/visitor/LanguageCheckTest.java Sat Jun 14 22:38:00 2008 +0200
3.2 +++ b/samples/visitor/03-visitunknown/src-test/org/apidesign/test/visitor/LanguageCheckTest.java Sat Jun 14 22:59:00 2008 +0200
3.3 @@ -10,7 +10,7 @@
3.4 public class LanguageCheckTest {
3.5
3.6 // BEGIN: visitor.language.check.visitunknown
3.7 - private static class Valid1_0Language extends Visitor/*version1.0*/ {
3.8 + private static class Valid10Language extends Visitor/*version1.0*/ {
3.9 boolean invalid;
3.10
3.11 @Override
3.12 @@ -25,8 +25,8 @@
3.13 }
3.14 }
3.15
3.16 - public static boolean isValid1_0Language(Expression expression) {
3.17 - Valid1_0Language valid = new Valid1_0Language();
3.18 + public static boolean isValid10Language(Expression expression) {
3.19 + Valid10Language valid = new Valid10Language();
3.20 expression.visit(valid);
3.21 return !valid.invalid;
3.22 }
3.23 @@ -36,7 +36,7 @@
3.24 Number one = new Number(1);
3.25 Expression expression = new Plus(one, one);
3.26
3.27 - assertTrue("Valid language", isValid1_0Language(expression));
3.28 + assertTrue("Valid language", isValid10Language(expression));
3.29 }
3.30
3.31 @Test public void printOnePlusTwoPlusThree() {
3.32 @@ -45,6 +45,6 @@
3.33 Number three = new Number(3);
3.34 Expression plus = new Plus(one, new Plus(two, three));
3.35
3.36 - assertTrue("Valid language", isValid1_0Language(plus));
3.37 + assertTrue("Valid language", isValid10Language(plus));
3.38 }
3.39 }
4.1 --- a/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidLanguageCheckTest.java Sat Jun 14 22:38:00 2008 +0200
4.2 +++ b/samples/visitor/03-visitunknown/src-test2.0/org/apidesign/test/visitor/InvalidLanguageCheckTest.java Sat Jun 14 22:59:00 2008 +0200
4.3 @@ -12,6 +12,6 @@
4.4 Number two = new Number(2);
4.5 Expression minus = new Minus(one, two);
4.6
4.7 - assertFalse("Recognized as invalid 1.0 version of the language", LanguageCheckTest.isValid1_0Language(minus));
4.8 + assertFalse("Recognized as invalid 1.0 version of the language", LanguageCheckTest.isValid10Language(minus));
4.9 }
4.10 }
5.1 --- a/samples/visitor/04-traversal/src-test/org/apidesign/test/visitor/LanguageCheckTest.java Sat Jun 14 22:38:00 2008 +0200
5.2 +++ b/samples/visitor/04-traversal/src-test/org/apidesign/test/visitor/LanguageCheckTest.java Sat Jun 14 22:59:00 2008 +0200
5.3 @@ -9,7 +9,7 @@
5.4
5.5 public class LanguageCheckTest {
5.6
5.7 - private static class Valid1_0Language extends Visitor/*version1.0*/ {
5.8 + private static class Valid10Language extends Visitor/*version1.0*/ {
5.9 boolean invalid;
5.10
5.11 @Override
5.12 @@ -25,8 +25,8 @@
5.13 }
5.14 }
5.15
5.16 - public static boolean isValid1_0Language(Expression expression) {
5.17 - Valid1_0Language valid = new Valid1_0Language();
5.18 + public static boolean isValid10Language(Expression expression) {
5.19 + Valid10Language valid = new Valid10Language();
5.20 expression.visit(valid);
5.21 return !valid.invalid;
5.22 }
5.23 @@ -35,7 +35,7 @@
5.24 Number one = new Number(1);
5.25 Expression expression = new Plus(one, one);
5.26
5.27 - assertTrue("Valid language", isValid1_0Language(expression));
5.28 + assertTrue("Valid language", isValid10Language(expression));
5.29 }
5.30
5.31 @Test public void printOnePlusTwoPlusThree() {
5.32 @@ -44,6 +44,6 @@
5.33 Number three = new Number(3);
5.34 Expression plus = new Plus(one, new Plus(two, three));
5.35
5.36 - assertTrue("Valid language", isValid1_0Language(plus));
5.37 + assertTrue("Valid language", isValid10Language(plus));
5.38 }
5.39 }
6.1 --- a/samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/InvalidLanguageCheckTest.java Sat Jun 14 22:38:00 2008 +0200
6.2 +++ b/samples/visitor/04-traversal/src-test2.0/org/apidesign/test/visitor/InvalidLanguageCheckTest.java Sat Jun 14 22:59:00 2008 +0200
6.3 @@ -12,6 +12,6 @@
6.4 Number two = new Number(2);
6.5 Expression minus = new Minus(one, two);
6.6
6.7 - assertFalse("Recognized as invalid 1.0 version of the language", LanguageCheckTest.isValid1_0Language(minus));
6.8 + assertFalse("Recognized as invalid 1.0 version of the language", LanguageCheckTest.isValid10Language(minus));
6.9 }
6.10 }
7.1 --- a/samples/visitor/11-cleanversion/src-api1.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
7.2 +++ b/samples/visitor/11-cleanversion/src-api1.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
7.3 @@ -19,8 +19,8 @@
7.4 public Expression getSecond() { return second; }
7.5 @Override
7.6 public void visit(Visitor v) {
7.7 - if (v instanceof Visitor1_0) {
7.8 - ((Visitor1_0)v).visitPlus(this);
7.9 + if (v instanceof Visitor10) {
7.10 + ((Visitor10)v).visitPlus(this);
7.11 } else {
7.12 v.visitUnknown(this);
7.13 }
7.14 @@ -32,8 +32,8 @@
7.15 public int getValue() { return value; }
7.16 @Override
7.17 public void visit(Visitor v) {
7.18 - if (v instanceof Visitor1_0) {
7.19 - ((Visitor1_0)v).visitNumber(this);
7.20 + if (v instanceof Visitor10) {
7.21 + ((Visitor10)v).visitNumber(this);
7.22 } else {
7.23 v.visitUnknown(this);
7.24 }
7.25 @@ -44,7 +44,7 @@
7.26 public void visitUnknown(Expression e);
7.27 }
7.28
7.29 - public interface Visitor1_0 extends Visitor {
7.30 + public interface Visitor10 extends Visitor {
7.31 public void visitPlus(Plus s);
7.32 public void visitNumber(Number n);
7.33 }
8.1 --- a/samples/visitor/11-cleanversion/src-api2.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
8.2 +++ b/samples/visitor/11-cleanversion/src-api2.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
8.3 @@ -33,8 +33,8 @@
8.4
8.5 @Override
8.6 public void visit(Visitor v) {
8.7 - if (v instanceof Visitor1_0) {
8.8 - ((Visitor1_0) v).visitPlus(this);
8.9 + if (v instanceof Visitor10) {
8.10 + ((Visitor10) v).visitPlus(this);
8.11 } else {
8.12 v.visitUnknown(this);
8.13 }
8.14 @@ -55,8 +55,8 @@
8.15
8.16 @Override
8.17 public void visit(Visitor v) {
8.18 - if (v instanceof Visitor1_0) {
8.19 - ((Visitor1_0) v).visitNumber(this);
8.20 + if (v instanceof Visitor10) {
8.21 + ((Visitor10) v).visitNumber(this);
8.22 } else {
8.23 v.visitUnknown(this);
8.24 }
8.25 @@ -77,8 +77,8 @@
8.26
8.27 // BEGIN: visitor.cleanversion.dispatch2
8.28 public void visit(Visitor v) {
8.29 - if (v instanceof Visitor2_0) {
8.30 - ((Visitor2_0)v).visitMinus(this);
8.31 + if (v instanceof Visitor20) {
8.32 + ((Visitor20)v).visitMinus(this);
8.33 } else {
8.34 v.visitUnknown(this);
8.35 }
8.36 @@ -90,12 +90,12 @@
8.37 public interface Visitor {
8.38 public void visitUnknown(Expression e);
8.39 }
8.40 - public interface Visitor1_0 extends Visitor {
8.41 + public interface Visitor10 extends Visitor {
8.42 public void visitPlus(Plus s);
8.43 public void visitNumber(Number n);
8.44 }
8.45 /** @since 2.0 */
8.46 - public interface Visitor2_0 extends Visitor1_0 {
8.47 + public interface Visitor20 extends Visitor10 {
8.48 public void visitMinus(Minus s);
8.49 }
8.50 // END: visitor.cleanversion.v2
9.1 --- a/samples/visitor/11-cleanversion/src-api3.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
9.2 +++ b/samples/visitor/11-cleanversion/src-api3.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
9.3 @@ -33,10 +33,10 @@
9.4
9.5 @Override
9.6 public void visit(Visitor v) {
9.7 - if (v instanceof Visitor1_0) {
9.8 - ((Visitor1_0) v).visitPlus(this);
9.9 - } else if (v instanceof Visitor3_0) {
9.10 - ((Visitor3_0) v).visitPlus(this);
9.11 + if (v instanceof Visitor10) {
9.12 + ((Visitor10) v).visitPlus(this);
9.13 + } else if (v instanceof Visitor30) {
9.14 + ((Visitor30) v).visitPlus(this);
9.15 } else {
9.16 v.visitUnknown(this);
9.17 }
9.18 @@ -57,11 +57,11 @@
9.19
9.20 @Override
9.21 public void visit(Visitor v) {
9.22 - if (v instanceof Visitor1_0) {
9.23 - ((Visitor1_0) v).visitNumber(this);
9.24 - } else if (v instanceof Visitor3_0) {
9.25 + if (v instanceof Visitor10) {
9.26 + ((Visitor10) v).visitNumber(this);
9.27 + } else if (v instanceof Visitor30) {
9.28 Real wrapper = new Real(getValue());
9.29 - ((Visitor3_0) v).visitReal(wrapper);
9.30 + ((Visitor30) v).visitReal(wrapper);
9.31 } else {
9.32 v.visitUnknown(this);
9.33 }
9.34 @@ -81,10 +81,10 @@
9.35 public Expression getSecond() { return second; }
9.36
9.37 public void visit(Visitor v) {
9.38 - if (v instanceof Visitor2_0) {
9.39 - ((Visitor2_0)v).visitMinus(this);
9.40 - } else if (v instanceof Visitor3_0) {
9.41 - ((Visitor3_0)v).visitMinus(this);
9.42 + if (v instanceof Visitor20) {
9.43 + ((Visitor20)v).visitMinus(this);
9.44 + } else if (v instanceof Visitor30) {
9.45 + ((Visitor30)v).visitMinus(this);
9.46 } else {
9.47 v.visitUnknown(this);
9.48 }
9.49 @@ -104,8 +104,8 @@
9.50 public void visit(Visitor v)
9.51 // FINISH: visitor.nonmonotonic.real
9.52 {
9.53 - if (v instanceof Visitor3_0) {
9.54 - ((Visitor3_0)v).visitReal(this);
9.55 + if (v instanceof Visitor30) {
9.56 + ((Visitor30)v).visitReal(this);
9.57 } else {
9.58 v.visitUnknown(this);
9.59 }
9.60 @@ -116,17 +116,17 @@
9.61 public interface Visitor {
9.62 public void visitUnknown(Expression e);
9.63 }
9.64 - public interface Visitor1_0 extends Visitor {
9.65 + public interface Visitor10 extends Visitor {
9.66 public void visitPlus(Plus s);
9.67 public void visitNumber(Number n);
9.68 }
9.69 /** @since 2.0 */
9.70 - public interface Visitor2_0 extends Visitor {
9.71 + public interface Visitor20 extends Visitor {
9.72 public void visitMinus(Minus s);
9.73 }
9.74 // BEGIN: visitor.nonmonotonic.visitor
9.75 /** @since 3.0 */
9.76 - public interface Visitor3_0 extends Visitor {
9.77 + public interface Visitor30 extends Visitor {
9.78 public void visitPlus(Plus s);
9.79 public void visitMinus(Minus s);
9.80 public void visitReal(Real r);
10.1 --- a/samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200
10.2 +++ b/samples/visitor/11-cleanversion/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:59:00 2008 +0200
10.3 @@ -4,12 +4,12 @@
10.4 import org.apidesign.visitor.Language.Expression;
10.5 import org.apidesign.visitor.Language.Number;
10.6 import org.apidesign.visitor.Language.Plus;
10.7 -import org.apidesign.visitor.Language.Visitor1_0;
10.8 +import org.apidesign.visitor.Language.Visitor10;
10.9 import org.junit.Test;
10.10
10.11 public class PrintTest {
10.12
10.13 - public static class PrintVisitor implements Visitor1_0 {
10.14 + public static class PrintVisitor implements Visitor10 {
10.15 StringBuffer sb = new StringBuffer();
10.16
10.17 public void visitUnknown(Expression exp) {
11.1 --- a/samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
11.2 +++ b/samples/visitor/11-cleanversion/src-test2.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:59:00 2008 +0200
11.3 @@ -6,7 +6,7 @@
11.4 import org.apidesign.visitor.Language.Minus;
11.5 import org.apidesign.visitor.Language.Number;
11.6 import org.apidesign.visitor.Language.Plus;
11.7 -import org.apidesign.visitor.Language.Visitor2_0;
11.8 +import org.apidesign.visitor.Language.Visitor20;
11.9 import org.junit.Test;
11.10
11.11 public class PrintOfMinusStructureTest {
11.12 @@ -28,9 +28,9 @@
11.13 assertEquals("1 - 2", print.sb.toString());
11.14 }
11.15
11.16 - @Test public void visitorReadyForVersion2_0() {
11.17 + @Test public void visitorReadyForVersion20() {
11.18 // BEGIN: visitor.cleanversion.print2
11.19 - class PrintVisitor2_0 implements Visitor2_0 {
11.20 + class PrintVisitor20 implements Visitor20 {
11.21 StringBuffer sb = new StringBuffer();
11.22
11.23 public void visitUnknown(Expression exp) {
11.24 @@ -57,7 +57,7 @@
11.25 Number two = new Number(2);
11.26 Expression plus = new Minus(one, two);
11.27
11.28 - PrintVisitor2_0 print = new PrintVisitor2_0();
11.29 + PrintVisitor20 print = new PrintVisitor20();
11.30 plus.visit(print);
11.31
11.32 assertEquals("1 - 2", print.sb.toString());
12.1 --- a/samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:38:00 2008 +0200
12.2 +++ b/samples/visitor/11-cleanversion/src-test3.0/org/apidesign/test/visitor/PrintOfMinusStructureTest.java Sat Jun 14 22:59:00 2008 +0200
12.3 @@ -7,7 +7,7 @@
12.4 import org.apidesign.visitor.Language.Number;
12.5 import org.apidesign.visitor.Language.Plus;
12.6 import org.apidesign.visitor.Language.Real;
12.7 -import org.apidesign.visitor.Language.Visitor3_0;
12.8 +import org.apidesign.visitor.Language.Visitor30;
12.9 import org.junit.Test;
12.10
12.11 public class PrintOfMinusStructureTest {
12.12 @@ -29,9 +29,9 @@
12.13 assertEquals("1.0 - 2.0", print.sb.toString());
12.14 }
12.15
12.16 - @Test public void visitorReadyForVersion3_0() {
12.17 + @Test public void visitorReadyForVersion30() {
12.18 // BEGIN: visitor.nonmonotonic.print3
12.19 - class PrintVisitor3_0 implements Visitor3_0 {
12.20 + class PrintVisitor30 implements Visitor30 {
12.21 StringBuffer sb = new StringBuffer();
12.22
12.23 public void visitUnknown(Expression exp) {
12.24 @@ -62,7 +62,7 @@
12.25 Number two = new Number(2);
12.26 Expression plus = new Minus(one, two);
12.27
12.28 - PrintVisitor3_0 print = new PrintVisitor3_0();
12.29 + PrintVisitor30 print = new PrintVisitor30();
12.30 plus.visit(print);
12.31
12.32 assertEquals("1.0 - 2.0", print.sb.toString());
12.33 @@ -72,7 +72,7 @@
12.34 Real three = new Real(3);
12.35 Expression realPlus = new Minus(five, three);
12.36
12.37 - PrintVisitor3_0 printReal = new PrintVisitor3_0();
12.38 + PrintVisitor30 printReal = new PrintVisitor30();
12.39 realPlus.visit(printReal);
12.40
12.41 assertEquals("5.0 - 3.0", printReal.sb.toString());
13.1 --- a/samples/visitor/21-clientprovider/src-api1.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
13.2 +++ b/samples/visitor/21-clientprovider/src-api1.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
13.3 @@ -18,11 +18,11 @@
13.4 public static abstract class Visitor {
13.5 Visitor() {}
13.6
13.7 - public static Visitor create(Version1_0 v) {
13.8 - return create1_0(v);
13.9 + public static Visitor create(Version10 v) {
13.10 + return create10(v);
13.11 }
13.12
13.13 - public interface Version1_0 {
13.14 + public interface Version10 {
13.15 public boolean visitUnknown(Expression e);
13.16 public void visitPlus(Plus s);
13.17 public void visitNumber(Number n);
13.18 @@ -33,7 +33,7 @@
13.19 }
13.20 // END: visitor.clientprovider.v1
13.21
13.22 - static Visitor create1_0(final Visitor.Version1_0 v) {
13.23 + static Visitor create10(final Visitor.Version10 v) {
13.24 return new Visitor() {
13.25 @Override
13.26 public void dispatchPlus(Plus p) {
14.1 --- a/samples/visitor/21-clientprovider/src-api2.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
14.2 +++ b/samples/visitor/21-clientprovider/src-api2.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
14.3 @@ -23,12 +23,12 @@
14.4 public static abstract class Visitor {
14.5 Visitor() {}
14.6 /** @since 2.0 */
14.7 - public static Visitor create(Version2_0 v) {
14.8 - return create2_0(v);
14.9 + public static Visitor create(Version20 v) {
14.10 + return create20(v);
14.11 }
14.12
14.13 /** @since 2.0 */
14.14 - public interface Version2_0 extends Version1_0 {
14.15 + public interface Version20 extends Version10 {
14.16 public void visitMinus(Minus m);
14.17 }
14.18
14.19 @@ -37,11 +37,11 @@
14.20 public abstract void dispatchNumber(Number n);
14.21 // FINISH: visitor.clientprovider.v2
14.22
14.23 - public static Visitor create(Version1_0 v) {
14.24 - return create1_0(v);
14.25 + public static Visitor create(Version10 v) {
14.26 + return create10(v);
14.27 }
14.28
14.29 - public interface Version1_0 {
14.30 + public interface Version10 {
14.31 public boolean visitUnknown(Expression e);
14.32 public void visitPlus(Plus s);
14.33 public void visitNumber(Number n);
14.34 @@ -51,7 +51,7 @@
14.35 public abstract void dispatchMinus(Minus m);
14.36 }
14.37
14.38 - static Visitor create1_0(final Visitor.Version1_0 v) {
14.39 + static Visitor create10(final Visitor.Version10 v) {
14.40 return new Visitor() {
14.41 @Override
14.42 public void dispatchPlus(Plus p) {
14.43 @@ -72,7 +72,7 @@
14.44 }
14.45 };
14.46 }
14.47 - static Visitor create2_0(final Visitor.Version2_0 v) {
14.48 + static Visitor create20(final Visitor.Version20 v) {
14.49 return new Visitor() {
14.50 @Override
14.51 public void dispatchPlus(Plus p) {
15.1 --- a/samples/visitor/21-clientprovider/src-api3.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
15.2 +++ b/samples/visitor/21-clientprovider/src-api3.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
15.3 @@ -29,12 +29,12 @@
15.4
15.5
15.6 /** @since 3.0 */
15.7 - public static Visitor create(Version3_0 v) {
15.8 - return create3_0(v);
15.9 + public static Visitor create(Version30 v) {
15.10 + return create30(v);
15.11 }
15.12
15.13 /** @since 3.0 */
15.14 - public interface Version3_0 {
15.15 + public interface Version30 {
15.16 public boolean visitUnknown(Expression e);
15.17 public void visitPlus(Plus s);
15.18 public void visitMinus(Minus s);
15.19 @@ -46,12 +46,12 @@
15.20
15.21 // FINISH: visitor.clientprovider.v3
15.22 /** @since 2.0 */
15.23 - public static Visitor create(Version2_0 v) {
15.24 - return create2_0(v);
15.25 + public static Visitor create(Version20 v) {
15.26 + return create20(v);
15.27 }
15.28
15.29 /** @since 2.0 */
15.30 - public interface Version2_0 extends Version1_0 {
15.31 + public interface Version20 extends Version10 {
15.32 public void visitMinus(Minus m);
15.33 }
15.34
15.35 @@ -59,11 +59,11 @@
15.36 /** @since 2.0 */
15.37 public abstract void dispatchNumber(Number n);
15.38
15.39 - public static Visitor create(Version1_0 v) {
15.40 - return create1_0(v);
15.41 + public static Visitor create(Version10 v) {
15.42 + return create10(v);
15.43 }
15.44
15.45 - public interface Version1_0 {
15.46 + public interface Version10 {
15.47 public boolean visitUnknown(Expression e);
15.48 public void visitPlus(Plus s);
15.49 public void visitNumber(Number n);
15.50 @@ -74,7 +74,7 @@
15.51 }
15.52
15.53 // BEGIN: visitor.clientprovider.dispatch.v3.l1
15.54 - static Visitor create1_0(final Visitor.Version1_0 v) {
15.55 + static Visitor create10(final Visitor.Version10 v) {
15.56 return new Visitor() {
15.57 @Override
15.58 public void dispatchPlus(Plus p) {
15.59 @@ -102,7 +102,7 @@
15.60 }
15.61 // END: visitor.clientprovider.dispatch.v3.l1
15.62 // BEGIN: visitor.clientprovider.dispatch.v3.l2
15.63 - static Visitor create2_0(final Visitor.Version2_0 v) {
15.64 + static Visitor create20(final Visitor.Version20 v) {
15.65 return new Visitor() {
15.66 @Override
15.67 public void dispatchPlus(Plus p) {
15.68 @@ -127,7 +127,7 @@
15.69 }
15.70 // END: visitor.clientprovider.dispatch.v3.l2
15.71 // BEGIN: visitor.clientprovider.dispatch.v3.l3
15.72 - static Visitor create3_0(final Visitor.Version3_0 v) {
15.73 + static Visitor create30(final Visitor.Version30 v) {
15.74 return new Visitor() {
15.75 @Override
15.76 public void dispatchReal(Real r) {
16.1 --- a/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200
16.2 +++ b/samples/visitor/21-clientprovider/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:59:00 2008 +0200
16.3 @@ -39,7 +39,7 @@
16.4 }
16.5
16.6 // BEGIN: visitor.clientprovider.print
16.7 - public static class PrintVisitor implements Visitor.Version1_0 {
16.8 + public static class PrintVisitor implements Visitor.Version10 {
16.9 StringBuffer sb = new StringBuffer();
16.10
16.11 final Visitor dispatch = Visitor.create(this);
17.1 --- a/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:38:00 2008 +0200
17.2 +++ b/samples/visitor/21-clientprovider/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:59:00 2008 +0200
17.3 @@ -26,8 +26,8 @@
17.4 assertEquals("1.0 - 2.0", print.sb.toString());
17.5 }
17.6
17.7 - @Test public void visitorReadyForVersion3_0() {
17.8 - class PrintVisitor3_0 implements Visitor.Version3_0 {
17.9 + @Test public void visitorReadyForVersion30() {
17.10 + class PrintVisitor30 implements Visitor.Version30 {
17.11 StringBuffer sb = new StringBuffer();
17.12 Visitor dispatch = Visitor.create(this);
17.13
17.14 @@ -57,7 +57,7 @@
17.15 Number two = PrintTest.newNumber(2);
17.16 Expression plus = PrintOfMinusStructureTest.newMinus(one, two);
17.17
17.18 - PrintVisitor3_0 print = new PrintVisitor3_0();
17.19 + PrintVisitor30 print = new PrintVisitor30();
17.20 plus.visit(print.dispatch);
17.21
17.22 assertEquals("1.0 - 2.0", print.sb.toString());
17.23 @@ -66,7 +66,7 @@
17.24 Real three = newReal(3);
17.25 Expression realPlus = PrintOfMinusStructureTest.newMinus(five, three);
17.26
17.27 - PrintVisitor3_0 printReal = new PrintVisitor3_0();
17.28 + PrintVisitor30 printReal = new PrintVisitor30();
17.29 realPlus.visit(printReal.dispatch);
17.30
17.31 assertEquals("5.0 - 3.0", printReal.sb.toString());
18.1 --- a/samples/visitor/22-self/src-api1.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
18.2 +++ b/samples/visitor/22-self/src-api1.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
18.3 @@ -18,11 +18,11 @@
18.4 public static abstract class Visitor {
18.5 Visitor() {}
18.6
18.7 - public static Visitor create(Version1_0 v) {
18.8 - return create1_0(v);
18.9 + public static Visitor create(Version10 v) {
18.10 + return create10(v);
18.11 }
18.12
18.13 - public interface Version1_0 {
18.14 + public interface Version10 {
18.15 public boolean visitUnknown(Expression e, Visitor self);
18.16 public void visitPlus(Plus s, Visitor self);
18.17 public void visitNumber(Number n, Visitor self);
18.18 @@ -33,7 +33,7 @@
18.19 }
18.20 // END: visitor.clientprovider.self.v1
18.21
18.22 - static Visitor create1_0(final Visitor.Version1_0 v) {
18.23 + static Visitor create10(final Visitor.Version10 v) {
18.24 return new Visitor() {
18.25 @Override
18.26 public void dispatchPlus(Plus p) {
19.1 --- a/samples/visitor/22-self/src-api2.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
19.2 +++ b/samples/visitor/22-self/src-api2.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
19.3 @@ -22,12 +22,12 @@
19.4 public static abstract class Visitor {
19.5 Visitor() {}
19.6 /** @since 2.0 */
19.7 - public static Visitor create(Version2_0 v) {
19.8 - return create2_0(v);
19.9 + public static Visitor create(Version20 v) {
19.10 + return create20(v);
19.11 }
19.12
19.13 /** @since 2.0 */
19.14 - public interface Version2_0 extends Version1_0 {
19.15 + public interface Version20 extends Version10 {
19.16 public void visitMinus(Minus m, Visitor self);
19.17 }
19.18
19.19 @@ -35,11 +35,11 @@
19.20 /** @since 2.0 */
19.21 public abstract void dispatchNumber(Number n);
19.22
19.23 - public static Visitor create(Version1_0 v) {
19.24 - return create1_0(v);
19.25 + public static Visitor create(Version10 v) {
19.26 + return create10(v);
19.27 }
19.28
19.29 - public interface Version1_0 {
19.30 + public interface Version10 {
19.31 public boolean visitUnknown(Expression e, Visitor self);
19.32 public void visitPlus(Plus s, Visitor self);
19.33 public void visitNumber(Number n, Visitor self);
19.34 @@ -49,7 +49,7 @@
19.35 public abstract void dispatchMinus(Minus m);
19.36 }
19.37
19.38 - static Visitor create1_0(final Visitor.Version1_0 v) {
19.39 + static Visitor create10(final Visitor.Version10 v) {
19.40 return new Visitor() {
19.41 @Override
19.42 public void dispatchPlus(Plus p) {
19.43 @@ -70,7 +70,7 @@
19.44 }
19.45 };
19.46 }
19.47 - static Visitor create2_0(final Visitor.Version2_0 v) {
19.48 + static Visitor create20(final Visitor.Version20 v) {
19.49 return new Visitor() {
19.50 @Override
19.51 public void dispatchPlus(Plus p) {
20.1 --- a/samples/visitor/22-self/src-api3.0/org/apidesign/visitor/Language.java Sat Jun 14 22:38:00 2008 +0200
20.2 +++ b/samples/visitor/22-self/src-api3.0/org/apidesign/visitor/Language.java Sat Jun 14 22:59:00 2008 +0200
20.3 @@ -28,12 +28,12 @@
20.4
20.5
20.6 /** @since 3.0 */
20.7 - public static Visitor create(Version3_0 v) {
20.8 - return create3_0(v);
20.9 + public static Visitor create(Version30 v) {
20.10 + return create30(v);
20.11 }
20.12
20.13 /** @since 3.0 */
20.14 - public interface Version3_0 {
20.15 + public interface Version30 {
20.16 public boolean visitUnknown(Expression e, Visitor self);
20.17 public void visitPlus(Plus s, Visitor self);
20.18 public void visitMinus(Minus s, Visitor self);
20.19 @@ -44,12 +44,12 @@
20.20 public abstract void dispatchReal(Real r);
20.21
20.22 /** @since 2.0 */
20.23 - public static Visitor create(Version2_0 v) {
20.24 - return create2_0(v);
20.25 + public static Visitor create(Version20 v) {
20.26 + return create20(v);
20.27 }
20.28
20.29 /** @since 2.0 */
20.30 - public interface Version2_0 extends Version1_0 {
20.31 + public interface Version20 extends Version10 {
20.32 public void visitMinus(Minus m, Visitor self);
20.33 }
20.34
20.35 @@ -57,11 +57,11 @@
20.36 /** @since 2.0 */
20.37 public abstract void dispatchNumber(Number n);
20.38
20.39 - public static Visitor create(Version1_0 v) {
20.40 - return create1_0(v);
20.41 + public static Visitor create(Version10 v) {
20.42 + return create10(v);
20.43 }
20.44
20.45 - public interface Version1_0 {
20.46 + public interface Version10 {
20.47 public boolean visitUnknown(Expression e, Visitor self);
20.48 public void visitPlus(Plus s, Visitor self);
20.49 public void visitNumber(Number n, Visitor self);
20.50 @@ -71,7 +71,7 @@
20.51 public abstract void dispatchMinus(Minus m);
20.52 }
20.53
20.54 - static Visitor create1_0(final Visitor.Version1_0 v) {
20.55 + static Visitor create10(final Visitor.Version10 v) {
20.56 return new Visitor() {
20.57 @Override
20.58 public void dispatchPlus(Plus p) {
20.59 @@ -97,7 +97,7 @@
20.60 }
20.61 };
20.62 }
20.63 - static Visitor create2_0(final Visitor.Version2_0 v) {
20.64 + static Visitor create20(final Visitor.Version20 v) {
20.65 return new Visitor() {
20.66 @Override
20.67 public void dispatchPlus(Plus p) {
20.68 @@ -120,7 +120,7 @@
20.69 }
20.70 };
20.71 }
20.72 - static Visitor create3_0(final Visitor.Version3_0 v) {
20.73 + static Visitor create30(final Visitor.Version30 v) {
20.74 return new Visitor() {
20.75 @Override
20.76 public void dispatchReal(Real r) {
21.1 --- a/samples/visitor/22-self/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:38:00 2008 +0200
21.2 +++ b/samples/visitor/22-self/src-test/org/apidesign/test/visitor/PrintTest.java Sat Jun 14 22:59:00 2008 +0200
21.3 @@ -40,7 +40,7 @@
21.4 }
21.5
21.6 // BEGIN: visitor.clientprovider.self.print
21.7 - public static class PrintVisitor implements Visitor.Version1_0 {
21.8 + public static class PrintVisitor implements Visitor.Version10 {
21.9 StringBuffer sb = new StringBuffer();
21.10
21.11 public void visitPlus(Plus s, Visitor self) {
22.1 --- a/samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:38:00 2008 +0200
22.2 +++ b/samples/visitor/22-self/src-test3.0/org/apidesign/test/visitor/PrintRealTest.java Sat Jun 14 22:59:00 2008 +0200
22.3 @@ -26,8 +26,8 @@
22.4 assertEquals("1.0 - 2.0", print.sb.toString());
22.5 }
22.6
22.7 - @Test public void visitorReadyForVersion3_0() {
22.8 - class PrintVisitor3_0 implements Visitor.Version3_0 {
22.9 + @Test public void visitorReadyForVersion30() {
22.10 + class PrintVisitor30 implements Visitor.Version30 {
22.11 StringBuffer sb = new StringBuffer();
22.12
22.13 public boolean visitUnknown(Expression exp, Visitor self) {
22.14 @@ -56,7 +56,7 @@
22.15 Number two = PrintTest.newNumber(2);
22.16 Expression plus = PrintOfMinusStructureTest.newMinus(one, two);
22.17
22.18 - PrintVisitor3_0 print = new PrintVisitor3_0();
22.19 + PrintVisitor30 print = new PrintVisitor30();
22.20 plus.visit(Visitor.create(print));
22.21
22.22 assertEquals("1.0 - 2.0", print.sb.toString());
22.23 @@ -65,7 +65,7 @@
22.24 Real three = newReal(3);
22.25 Expression realPlus = PrintOfMinusStructureTest.newMinus(five, three);
22.26
22.27 - PrintVisitor3_0 printReal = new PrintVisitor3_0();
22.28 + PrintVisitor30 printReal = new PrintVisitor30();
22.29 realPlus.visit(Visitor.create(printReal));
22.30
22.31 assertEquals("5.0 - 3.0", printReal.sb.toString());