1.1 --- a/samples/insertsuperclass/build.xml	Fri Aug 29 15:08:04 2008 +0200
     1.2 +++ b/samples/insertsuperclass/build.xml	Fri Aug 29 15:12:28 2008 +0200
     1.3 @@ -36,7 +36,7 @@
     1.4      
     1.5      <target name="-run-one">
     1.6          <fail message="You need to specify API version number" unless="version"/>
     1.7 -        <java classpath="build/${version}/classes:build/impl/classes" classname="impl.Main"
     1.8 +        <java classpath="build/${version}/classes:build/impl/classes" classname="org.apidesign.insertsuperclass.test.Main"
     1.9              failonerror="true">
    1.10              <jvmarg value="-ea"/>
    1.11          </java>

     2.1 --- a/samples/insertsuperclass/src-api1.0/api/HelloClass.java	Fri Aug 29 15:08:04 2008 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,8 +0,0 @@
     2.4 -package api;
     2.5 -
     2.6 -public abstract class HelloClass {
     2.7 -// BEGIN: design.insert.superclass
     2.8 -    public abstract String sayHello();
     2.9 -    public abstract String sayHelloTo(String who);
    2.10 -// END: design.insert.superclass
    2.11 -}

     3.1 --- a/samples/insertsuperclass/src-api1.0/api/HelloFieldClass.java	Fri Aug 29 15:08:04 2008 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,7 +0,0 @@
     3.4 -package api;
     3.5 -
     3.6 -public class HelloFieldClass {
     3.7 -// BEGIN: design.insert.field.superclass
     3.8 -    public String field = "Hello";
     3.9 -// END: design.insert.field.superclass
    3.10 -}

     4.1 --- a/samples/insertsuperclass/src-api1.0/api/HelloInterface.java	Fri Aug 29 15:08:04 2008 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,8 +0,0 @@
     4.4 -package api;
     4.5 -
     4.6 -// BEGIN: design.insert.superinterface
     4.7 -public interface HelloInterface {
     4.8 -    public abstract String sayHello();
     4.9 -    public abstract String sayHelloTo(String who);
    4.10 -}
    4.11 -// END: design.insert.superinterface

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloClass.java	Fri Aug 29 15:12:28 2008 +0200
     5.3 @@ -0,0 +1,8 @@
     5.4 +package org.apidesign.insertsuperclass.api;
     5.5 +
     5.6 +public abstract class HelloClass {
     5.7 +// BEGIN: design.insert.superclass
     5.8 +    public abstract String sayHello();
     5.9 +    public abstract String sayHelloTo(String who);
    5.10 +// END: design.insert.superclass
    5.11 +}

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloFieldClass.java	Fri Aug 29 15:12:28 2008 +0200
     6.3 @@ -0,0 +1,7 @@
     6.4 +package org.apidesign.insertsuperclass.api;
     6.5 +
     6.6 +public class HelloFieldClass {
     6.7 +// BEGIN: design.insert.field.superclass
     6.8 +    public String field = "Hello";
     6.9 +// END: design.insert.field.superclass
    6.10 +}

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/samples/insertsuperclass/src-api1.0/org/apidesign/insertsuperclass/api/HelloInterface.java	Fri Aug 29 15:12:28 2008 +0200
     7.3 @@ -0,0 +1,8 @@
     7.4 +package org.apidesign.insertsuperclass.api;
     7.5 +
     7.6 +// BEGIN: design.insert.superinterface
     7.7 +public interface HelloInterface {
     7.8 +    public abstract String sayHello();
     7.9 +    public abstract String sayHelloTo(String who);
    7.10 +}
    7.11 +// END: design.insert.superinterface

     8.1 --- a/samples/insertsuperclass/src-api2.0/api/HelloClass.java	Fri Aug 29 15:08:04 2008 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,7 +0,0 @@
     8.4 -package api;
     8.5 -
     8.6 -// BEGIN: design.insert.superclass2
     8.7 -public abstract class HelloClass extends SimpleHelloClass {
     8.8 -// FINISH: design.insert.superclass2
     8.9 -    public abstract String sayHelloTo(String who);
    8.10 -}

     9.1 --- a/samples/insertsuperclass/src-api2.0/api/HelloFieldClass.java	Fri Aug 29 15:08:04 2008 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,6 +0,0 @@
     9.4 -package api;
     9.5 -
     9.6 -// BEGIN: design.insert.field.superclass2
     9.7 -public class HelloFieldClass extends SimpleHelloFieldClass {
     9.8 -}
     9.9 -// END: design.insert.field.superclass2

    10.1 --- a/samples/insertsuperclass/src-api2.0/api/HelloInterface.java	Fri Aug 29 15:08:04 2008 +0200
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,5 +0,0 @@
    10.4 -package api;
    10.5 -
    10.6 -public interface HelloInterface extends SimpleHelloInterface {
    10.7 -    public abstract String sayHelloTo(String who);
    10.8 -}

    11.1 --- a/samples/insertsuperclass/src-api2.0/api/SimpleHelloClass.java	Fri Aug 29 15:08:04 2008 +0200
    11.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.3 @@ -1,7 +0,0 @@
    11.4 -package api;
    11.5 -
    11.6 -// BEGIN: design.insert.superclass1
    11.7 -public abstract class SimpleHelloClass {
    11.8 -    public abstract String sayHello();
    11.9 -}
   11.10 -// END: design.insert.superclass1

    12.1 --- a/samples/insertsuperclass/src-api2.0/api/SimpleHelloFieldClass.java	Fri Aug 29 15:08:04 2008 +0200
    12.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.3 @@ -1,7 +0,0 @@
    12.4 -package api;
    12.5 -
    12.6 -// BEGIN: design.insert.field.superclass1
    12.7 -public abstract class SimpleHelloFieldClass {
    12.8 -    public String field = "Hello";
    12.9 -// FINISH: design.insert.field.superclass1
   12.10 -}

    13.1 --- a/samples/insertsuperclass/src-api2.0/api/SimpleHelloInterface.java	Fri Aug 29 15:08:04 2008 +0200
    13.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.3 @@ -1,5 +0,0 @@
    13.4 -package api;
    13.5 -
    13.6 -public interface SimpleHelloInterface {
    13.7 -    public abstract String sayHello();
    13.8 -}

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloClass.java	Fri Aug 29 15:12:28 2008 +0200
    14.3 @@ -0,0 +1,7 @@
    14.4 +package org.apidesign.insertsuperclass.api;
    14.5 +
    14.6 +// BEGIN: design.insert.superclass2
    14.7 +public abstract class HelloClass extends SimpleHelloClass {
    14.8 +// FINISH: design.insert.superclass2
    14.9 +    public abstract String sayHelloTo(String who);
   14.10 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloFieldClass.java	Fri Aug 29 15:12:28 2008 +0200
    15.3 @@ -0,0 +1,6 @@
    15.4 +package org.apidesign.insertsuperclass.api;
    15.5 +
    15.6 +// BEGIN: design.insert.field.superclass2
    15.7 +public class HelloFieldClass extends SimpleHelloFieldClass {
    15.8 +}
    15.9 +// END: design.insert.field.superclass2

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/HelloInterface.java	Fri Aug 29 15:12:28 2008 +0200
    16.3 @@ -0,0 +1,5 @@
    16.4 +package org.apidesign.insertsuperclass.api;
    16.5 +
    16.6 +public interface HelloInterface extends SimpleHelloInterface {
    16.7 +    public abstract String sayHelloTo(String who);
    16.8 +}

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloClass.java	Fri Aug 29 15:12:28 2008 +0200
    17.3 @@ -0,0 +1,7 @@
    17.4 +package org.apidesign.insertsuperclass.api;
    17.5 +
    17.6 +// BEGIN: design.insert.superclass1
    17.7 +public abstract class SimpleHelloClass {
    17.8 +    public abstract String sayHello();
    17.9 +}
   17.10 +// END: design.insert.superclass1

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloFieldClass.java	Fri Aug 29 15:12:28 2008 +0200
    18.3 @@ -0,0 +1,7 @@
    18.4 +package org.apidesign.insertsuperclass.api;
    18.5 +
    18.6 +// BEGIN: design.insert.field.superclass1
    18.7 +public abstract class SimpleHelloFieldClass {
    18.8 +    public String field = "Hello";
    18.9 +// FINISH: design.insert.field.superclass1
   18.10 +}

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/samples/insertsuperclass/src-api2.0/org/apidesign/insertsuperclass/api/SimpleHelloInterface.java	Fri Aug 29 15:12:28 2008 +0200
    19.3 @@ -0,0 +1,5 @@
    19.4 +package org.apidesign.insertsuperclass.api;
    19.5 +
    19.6 +public interface SimpleHelloInterface {
    19.7 +    public abstract String sayHello();
    19.8 +}

    20.1 --- a/samples/insertsuperclass/src-impl/impl/ImplClass.java	Fri Aug 29 15:08:04 2008 +0200
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,13 +0,0 @@
    20.4 -package impl;
    20.5 -
    20.6 -import api.HelloClass;
    20.7 -
    20.8 -public class ImplClass extends HelloClass {
    20.9 -    public String sayHello() {
   20.10 -        return "Hello Unknown!";
   20.11 -    }
   20.12 -
   20.13 -    public String sayHelloTo(String who) {
   20.14 -        return "Hello " + who + '!';
   20.15 -    }
   20.16 -}

    21.1 --- a/samples/insertsuperclass/src-impl/impl/ImplInterface.java	Fri Aug 29 15:08:04 2008 +0200
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,12 +0,0 @@
    21.4 -package impl;
    21.5 -
    21.6 -import api.HelloInterface;
    21.7 -public class ImplInterface implements HelloInterface {
    21.8 -    public String sayHello() {
    21.9 -        return "Hello Unknown!";
   21.10 -    }
   21.11 -
   21.12 -    public String sayHelloTo(String who) {
   21.13 -        return "Hello " + who + '!';
   21.14 -    }
   21.15 -}

    22.1 --- a/samples/insertsuperclass/src-impl/impl/Main.java	Fri Aug 29 15:08:04 2008 +0200
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,34 +0,0 @@
    22.4 -
    22.5 -package impl;
    22.6 -
    22.7 -import api.HelloClass;
    22.8 -import api.HelloFieldClass;
    22.9 -import api.HelloInterface;
   22.10 -
   22.11 -/**
   22.12 - *
   22.13 - * @author Jaroslav Tulach <jtulach@netbeans.org>
   22.14 - */
   22.15 -public class Main {
   22.16 -    public static void main(String[] args) throws Exception {
   22.17 -        boolean assertionsOn = false;
   22.18 -        assert assertionsOn = true;
   22.19 -        if (!assertionsOn) {
   22.20 -            throw new IllegalStateException("Enable assertions!");
   22.21 -        }
   22.22 -        
   22.23 -        HelloClass clazz = new ImplClass();
   22.24 -        assert "Hello Unknown!".equals(clazz.sayHello());
   22.25 -        assert "Hello Jaroslav!".equals(clazz.sayHelloTo("Jaroslav"));
   22.26 -        System.err.println("Who defines sayHello(): " + clazz.getClass().getSuperclass().getMethod("sayHello"));
   22.27 -
   22.28 -        HelloInterface iface = new ImplInterface();
   22.29 -        assert "Hello Unknown!".equals(iface.sayHello());
   22.30 -        assert "Hello Jaroslav!".equals(iface.sayHelloTo("Jaroslav"));
   22.31 -        System.err.println("Who defines sayHello(): " + iface.getClass().getInterfaces()[0].getMethod("sayHello"));
   22.32 -        
   22.33 -        HelloFieldClass fieldClass = new HelloFieldClass();
   22.34 -        assert "Hello".equals(fieldClass.field);
   22.35 -        System.err.println("Who defines field: " + fieldClass.getClass().getField("field"));
   22.36 -    }
   22.37 -}

    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/ImplClass.java	Fri Aug 29 15:12:28 2008 +0200
    23.3 @@ -0,0 +1,13 @@
    23.4 +package org.apidesign.insertsuperclass.test;
    23.5 +
    23.6 +import org.apidesign.insertsuperclass.api.HelloClass;
    23.7 +
    23.8 +public class ImplClass extends HelloClass {
    23.9 +    public String sayHello() {
   23.10 +        return "Hello Unknown!";
   23.11 +    }
   23.12 +
   23.13 +    public String sayHelloTo(String who) {
   23.14 +        return "Hello " + who + '!';
   23.15 +    }
   23.16 +}

    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/ImplInterface.java	Fri Aug 29 15:12:28 2008 +0200
    24.3 @@ -0,0 +1,13 @@
    24.4 +package org.apidesign.insertsuperclass.test;
    24.5 +
    24.6 +import org.apidesign.insertsuperclass.api.HelloInterface;
    24.7 +
    24.8 +public class ImplInterface implements HelloInterface {
    24.9 +    public String sayHello() {
   24.10 +        return "Hello Unknown!";
   24.11 +    }
   24.12 +
   24.13 +    public String sayHelloTo(String who) {
   24.14 +        return "Hello " + who + '!';
   24.15 +    }
   24.16 +}

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/samples/insertsuperclass/src-impl/org/apidesign/insertsuperclass/test/Main.java	Fri Aug 29 15:12:28 2008 +0200
    25.3 @@ -0,0 +1,34 @@
    25.4 +
    25.5 +package org.apidesign.insertsuperclass.test;
    25.6 +
    25.7 +import org.apidesign.insertsuperclass.api.HelloClass;
    25.8 +import org.apidesign.insertsuperclass.api.HelloFieldClass;
    25.9 +import org.apidesign.insertsuperclass.api.HelloInterface;
   25.10 +
   25.11 +/**
   25.12 + *
   25.13 + * @author Jaroslav Tulach <jtulach@netbeans.org>
   25.14 + */
   25.15 +public class Main {
   25.16 +    public static void main(String[] args) throws Exception {
   25.17 +        boolean assertionsOn = false;
   25.18 +        assert assertionsOn = true;
   25.19 +        if (!assertionsOn) {
   25.20 +            throw new IllegalStateException("Enable assertions!");
   25.21 +        }
   25.22 +        
   25.23 +        HelloClass clazz = new ImplClass();
   25.24 +        assert "Hello Unknown!".equals(clazz.sayHello());
   25.25 +        assert "Hello Jaroslav!".equals(clazz.sayHelloTo("Jaroslav"));
   25.26 +        System.err.println("Who defines sayHello(): " + clazz.getClass().getSuperclass().getMethod("sayHello"));
   25.27 +
   25.28 +        HelloInterface iface = new ImplInterface();
   25.29 +        assert "Hello Unknown!".equals(iface.sayHello());
   25.30 +        assert "Hello Jaroslav!".equals(iface.sayHelloTo("Jaroslav"));
   25.31 +        System.err.println("Who defines sayHello(): " + iface.getClass().getInterfaces()[0].getMethod("sayHello"));
   25.32 +        
   25.33 +        HelloFieldClass fieldClass = new HelloFieldClass();
   25.34 +        assert "Hello".equals(fieldClass.field);
   25.35 +        System.err.println("Who defines field: " + fieldClass.getClass().getField("field"));
   25.36 +    }
   25.37 +}