# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430814 -7200
# Node ID 3fb53f65db570ca009e091797059a79580c11d79
# Parent  fc45e7b76ee88993e12e9a46f50e516112a7ec30
Example with registration methods is working

diff -r fc45e7b76ee8 -r 3fb53f65db57 samples/componentinjection/anagram-modular/build.xml
--- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:06:53 2008 +0200
+++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:06:54 2008 +0200
@@ -8,28 +8,30 @@
     <target name="build" depends="-libraries">
         <antcall target="-build-one">
             <param name="version" value="api"/>
+            <param name="cp" value=""/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="word-static"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="scrambler-simple"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="gui"/>
+        </antcall>
+        <antcall target="-build-one">
+            <param name="version" value="app-register"/>
+            <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/new-api/classes:${junit.jar}"/>
-        </antcall>
     </target>
     
-    <target name="test">
-        <antcall target="-do-test">
-            <param name="nodebug" value="true"/>
-        </antcall>
-    </target>
-        
-    <target name="-do-test" depends="build">
+    <target name="test" depends="build">
         <echo level="info" message="Running the tests with bridge enabled. This should succeeds."/>
         <antcall target="-run-one">
-            <param name="test.cp" value="build/new-api/classes:build/bridge/classes"/>
-        </antcall>
-        <echo level="info" message="Running the tests without bridge module. This should fail."/>
-        <antcall target="-run-one">
-            <param name="test.cp" value="build/new-api/classes"/>
+            <param name="version" value="app-register"/>
+            <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.register.Main"/>
         </antcall>
     </target>
     
@@ -41,43 +43,15 @@
         <property name="junit.jar" location="../libs/dist/junit-4.4.jar"/>
     </target>
 
-    <target name="-debug-one" if="netbeans.home" unless="nodebug">
-        <nbjpdastart addressproperty="jpda.address" name="MessageDigest and Bridges" transport="dt_socket" >
-            <sourcepath path="src-new-api:src-bridge:src-test:build/test/classes"/>
-            <classpath path="build/new-api/classes:build/bridge/classes:build/test/classes"/>
-        </nbjpdastart>
-        <property name="debug1" value="-Xdebug"/>
-        <property name="debug2" value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-    </target>
-    
-    <target name="-run-one" depends="-debug-one">
-        <property name="debug1" value="-Dn1"/>
-        <property name="debug2" value="-Dn2"/>
-        <property name="include" value="**/*Test"/>
-        <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="${include}.class"/>
-                </fileset>
-            </batchtest>
-            <classpath>
-                <path path="${test.cp}"/>
-                <path location="build/test/classes"/>
-                <path location="${junit.jar}"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-            <jvmarg value="${debug1}"/>
-            <jvmarg value="${debug2}"/>
-        </junit>
+    <target name="-run-one">
+        <java classpath="${cp}:build/${version}/classes" classname="${main}"/>
     </target>
     
     <target name="-build-one">
         <fail message="You need to specify version number" unless="version"/>
         
         <mkdir dir="build/${version}/classes"/>
-        <property name="cp" value=""/>
+        <property name="cp" value="build/api/classes"/>
         <javac 
             srcdir="src-${version}" 
             destdir="build/${version}/classes" 
diff -r fc45e7b76ee8 -r 3fb53f65db57 samples/componentinjection/anagram-modular/nbproject/project.xml
--- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:06:53 2008 +0200
+++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:06:54 2008 +0200
@@ -34,6 +34,12 @@
                     <encoding>UTF-8</encoding>
                 </source-folder>
                 <source-folder>
+                    <label>src-app-register</label>
+                    <type>java</type>
+                    <location>src-app-register</location>
+                    <encoding>UTF-8</encoding>
+                </source-folder>
+                <source-folder>
                     <label>Anagram Modular</label>
                     <location>.</location>
                     <encoding>UTF-8</encoding>
@@ -88,6 +94,10 @@
                         <label>src-gui</label>
                         <location>src-gui</location>
                     </source-folder>
+                    <source-folder style="packages">
+                        <label>src-app-register</label>
+                        <location>src-app-register</location>
+                    </source-folder>
                     <source-file>
                         <location>build.xml</location>
                     </source-file>
@@ -127,6 +137,12 @@
                 <source-level>1.5</source-level>
             </compilation-unit>
             <compilation-unit>
+                <package-root>src-app-register</package-root>
+                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui</classpath>
+                <built-to>build/app-register/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 fc45e7b76ee8 -r 3fb53f65db57 samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Launcher.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Launcher.java	Sat Jun 14 10:06:54 2008 +0200
@@ -0,0 +1,32 @@
+package org.apidesign.anagram.app.register;
+
+import org.apidesign.anagram.api.Scrambler;
+import org.apidesign.anagram.api.UI;
+import org.apidesign.anagram.api.WordLibrary;
+
+public final class Launcher {
+    private static Class<? extends WordLibrary> wordLibrary;
+    private static Class<? extends Scrambler> scrambler;
+    private static Class<? extends UI> ui;
+    
+    
+    private Launcher() {
+    }
+
+    
+    public static void registerWordLibrary(Class<? extends WordLibrary> libraryClass) {
+        wordLibrary = libraryClass;
+    }
+    public static void registerScrambler(Class<? extends Scrambler> scramblerClass) {
+        scrambler = scramblerClass;
+    }
+    public static void registerUI(Class<? extends UI> uiClass) {
+        ui = uiClass;
+    }
+    
+    public static UI launch() throws Exception {
+        WordLibrary w = wordLibrary.newInstance();
+        Scrambler s = scrambler.newInstance();
+        return ui.getConstructor(WordLibrary.class, Scrambler.class).newInstance(w, s);
+    }
+}
diff -r fc45e7b76ee8 -r 3fb53f65db57 samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Main.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Main.java	Sat Jun 14 10:06:54 2008 +0200
@@ -0,0 +1,21 @@
+package org.apidesign.anagram.app.register;
+
+import org.apidesign.anagram.api.UI;
+import org.apidesign.anagram.gui.AnagramsWithConstructor;
+import org.apidesign.anagram.scramblersimple.SimpleScrambler;
+import org.apidesign.anagram.wordstatic.StaticWordLibrary;
+
+public final class Main {
+    private Main() { }
+    
+    public static void main(String[] args) throws Exception {
+        Launcher.registerScrambler(SimpleScrambler.class);
+        Launcher.registerWordLibrary(StaticWordLibrary.class);
+        Launcher.registerUI(AnagramsWithConstructor.class);
+        
+        UI ui = Launcher.launch();
+        ui.display();
+    }
+    
+    
+}
diff -r fc45e7b76ee8 -r 3fb53f65db57 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:06:53 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:06:54 2008 +0200
@@ -18,13 +18,19 @@
     /** Creates new form Anagrams */
     public Anagrams() {
         initComponents();        
-        initWord();
         getRootPane().setDefaultButton(guessButton);
     }
     
     protected abstract WordLibrary getWordLibrary();
     protected abstract Scrambler getScrambler();
     
+    
+    @Override
+    public void addNotify() {
+        super.addNotify();
+        initWord();
+    }
+    
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
diff -r fc45e7b76ee8 -r 3fb53f65db57 samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java	Sat Jun 14 10:06:54 2008 +0200
@@ -0,0 +1,29 @@
+package org.apidesign.anagram.gui;
+
+import org.apidesign.anagram.api.Scrambler;
+import org.apidesign.anagram.api.WordLibrary;
+
+public final class AnagramsWithConstructor extends Anagrams {
+    
+    private final WordLibrary library;
+    private final Scrambler scrambler;
+
+    public AnagramsWithConstructor(WordLibrary library, Scrambler scrambler) {
+        this.library = library;
+        this.scrambler = scrambler;
+    }
+
+    @Override
+    protected WordLibrary getWordLibrary() {
+        return library;
+    }
+
+    @Override
+    protected Scrambler getScrambler() {
+        return scrambler;
+    }
+
+    public void display() {
+        setVisible(true);
+    }
+}