1.1 --- a/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:07:15 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/build.xml	Sat Jun 14 10:07:17 2008 +0200
     1.3 @@ -35,6 +35,10 @@
     1.4              <param name="version" value="app-spring"/>
     1.5              <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/spring-2.5.jar"/>
     1.6          </antcall>
     1.7 +        <antcall target="-build-one">
     1.8 +            <param name="version" value="app-lookup"/>
     1.9 +            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    1.10 +        </antcall>
    1.11          
    1.12      </target>
    1.13      
    1.14 @@ -63,6 +67,12 @@
    1.15              <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes"/>
    1.16              <param name="main" value="org.apidesign.anagram.app.registergeneral.Main"/>
    1.17          </antcall>
    1.18 +        <echo level="info" message="Running lookup version"/>
    1.19 +        <antcall target="-run-one">
    1.20 +            <param name="version" value="app-lookup"/>
    1.21 +            <param name="cp" value="build/api/classes:build/word-static/classes:build/scrambler-simple/classes:build/gui/classes:../../libs/dist/org-openide-util.jar"/>
    1.22 +            <param name="main" value="org.apidesign.anagram.app.lookup.Main"/>
    1.23 +        </antcall>
    1.24      </target>
    1.25      
    1.26      <!-- support methods -->

     2.1 --- a/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:07:15 2008 +0200
     2.2 +++ b/samples/componentinjection/anagram-modular/nbproject/project.xml	Sat Jun 14 10:07:17 2008 +0200
     2.3 @@ -58,6 +58,12 @@
     2.4                      <encoding>UTF-8</encoding>
     2.5                  </source-folder>
     2.6                  <source-folder>
     2.7 +                    <label>src-app-lookup</label>
     2.8 +                    <type>java</type>
     2.9 +                    <location>src-app-lookup</location>
    2.10 +                    <encoding>UTF-8</encoding>
    2.11 +                </source-folder>
    2.12 +                <source-folder>
    2.13                      <label>Anagram Modular</label>
    2.14                      <location>.</location>
    2.15                      <encoding>UTF-8</encoding>
    2.16 @@ -128,6 +134,10 @@
    2.17                          <label>src-app-spring</label>
    2.18                          <location>src-app-spring</location>
    2.19                      </source-folder>
    2.20 +                    <source-folder style="packages">
    2.21 +                        <label>src-app-lookup</label>
    2.22 +                        <location>src-app-lookup</location>
    2.23 +                    </source-folder>
    2.24                      <source-file>
    2.25                          <location>build.xml</location>
    2.26                      </source-file>
    2.27 @@ -191,6 +201,12 @@
    2.28                  <source-level>1.5</source-level>
    2.29              </compilation-unit>
    2.30              <compilation-unit>
    2.31 +                <package-root>src-app-lookup</package-root>
    2.32 +                <classpath mode="compile">src-api:src-scrambler-simple:src-word-static:src-gui:../../libs/dist/org-openide-util.jar</classpath>
    2.33 +                <built-to>build/app-lookup/classes</built-to>
    2.34 +                <source-level>1.5</source-level>
    2.35 +            </compilation-unit>
    2.36 +            <compilation-unit>
    2.37                  <package-root>src-test</package-root>
    2.38                  <classpath mode="compile">src-new-api:../libs/dist/junit-4.4.jar</classpath>
    2.39                  <source-level>1.5</source-level>

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/AnagramsWithLookup.java	Sat Jun 14 10:07:17 2008 +0200
     3.3 @@ -0,0 +1,23 @@
     3.4 +package org.apidesign.anagram.app.lookup;
     3.5 +
     3.6 +import org.apidesign.anagram.api.Scrambler;
     3.7 +import org.apidesign.anagram.api.WordLibrary;
     3.8 +import org.apidesign.anagram.gui.Anagrams;
     3.9 +import org.openide.util.Lookup;
    3.10 +
    3.11 +class AnagramsWithLookup extends Anagrams {
    3.12 +
    3.13 +    public AnagramsWithLookup() {
    3.14 +    }
    3.15 +
    3.16 +    @Override
    3.17 +    protected WordLibrary getWordLibrary() {
    3.18 +        return Lookup.getDefault().lookup(WordLibrary.class);
    3.19 +    }
    3.20 +
    3.21 +    @Override
    3.22 +    protected Scrambler getScrambler() {
    3.23 +        return Lookup.getDefault().lookup(Scrambler.class);
    3.24 +    }
    3.25 +
    3.26 +}

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/samples/componentinjection/anagram-modular/src-app-lookup/org/apidesign/anagram/app/lookup/Main.java	Sat Jun 14 10:07:17 2008 +0200
     4.3 @@ -0,0 +1,15 @@
     4.4 +package org.apidesign.anagram.app.lookup;
     4.5 +
     4.6 +import org.apidesign.anagram.api.Scrambler;
     4.7 +import org.apidesign.anagram.api.UI;
     4.8 +import org.apidesign.anagram.api.WordLibrary;
     4.9 +import org.apidesign.anagram.gui.Anagrams;
    4.10 +
    4.11 +public final class Main {
    4.12 +    private Main() { }
    4.13 +    
    4.14 +    public static void main(String[] args) throws Exception {
    4.15 +        UI ui = new AnagramsWithLookup();
    4.16 +        ui.display();
    4.17 +    }
    4.18 +}

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/samples/componentinjection/anagram-modular/src-scrambler-simple/META-INF/services/org.apidesign.anagram.api.Scrambler	Sat Jun 14 10:07:17 2008 +0200
     5.3 @@ -0,0 +1,1 @@
     5.4 +org.apidesign.anagram.scramblersimple.SimpleScrambler