# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430367 -7200
# Node ID 81d72f69fa42b2fe2655afcee9bd5ba79c033b82
# Parent  131332825eab3003ee76982c5813121d0117965c
Incorporating Patrick's changes. I am not reall sure about the changes after the war, it is really 'or' it cannot be 'and'. I will change that when I do the reading through the whole chapter.

diff -r 131332825eab -r 81d72f69fa42 samples/composition/build.xml
--- a/samples/composition/build.xml	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/composition/build.xml	Sat Jun 14 09:59:27 2008 +0200
@@ -12,6 +12,18 @@
         <antcall target="-build-one">
             <param name="version" value="api2.0"/>
         </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="api2.0-compat"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="api2.0-property"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="api2.0-enum"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="api2.0-runtime"/>
+        </antcall>
         
         <antcall target="-build-one">
             <param name="version" value="test"/>
@@ -28,6 +40,22 @@
         <antcall target="-run-one">
             <param name="version" value="api2.0"/>
         </antcall>
+        <echo level="info" message="Running the Implementation against Version 2.0 with compatible extension of the API. This should succeed."/>
+        <antcall target="-run-one">
+            <param name="version" value="api2.0-compat"/>
+        </antcall>
+        <echo level="info" message="Running the Implementation against Version 2.0 with property guarded extension of the API. This should succeed."/>
+        <antcall target="-run-one">
+            <param name="version" value="api2.0-property"/>
+        </antcall>
+        <echo level="info" message="Running the Implementation against Version 2.0 with enum guarded extension of the API. This should succeed."/>
+        <antcall target="-run-one">
+            <param name="version" value="api2.0-enum"/>
+        </antcall>
+        <echo level="info" message="Running the Implementation against Version 2.0 with runtime check in the API. This should succeed."/>
+        <antcall target="-run-one">
+            <param name="version" value="api2.0-runtime"/>
+        </antcall>
     </target>
     
     <!-- support methods -->
diff -r 131332825eab -r 81d72f69fa42 samples/composition/nbproject/project.xml
--- a/samples/composition/nbproject/project.xml	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/composition/nbproject/project.xml	Sat Jun 14 09:59:27 2008 +0200
@@ -23,11 +23,35 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
+                    <label>src-api2.0-compat</label>
+                    <type>java</type>
+                    <location>src-api2.0-compat</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>src-api2.0-property</label>
+                    <type>java</type>
+                    <location>src-api2.0-property</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>test</label>
                     <type>java</type>
                     <location>src-test</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
+                <source-folder>
+                    <label>src-api2.0-enum</label>
+                    <type>java</type>
+                    <location>src-api2.0-enum</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
+                    <label>src-api2.0-runtime</label>
+                    <type>java</type>
+                    <location>src-api2.0-runtime</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
             </folders>
             <ide-actions>
                 <action name="build">
@@ -39,6 +63,9 @@
                 <action name="test">
                     <target>test</target>
                 </action>
+                <action name="run">
+                    <target>test</target>
+                </action>
                 <action name="rebuild">
                     <target>clean</target>
                     <target>build</target>
@@ -55,6 +82,22 @@
                         <location>src-api2.0</location>
                     </source-folder>
                     <source-folder style="packages">
+                        <label>API Version 2.0, in compatible style</label>
+                        <location>src-api2.0-compat</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>API Version 2.0, with property</label>
+                        <location>src-api2.0-property</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>API Version 2.0, with enum</label>
+                        <location>src-api2.0-enum</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>API Version 2.0, with runtime inspection</label>
+                        <location>src-api2.0-runtime</location>
+                    </source-folder>
+                    <source-folder style="packages">
                         <label>Usage of the API</label>
                         <location>src-test</location>
                     </source-folder>
@@ -65,6 +108,7 @@
                 <context-menu>
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
+                    <ide-action name="run"/>
                     <ide-action name="clean"/>
                     <ide-action name="test"/>
                 </context-menu>
@@ -80,6 +124,22 @@
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
+                <package-root>src-api2.0-compat</package-root>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>src-api2.0-enum</package-root>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>src-api2.0-property</package-root>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>src-api2.0-runtime</package-root>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
                 <package-root>src-test</package-root>
                 <classpath mode="compile">src-api1.0:../libs/dist/junit-4.4.jar</classpath>
                 <source-level>1.5</source-level>
diff -r 131332825eab -r 81d72f69fa42 samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingTest.java
--- a/samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingTest.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/deadlock/test/org/apidesign/deadlock/startuplock/CLIHandlerBlockingTest.java	Sat Jun 14 09:59:27 2008 +0200
@@ -52,5 +52,5 @@
         public void close() throws SecurityException {
         }
     } // end of H
+}
 // END: test.capture.logs
-}
\ No newline at end of file
diff -r 131332825eab -r 81d72f69fa42 samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterOnCDImageTest.java
--- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterOnCDImageTest.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/BufferedWriterOnCDImageTest.java	Sat Jun 14 09:59:27 2008 +0200
@@ -82,7 +82,7 @@
         public int length() {
             return end - start;
         }
-// END: writer.bigseq
+// FINISH: writer.bigseq
 
         public char charAt(int index) {
             int ch = index % ('Z' - 'A' + 1);
diff -r 131332825eab -r 81d72f69fa42 samples/delegatingwriter/test/org/apidesign/delegatingwriter/CountingWriter.java
--- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CountingWriter.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CountingWriter.java	Sat Jun 14 09:59:27 2008 +0200
@@ -27,7 +27,7 @@
         counter += csq.length();
         return this;
     }
-// END: writer.CountingWriter
+// FINISH: writer.CountingWriter
 
     @Override
     public Writer append(CharSequence csq, int start, int end) throws IOException {
diff -r 131332825eab -r 81d72f69fa42 samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java
--- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 09:59:27 2008 +0200
@@ -62,7 +62,7 @@
         }
         return (char)(c + 1);
     }
-// END: writer.CryptoWriter
+// FINISH: writer.CryptoWriter
 
     /* delegates to write(cbuf, 0, cbuf.length)
     public void write(char[] cbuf) throws IOException {
diff -r 131332825eab -r 81d72f69fa42 samples/differentreturntype/src-api1.0/api/API.java
--- a/samples/differentreturntype/src-api1.0/api/API.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/differentreturntype/src-api1.0/api/API.java	Sat Jun 14 09:59:27 2008 +0200
@@ -5,7 +5,7 @@
 public abstract class API {
 // BEGIN: theory.binary.differentreturntype.api
     public static Icon getIcon() {
+        return null; // compute something
+    }
 // END: theory.binary.differentreturntype.api
-        return null;
-    }
 }
diff -r 131332825eab -r 81d72f69fa42 samples/differentreturntype/src-api2.0/api/API.java
--- a/samples/differentreturntype/src-api2.0/api/API.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/differentreturntype/src-api2.0/api/API.java	Sat Jun 14 09:59:27 2008 +0200
@@ -5,7 +5,7 @@
 public abstract class API {
 // BEGIN: theory.binary.differentreturntype.api2
     public static ImageIcon getIcon() {
-// END: theory.binary.differentreturntype.api2
         return null;
     }
+// END: theory.binary.differentreturntype.api2
 }
diff -r 131332825eab -r 81d72f69fa42 samples/insertsuperclass/src-api2.0/api/HelloClass.java
--- a/samples/insertsuperclass/src-api2.0/api/HelloClass.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/insertsuperclass/src-api2.0/api/HelloClass.java	Sat Jun 14 09:59:27 2008 +0200
@@ -2,6 +2,6 @@
 
 // BEGIN: design.insert.superclass2
 public abstract class HelloClass extends SimpleHelloClass {
-// END: design.insert.superclass2
+// FINISH: design.insert.superclass2
     public abstract String sayHelloTo(String who);
 }
diff -r 131332825eab -r 81d72f69fa42 samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java
--- a/samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/javabeans/test/org/apidesign/javabeans/use/toomany/MyHighlightsContainer.java	Sat Jun 14 09:59:27 2008 +0200
@@ -25,5 +25,5 @@
     public HighlightsSequence getHighlights(int start, int end) {
         return null; // implement
     }
+}
 // END: javabeans.with.MyHighlightsContainer
-}
\ No newline at end of file
diff -r 131332825eab -r 81d72f69fa42 samples/messagedigest/src-new-api/org/apidesign/spi/security/Digestor.java
--- a/samples/messagedigest/src-new-api/org/apidesign/spi/security/Digestor.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/messagedigest/src-new-api/org/apidesign/spi/security/Digestor.java	Sat Jun 14 09:59:27 2008 +0200
@@ -17,7 +17,7 @@
    protected abstract Data create(String algorithm); 
    protected abstract void update(Data data, ByteBuffer input);
    
-// END: day.end.bridges.Digestor   
+// FINISH: day.end.bridges.Digestor   
    
    
    static {
diff -r 131332825eab -r 81d72f69fa42 samples/primitiveconstants/src-impl/impl/Impl.java
--- a/samples/primitiveconstants/src-impl/impl/Impl.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/primitiveconstants/src-impl/impl/Impl.java	Sat Jun 14 09:59:27 2008 +0200
@@ -8,7 +8,7 @@
           throw new IllegalStateException("Wrong API version error!");
         }
     }
-// END: theory.binary.constants.impl
+// FINISH: theory.binary.constants.impl
     
     public static void main(String[] args) {
         System.err.println("main expects version: " + API.VERSION);
diff -r 131332825eab -r 81d72f69fa42 samples/privilegedcreator/test/accessprotectedmethod/MyDocument.java
--- a/samples/privilegedcreator/test/accessprotectedmethod/MyDocument.java	Sat Jun 14 09:59:25 2008 +0200
+++ b/samples/privilegedcreator/test/accessprotectedmethod/MyDocument.java	Sat Jun 14 09:59:27 2008 +0200
@@ -11,7 +11,7 @@
     final void writeLockAccess() {
         writeLock();
     }
-// END: public.accessor
+// FINISH: public.accessor
 
     @Override
     public Element getDefaultRootElement() {