# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430915 -7200
# Node ID 266127621c8fbd1070208bd72eea36307bf9dd54
# Parent  c6f1ccdd37f36fccb5ca98935f89b2a38800103a
polishing of review42; future

diff -r c6f1ccdd37f3 -r 266127621c8f samples/componentinjection/anagram-modular/build.xml
--- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:31 2008 +0200
+++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:08:35 2008 +0200
@@ -47,14 +47,10 @@
             <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>
-        <antcall target="-build-one">
-            <param name="version" value="test"/>
-            <param name="cp" value="build/api/classes:build/gui/classes:build/app-serviceloader/classes:build/app-lookup/classes:${junit.jar}:${nbjunit.jar}:${insane.jar}"/>
-        </antcall>
         
     </target>
     
-    <target name="run" depends="build">
+    <target name="test" depends="build">
         <echo level="info" message="Running registerXYZ version"/>
         <antcall target="-run-one">
             <param name="version" value="app-register"/>
@@ -93,27 +89,17 @@
         </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:${junit.jar}:${nbjunit.jar}:${insane.jar}"/>
+            <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>
-
-    <target name="test" depends="build">
-        <echo level="info" message="Testing using MockServices"/>
-        <antcall target="-test-one">
-            <param name="version" value="app-test"/>
-            <param name="cp" value="build/api/classes:build/gui/classes:build/app-serviceloader/classes:build/app-lookup/classes:${junit.jar}:${nbjunit.jar}:${insane.jar}:../../libs/dist/org-openide-util.jar"/>
-        </antcall>
-    </target>
-        
+    
     <!-- support methods -->
     
     <target name="-libraries">
         <ant dir="../../libs/"/>
         
         <property name="junit.jar" location="../../libs/dist/junit-4.4.jar"/>
-        <property name="nbjunit.jar" location="../../libs/dist/org-netbeans-modules-nbjunit.jar"/>
-        <property name="insane.jar" location="../../libs/dist/org-netbeans-insane.jar"/>
     </target>
 
     <target name="-run-one">
@@ -140,22 +126,4 @@
             </fileset>
         </copy>
     </target>
-    <target name="-test-one">
-        <fail message="You need to specify API version number" unless="version"/>
-        <mkdir dir="build/testresults"/>
-        <junit dir="build/test/classes" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-            <batchtest todir="build/testresults">
-                <fileset dir="build/test/classes">
-                    <filename name="**/*Test.class"/>
-                </fileset>
-            </batchtest>
-            <classpath>
-                <path path="${cp}"/>
-                <path location="build/test/classes"/>
-                <path location="${junit.jar}"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
-    </target>
 </project>
diff -r c6f1ccdd37f3 -r 266127621c8f samples/componentinjection/anagram-modular/nbproject/project.xml
--- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:31 2008 +0200
+++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:08:35 2008 +0200
@@ -94,9 +94,6 @@
                 <action name="clean">
                     <target>clean</target>
                 </action>
-                <action name="run">
-                    <target>run</target>
-                </action>
                 <action name="test">
                     <target>test</target>
                 </action>
@@ -229,7 +226,6 @@
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
-                    <ide-action name="run"/>
                     <ide-action name="test"/>
                     <ide-action name="debug"/>
                 </context-menu>
@@ -304,7 +300,7 @@
             </compilation-unit>
             <compilation-unit>
                 <package-root>src-test</package-root>
-                <classpath mode="compile">src-api:../../libs/dist/junit-4.4.jar::../../libs/dist/org-netbeans-modules-nbjunit.jar:../../libs/dist/org-netbeans-insane.jar:src-gui:../../libs/dist/org-openide-util.jar:src-app-lookup:src-app-serviceloader</classpath>
+                <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
                 <source-level>1.5</source-level>
             </compilation-unit>
         </java-data>
diff -r c6f1ccdd37f3 -r 266127621c8f 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:31 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:08:35 2008 +0200
@@ -6,8 +6,6 @@
 import org.openide.util.Lookup;
 
 // BEGIN: anagram.lookup.Anagrams
-import org.openide.util.LookupEvent;
-import org.openide.util.LookupListener;
 class AnagramsWithLookup extends Anagrams {
 
     public AnagramsWithLookup() {
@@ -22,24 +20,6 @@
     protected Scrambler getScrambler() {
         return Lookup.getDefault().lookup(Scrambler.class);
     }
-// FINISH: anagram.lookup.Anagrams
-    
-    private Lookup.Result<Scrambler> scramblers = Lookup.getDefault().lookupResult(Scrambler.class);
-// BEGIN: anagram.lookup.Listeners      
-    private Lookup.Result<WordLibrary> libraries 
-        = Lookup.getDefault().lookupResult(WordLibrary.class);
-    private LookupListener listener = new LookupListener() {
-        public void resultChanged(LookupEvent ev) {
-            initWord();
-        }
-    };
-    {
-        libraries.addLookupListener(listener);
-// FINISH: anagram.lookup.Listeners      
-        
-        scramblers.addLookupListener(listener);
-        // initialize the results for listening
-        libraries.allItems();
-        scramblers.allItems();
-    }
+
 }
+// END: anagram.lookup.Anagrams
diff -r c6f1ccdd37f3 -r 266127621c8f samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/AnagramsWithServiceLoader.java
--- a/samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/AnagramsWithServiceLoader.java	Sat Jun 14 10:08:31 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-serviceloader/org/apidesign/anagram/app/serviceloader/AnagramsWithServiceLoader.java	Sat Jun 14 10:08:35 2008 +0200
@@ -1,6 +1,5 @@
 package org.apidesign.anagram.app.serviceloader;
 
-import java.util.Iterator;
 import org.apidesign.anagram.api.Scrambler;
 import org.apidesign.anagram.api.WordLibrary;
 import org.apidesign.anagram.gui.Anagrams;
@@ -14,14 +13,12 @@
 
     @Override
     protected WordLibrary getWordLibrary() {
-        Iterator<WordLibrary> it = ServiceLoader.load(WordLibrary.class).iterator();
-        return it.hasNext() ? it.next() : null;
+        return ServiceLoader.load(WordLibrary.class).iterator().next();
     }
 
     @Override
     protected Scrambler getScrambler() {
-        Iterator<Scrambler> it = ServiceLoader.load(Scrambler.class).iterator();
-        return it.hasNext() ? it.next() : null;
+        return ServiceLoader.load(Scrambler.class).iterator().next();
     }
 
 }
diff -r c6f1ccdd37f3 -r 266127621c8f 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:31 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:35 2008 +0200
@@ -28,7 +28,6 @@
     protected abstract Scrambler getScrambler();
     
     public void display() {
-        initWord();
         setVisible(true);
     }
 // FINISH: anagram.ui.Anagrams
@@ -36,12 +35,10 @@
     String original;
     String scrambled;
     
-    public final String getOriginalWord() {
-        return original;
-    }
-    
-    public final String getScrambledWord() {
-        return scrambled;
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        initWord();
     }
     
     /** This method is called from within the constructor to
@@ -193,14 +190,13 @@
         guessedWord.requestFocus();
     }//GEN-LAST:event_nextTrialActionPerformed
 
-    protected final void initWord() {
+    private void initWord() {
         
         String[] words = getWordLibrary().getWords();
         int index = wordIdx % words.length;
         
         original = words[index];
-        Scrambler scrambler = getScrambler();
-        scrambled = scrambler != null ? scrambler.scramble(original) : original;
+        scrambled = getScrambler().scramble(original);
         
         scrambledWord.setText(scrambled);
     }