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

diff -r 2b19d24a755f -r ce3b323add40 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:12 2008 +0200
+++ b/samples/apifest1/day2/stackbasedsolution/src/org/netbeans/apifest/boolcircuit/Circuit2.java	Sat Jun 14 10:08:14 2008 +0200
@@ -1,12 +1,10 @@
 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 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/build.xml
--- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:14 2008 +0200
@@ -43,10 +43,6 @@
             <param name="version" value="app-lookup"/>
             <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
         </antcall>
-        <antcall target="-build-one">
-            <param name="version" value="app-serviceloader"/>
-            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
-        </antcall>
         
     </target>
     
@@ -87,11 +83,6 @@
             <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/org-openide-util.jar"/>
             <param name="main" value="org.apidesign.anagram.app.lookup.Main"/>
         </antcall>
-        <antcall target="-run-one">
-            <param name="version" value="app-serviceloader"/>
-            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
-            <param name="main" value="org.apidesign.anagram.app.serviceloader.Main"/>
-        </antcall>
     </target>
     
     <!-- support methods -->
@@ -99,13 +90,11 @@
     <target name="-libraries">
         <ant dir="../../libs/"/>
         
-        <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
+        <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
     </target>
 
     <target name="-run-one">
-        <java classpath="${cp}:build/${version}/classes" classname="${main}">
-            <jvmarg value="-Danagram.version=${version}"/>
-        </java>
+        <java classpath="${cp}:build/${version}/classes" classname="${main}"/>
     </target>
     
     <target name="-build-one">
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/nbproject/project.xml
--- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:14 2008 +0200
@@ -10,11 +10,6 @@
             <properties/>
             <folders>
                 <source-folder>
-                    <label>Anagram Modular</label>
-                    <location>.</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
-                <source-folder>
                     <label>src-api</label>
                     <type>java</type>
                     <location>src-api</location>
@@ -75,15 +70,8 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
-                    <label>src-app-serviceloader</label>
-                    <type>java</type>
-                    <location>src-app-serviceloader</location>
-                    <encoding>UTF-8</encoding>
-                </source-folder>
-                <source-folder>
-                    <label>src-test</label>
-                    <type>java</type>
-                    <location>src-test</location>
+                    <label>Anagram Modular</label>
+                    <location>.</location>
                     <encoding>UTF-8</encoding>
                 </source-folder>
             </folders>
@@ -118,56 +106,6 @@
                 <location>build/api/classes</location>
                 <build-target>build</build-target>
             </export>
-            <export>
-                <type>folder</type>
-                <location>build/word-static/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/scrambler-simple/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/gui/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-register/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-register/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-property/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-spring/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-spring-scan/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-lookup/classes</location>
-                <build-target>build</build-target>
-            </export>
-            <export>
-                <type>folder</type>
-                <location>build/app-serviceloader/classes</location>
-                <build-target>build</build-target>
-            </export>
             <view>
                 <items>
                     <source-folder style="packages">
@@ -210,14 +148,6 @@
                         <label>src-app-lookup</label>
                         <location>src-app-lookup</location>
                     </source-folder>
-                    <source-folder style="packages">
-                        <label>src-app-serviceloader</label>
-                        <location>src-app-serviceloader</location>
-                    </source-folder>
-                    <source-folder style="packages">
-                        <label>src-test</label>
-                        <location>src-test</location>
-                    </source-folder>
                     <source-file>
                         <location>build.xml</location>
                     </source-file>
@@ -293,12 +223,6 @@
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
-                <package-root>src-app-serviceloader</package-root>
-                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui</classpath>
-                <built-to>build/app-serviceloader/classes</built-to>
-                <source-level>1.5</source-level>
-            </compilation-unit>
-            <compilation-unit>
                 <package-root>src-test</package-root>
                 <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
                 <source-level>1.5</source-level>
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java
--- a/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:14 2008 +0200
@@ -5,7 +5,6 @@
 import org.apidesign.anagram.gui.Anagrams;
 import org.openide.util.Lookup;
 
-// BEGIN: anagram.lookup.Anagrams
 class AnagramsWithLookup extends Anagrams {
 
     public AnagramsWithLookup() {
@@ -22,4 +21,3 @@
     }
 
 }
-// END: anagram.lookup.Anagrams
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/AnagramsAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
@@ -12,12 +12,11 @@
  * use the annotation directly there.
  */
 
-// BEGIN: anagram.spring.autowire.Anagrams
 @Service("ui")
 public class AnagramsAnnotated extends AnagramsWithConstructor {
     @Autowired
     public AnagramsAnnotated(WordLibrary library, Scrambler scrambler) {
         super(library, scrambler);
     }
+
 }
-// END: anagram.spring.autowire.Anagrams
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/SimpleScramblerAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
@@ -9,10 +9,7 @@
  * use the annotation directly there.
  */
 
-// BEGIN: anagram.spring.autowire.Scrambler
+
 @Service
 public class SimpleScramblerAnnotated extends SimpleScrambler {
-    public SimpleScramblerAnnotated() {
-    }
 }
-// END: anagram.spring.autowire.Scrambler
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/StaticWordLibraryAnnotated.java	Sat Jun 14 10:08:14 2008 +0200
@@ -10,10 +10,6 @@
  */
 
 
-// BEGIN: anagram.spring.autowire.WordLibrary
 @Service
 public class StaticWordLibraryAnnotated extends StaticWordLibrary {
-    public StaticWordLibraryAnnotated() {
-    }
 }
-// END: anagram.spring.autowire.WordLibrary
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml
--- a/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring-scan/org/apidesign/anagram/app/springscan/conf.xml	Sat Jun 14 10:08:14 2008 +0200
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
- <!-- BEGIN: anagram.spring.autowire.xml -->
-<beans 
-  xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans 
-    http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context-2.5.xsd"
->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+               
      <context:component-scan base-package="org.apidesign.anagram.app"/>
-</beans>
- <!-- END: anagram.spring.autowire.xml -->
+     
+</beans>
\ No newline at end of file
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java
--- a/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/Main.java	Sat Jun 14 10:08:14 2008 +0200
@@ -6,8 +6,7 @@
 
 public final class Main {
     private Main() { }
-
-    // BEGIN: anagram.spring.main
+    
     public static void main(String[] args) throws Exception {
         ApplicationContext context = new ClassPathXmlApplicationContext(
             "org/apidesign/anagram/app/spring/conf.xml"
@@ -15,5 +14,4 @@
         UI ui = (UI)context.getBean("ui", UI.class);
         ui.display();
     }
-    // END: anagram.spring.main
 }
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml
--- a/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-spring/org/apidesign/anagram/app/spring/conf.xml	Sat Jun 14 10:08:14 2008 +0200
@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- BEGIN: anagram.spring.xml -->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans 
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
->
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-    <bean 
-        id="wordLibrary" 
-        class="org.apidesign.anagram.wordstatic.StaticWordLibrary"
-    />
-    <bean 
-        id="scrambler" 
-        class="org.apidesign.anagram.scramblersimple.SimpleScrambler"
-    />
-    <bean 
-        id="ui" 
-        class="org.apidesign.anagram.gui.AnagramsWithConstructor" 
-        autowire="autodetect"
-    />
-</beans>
-<!-- END: anagram.spring.xml -->
-
+    <bean id="wordLibrary" class="org.apidesign.anagram.wordstatic.StaticWordLibrary"/>
+    <bean id="scrambler" class="org.apidesign.anagram.scramblersimple.SimpleScrambler"/>
+    <bean id="ui" class="org.apidesign.anagram.gui.AnagramsWithConstructor" autowire="autodetect"/>
+</beans>
\ No newline at end of file
diff -r 2b19d24a755f -r ce3b323add40 samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java
--- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:14 2008 +0200
@@ -14,14 +14,6 @@
     public Anagrams() {
         initComponents();        
         getRootPane().setDefaultButton(guessButton);
-        
-        String version = System.getProperty("anagram.version");
-        if (version != null) {
-            if (version.startsWith("app-")) {
-                version = version.substring(4);
-            }
-            setTitle("Anagrams - " + version + " version");
-        }
     }
     
     protected abstract WordLibrary getWordLibrary();
diff -r 2b19d24a755f -r ce3b323add40 samples/composition/src-test/api/ArithmeticaTest.java
--- a/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/composition/src-test/api/ArithmeticaTest.java	Sat Jun 14 10:08:14 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 2b19d24a755f -r ce3b323add40 samples/composition/src-test/api/Factorial.java
--- a/samples/composition/src-test/api/Factorial.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/composition/src-test/api/Factorial.java	Sat Jun 14 10:08:14 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 2b19d24a755f -r ce3b323add40 samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java
--- a/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/delegatingwriter/test/org/apidesign/delegatingwriter/CryptoWriter.java	Sat Jun 14 10:08:14 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 2b19d24a755f -r ce3b323add40 samples/libs/build.xml
--- a/samples/libs/build.xml	Sat Jun 14 10:08:12 2008 +0200
+++ b/samples/libs/build.xml	Sat Jun 14 10:08:14 2008 +0200
@@ -25,6 +25,16 @@
             <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 -->