# HG changeset patch # User Jaroslav Tulach # Date 1220015548 -7200 # Node ID c15f77497f6a8251ffb7ec18847fd74641710ba3 # Parent 34370a93db6b4fe473d574633955cfb07a3552b1 Moving to org.apidesign packages diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/build.xml --- a/samples/insertsuperclass/build.xml Fri Aug 29 15:08:04 2008 +0200 +++ b/samples/insertsuperclass/build.xml Fri Aug 29 15:12:28 2008 +0200 @@ -36,7 +36,7 @@ - diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api1.0/api/HelloClass.java --- a/samples/insertsuperclass/src-api1.0/api/HelloClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -package api; - -public abstract class HelloClass { -// BEGIN: design.insert.superclass - public abstract String sayHello(); - public abstract String sayHelloTo(String who); -// END: design.insert.superclass -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api1.0/api/HelloFieldClass.java --- a/samples/insertsuperclass/src-api1.0/api/HelloFieldClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -package api; - -public class HelloFieldClass { -// BEGIN: design.insert.field.superclass - public String field = "Hello"; -// END: design.insert.field.superclass -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api1.0/api/HelloInterface.java --- a/samples/insertsuperclass/src-api1.0/api/HelloInterface.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -package api; - -// BEGIN: design.insert.superinterface -public interface HelloInterface { - public abstract String sayHello(); - public abstract String sayHelloTo(String who); -} -// END: design.insert.superinterface diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,8 @@ +package org.apidesign.insertsuperclass.api; + +public abstract class HelloClass { +// BEGIN: design.insert.superclass + public abstract String sayHello(); + public abstract String sayHelloTo(String who); +// END: design.insert.superclass +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloFieldClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloFieldClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,7 @@ +package org.apidesign.insertsuperclass.api; + +public class HelloFieldClass { +// BEGIN: design.insert.field.superclass + public String field = "Hello"; +// END: design.insert.field.superclass +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloInterface.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloInterface.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,8 @@ +package org.apidesign.insertsuperclass.api; + +// BEGIN: design.insert.superinterface +public interface HelloInterface { + public abstract String sayHello(); + public abstract String sayHelloTo(String who); +} +// END: design.insert.superinterface diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/api/HelloClass.java --- a/samples/insertsuperclass/src-api2.0/api/HelloClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -package api; - -// BEGIN: design.insert.superclass2 -public abstract class HelloClass extends SimpleHelloClass { -// FINISH: design.insert.superclass2 - public abstract String sayHelloTo(String who); -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/api/HelloFieldClass.java --- a/samples/insertsuperclass/src-api2.0/api/HelloFieldClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -package api; - -// BEGIN: design.insert.field.superclass2 -public class HelloFieldClass extends SimpleHelloFieldClass { -} -// END: design.insert.field.superclass2 diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/api/HelloInterface.java --- a/samples/insertsuperclass/src-api2.0/api/HelloInterface.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -package api; - -public interface HelloInterface extends SimpleHelloInterface { - public abstract String sayHelloTo(String who); -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/api/SimpleHelloClass.java --- a/samples/insertsuperclass/src-api2.0/api/SimpleHelloClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -package api; - -// BEGIN: design.insert.superclass1 -public abstract class SimpleHelloClass { - public abstract String sayHello(); -} -// END: design.insert.superclass1 diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/api/SimpleHelloFieldClass.java --- a/samples/insertsuperclass/src-api2.0/api/SimpleHelloFieldClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -package api; - -// BEGIN: design.insert.field.superclass1 -public abstract class SimpleHelloFieldClass { - public String field = "Hello"; -// FINISH: design.insert.field.superclass1 -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/api/SimpleHelloInterface.java --- a/samples/insertsuperclass/src-api2.0/api/SimpleHelloInterface.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -package api; - -public interface SimpleHelloInterface { - public abstract String sayHello(); -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,7 @@ +package org.apidesign.insertsuperclass.api; + +// BEGIN: design.insert.superclass2 +public abstract class HelloClass extends SimpleHelloClass { +// FINISH: design.insert.superclass2 + public abstract String sayHelloTo(String who); +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloFieldClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloFieldClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,6 @@ +package org.apidesign.insertsuperclass.api; + +// BEGIN: design.insert.field.superclass2 +public class HelloFieldClass extends SimpleHelloFieldClass { +} +// END: design.insert.field.superclass2 diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloInterface.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloInterface.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,5 @@ +package org.apidesign.insertsuperclass.api; + +public interface HelloInterface extends SimpleHelloInterface { + public abstract String sayHelloTo(String who); +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,7 @@ +package org.apidesign.insertsuperclass.api; + +// BEGIN: design.insert.superclass1 +public abstract class SimpleHelloClass { + public abstract String sayHello(); +} +// END: design.insert.superclass1 diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloFieldClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloFieldClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,7 @@ +package org.apidesign.insertsuperclass.api; + +// BEGIN: design.insert.field.superclass1 +public abstract class SimpleHelloFieldClass { + public String field = "Hello"; +// FINISH: design.insert.field.superclass1 +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloInterface.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloInterface.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,5 @@ +package org.apidesign.insertsuperclass.api; + +public interface SimpleHelloInterface { + public abstract String sayHello(); +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-impl/impl/ImplClass.java --- a/samples/insertsuperclass/src-impl/impl/ImplClass.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -package impl; - -import api.HelloClass; - -public class ImplClass extends HelloClass { - public String sayHello() { - return "Hello Unknown!"; - } - - public String sayHelloTo(String who) { - return "Hello " + who + '!'; - } -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-impl/impl/ImplInterface.java --- a/samples/insertsuperclass/src-impl/impl/ImplInterface.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -package impl; - -import api.HelloInterface; -public class ImplInterface implements HelloInterface { - public String sayHello() { - return "Hello Unknown!"; - } - - public String sayHelloTo(String who) { - return "Hello " + who + '!'; - } -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-impl/impl/Main.java --- a/samples/insertsuperclass/src-impl/impl/Main.java Fri Aug 29 15:08:04 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ - -package impl; - -import api.HelloClass; -import api.HelloFieldClass; -import api.HelloInterface; - -/** - * - * @author Jaroslav Tulach - */ -public class Main { - public static void main(String[] args) throws Exception { - boolean assertionsOn = false; - assert assertionsOn = true; - if (!assertionsOn) { - throw new IllegalStateException("Enable assertions!"); - } - - HelloClass clazz = new ImplClass(); - assert "Hello Unknown!".equals(clazz.sayHello()); - assert "Hello Jaroslav!".equals(clazz.sayHelloTo("Jaroslav")); - System.err.println("Who defines sayHello(): " + clazz.getClass().getSuperclass().getMethod("sayHello")); - - HelloInterface iface = new ImplInterface(); - assert "Hello Unknown!".equals(iface.sayHello()); - assert "Hello Jaroslav!".equals(iface.sayHelloTo("Jaroslav")); - System.err.println("Who defines sayHello(): " + iface.getClass().getInterfaces()[0].getMethod("sayHello")); - - HelloFieldClass fieldClass = new HelloFieldClass(); - assert "Hello".equals(fieldClass.field); - System.err.println("Who defines field: " + fieldClass.getClass().getField("field")); - } -} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/ImplClass.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/ImplClass.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,13 @@ +package org.apidesign.insertsuperclass.test; + +import org.apidesign.insertsuperclass.api.HelloClass; + +public class ImplClass extends HelloClass { + public String sayHello() { + return "Hello Unknown!"; + } + + public String sayHelloTo(String who) { + return "Hello " + who + '!'; + } +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/ImplInterface.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/ImplInterface.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,13 @@ +package org.apidesign.insertsuperclass.test; + +import org.apidesign.insertsuperclass.api.HelloInterface; + +public class ImplInterface implements HelloInterface { + public String sayHello() { + return "Hello Unknown!"; + } + + public String sayHelloTo(String who) { + return "Hello " + who + '!'; + } +} diff -r 34370a93db6b -r c15f77497f6a samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/Main.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/Main.java Fri Aug 29 15:12:28 2008 +0200 @@ -0,0 +1,34 @@ + +package org.apidesign.insertsuperclass.test; + +import org.apidesign.insertsuperclass.api.HelloClass; +import org.apidesign.insertsuperclass.api.HelloFieldClass; +import org.apidesign.insertsuperclass.api.HelloInterface; + +/** + * + * @author Jaroslav Tulach + */ +public class Main { + public static void main(String[] args) throws Exception { + boolean assertionsOn = false; + assert assertionsOn = true; + if (!assertionsOn) { + throw new IllegalStateException("Enable assertions!"); + } + + HelloClass clazz = new ImplClass(); + assert "Hello Unknown!".equals(clazz.sayHello()); + assert "Hello Jaroslav!".equals(clazz.sayHelloTo("Jaroslav")); + System.err.println("Who defines sayHello(): " + clazz.getClass().getSuperclass().getMethod("sayHello")); + + HelloInterface iface = new ImplInterface(); + assert "Hello Unknown!".equals(iface.sayHello()); + assert "Hello Jaroslav!".equals(iface.sayHelloTo("Jaroslav")); + System.err.println("Who defines sayHello(): " + iface.getClass().getInterfaces()[0].getMethod("sayHello")); + + HelloFieldClass fieldClass = new HelloFieldClass(); + assert "Hello".equals(fieldClass.field); + System.err.println("Who defines field: " + fieldClass.getClass().getField("field")); + } +}