# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430892 -7200
# Node ID 2b19d24a755f0f0759373a5c6c0ce78d16a0ac48
# Parent  ae80e0b7f0f60e5627805287cd2028e2cc81d022
Scanner does not really need to override any visitXYZ methods that do default traversal

diff -r ae80e0b7f0f6 -r 2b19d24a755f samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java
--- a/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 10:08:06 2008 +0200
+++ b/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 10:08:12 2008 +0200
@@ -1,10 +1,12 @@
 package org.netbeans.apifest.boolcircuit;
 
+import java.util.Stack;
+
 /**
  */ 
-// BEGIN: apifest.day2.stackbasedsolution.Circuit2
+//BEGIN: apifest.day2.stackbasedsolution.Circuit2
 public interface Circuit2 extends Circuit {
     public double evaluate (double ... input) 
     throws IllegalArgumentException;
 }
-// END: apifest.day2.stackbasedsolution.Circuit2
+//END: apifest.day2.stackbasedsolution.Circuit2
diff -r ae80e0b7f0f6 -r 2b19d24a755f samples/composition/src-test/api/ArithmeticaTest.java
--- a/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 10:08:06 2008 +0200
+++ b/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 10:08:12 2008 +0200
@@ -22,7 +22,7 @@
         super.tearDown();
     }
 
-    // BEGIN: design.composition.arith.test
+    //BEGIN: design.composition.arith.test
     public void testSumTwo() {
         Arithmetica instance = new Arithmetica();
         assertEquals("+", 5, instance.sumTwo(3, 2));
@@ -40,6 +40,6 @@
         assertEquals("sum(1,1)=1", 1, instance.sumRange(1, 1));
         assertEquals("sum(10,1)=55", 55, instance.sumRange(10, 1));
     }
-    // END: design.composition.arith.test
+    //END: design.composition.arith.test
 
 }
diff -r ae80e0b7f0f6 -r 2b19d24a755f samples/composition/src-test/api/Factorial.java
--- a/samples/composition/src-test/api/Factorial.java	Sat Jun 14 10:08:06 2008 +0200
+++ b/samples/composition/src-test/api/Factorial.java	Sat Jun 14 10:08:12 2008 +0200
@@ -4,7 +4,7 @@
  * Arithmetica methods to do multiplication instead of
  * addition.
  */
-// BEGIN: design.composition.arith.factorial
+//BEGIN: design.composition.arith.factorial
 public final class Factorial extends Arithmetica {
     public static int factorial(int n) {
         return new Factorial().sumRange(1, n);
@@ -14,5 +14,5 @@
         return one * second;
     }
 }
-// END: design.composition.arith.factorial
+//END: design.composition.arith.factorial
 
diff -r ae80e0b7f0f6 -r 2b19d24a755f samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java
--- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 10:08:06 2008 +0200
+++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 10:08:12 2008 +0200
@@ -20,7 +20,7 @@
     }
 /* The above code is here to let us simulate different behaviours of the append
  * method. In reality, the class would just subclass BufferedWriter, as shown bellow:
- BEGIN: writer.CryptoWriter
+BEGIN: writer.CryptoWriter
 public class CryptoWriter extends BufferedWriter {
     public CryptoWriter(Writer out) {
         super(out);
diff -r ae80e0b7f0f6 -r 2b19d24a755f samples/libs/build.xml
--- a/samples/libs/build.xml	Sat Jun 14 10:08:06 2008 +0200
+++ b/samples/libs/build.xml	Sat Jun 14 10:08:12 2008 +0200
@@ -25,16 +25,6 @@
             <param name="library.include" value="**/org-netbeans-insane.jar"/>
             <param name="url" value="http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/ide9/org-netbeans-insane.nbm"/>
         </antcall>
-        <antcall target="-library-from-zip">
-            <param name="library" value="spring-2.5"/>
-            <param name="library.include" value="**/*spring*.jar"/>
-            <param name="url" value="http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/java2/org-netbeans-libs-springframework.nbm"/>
-        </antcall>
-        <antcall target="-library-from-zip">
-            <param name="library" value="commons-logging-1.1"/>
-            <param name="library.include" value="**/*commons*logg*.jar"/>
-            <param name="url" value="http://deadlock.netbeans.org/hudson/job/javadoc-nbms/lastSuccessfulBuild/artifact/nbbuild/nbms/ide9/org-netbeans-libs-commons_logging.nbm"/>
-        </antcall>
     </target>
     
     <!-- support methods -->
diff -r ae80e0b7f0f6 -r 2b19d24a755f samples/visitor/04-traversal/src-test/org/apidesign/test/visitor/CountNumbersTest.java
--- a/samples/visitor/04-traversal/src-test/org/apidesign/test/visitor/CountNumbersTest.java	Sat Jun 14 10:08:06 2008 +0200
+++ b/samples/visitor/04-traversal/src-test/org/apidesign/test/visitor/CountNumbersTest.java	Sat Jun 14 10:08:12 2008 +0200
@@ -17,10 +17,7 @@
         public boolean visitUnknown(Expression exp) {
             return true;
         }
-        public void visitPlus(Plus s) {
-            s.getFirst().visit(this);
-            s.getSecond().visit(this);
-        }
+        @Override
         public void visitNumber(Number n) {
             cnt++;
         }