1.1 --- a/anagramdemo/anagrambase/src/main/java/org/apidesign/demo/anagramwithspringandlookup/Anagrams.java	Sun Apr 26 21:18:14 2009 +0200
     1.2 +++ b/anagramdemo/anagrambase/src/main/java/org/apidesign/demo/anagramwithspringandlookup/Anagrams.java	Mon Feb 08 14:51:45 2010 +0100
     1.3 @@ -1,18 +1,18 @@
     1.4  package org.apidesign.demo.anagramwithspringandlookup;
     1.5  
     1.6 -import org.springframework.beans.factory.annotation.Autowired;
     1.7 -
     1.8  /** 
     1.9   */
    1.10 +// BEGIN: anagramdemo.springlookup.Anagrams
    1.11  public class Anagrams extends javax.swing.JFrame implements UI {
    1.12      private WordLibrary wordLibrary;
    1.13      private Scrambler scrambler;
    1.14  
    1.15 -    @Autowired
    1.16      public Anagrams(WordLibrary w, Scrambler s) {
    1.17          wordLibrary = w;
    1.18          scrambler = s;
    1.19 +        init();
    1.20      }
    1.21 +// FINISH: anagramdemo.springlookup.Anagrams
    1.22      
    1.23      private WordLibrary getWordLibrary() {
    1.24          return wordLibrary;
    1.25 @@ -29,7 +29,7 @@
    1.26      String original;
    1.27      String scrambled;
    1.28      
    1.29 -    public Anagrams() {
    1.30 +    private void init() {
    1.31          initComponents();        
    1.32          getRootPane().setDefaultButton(guessButton);
    1.33          
    1.34 @@ -202,8 +202,8 @@
    1.35          int index = wordIdx % words.length;
    1.36          
    1.37          original = words[index];
    1.38 -        Scrambler scrambler = getScrambler();
    1.39 -        scrambled = scrambler != null ? scrambler.scramble(original) : original;
    1.40 +        Scrambler tmp = getScrambler();
    1.41 +        scrambled = tmp != null ? tmp.scramble(original) : original;
    1.42          
    1.43          scrambledWord.setText(scrambled);
    1.44      }