diff -r ba2d4fa4aa87 -r 5cb76f2cb8a0 anagramdemo/anagrambase/src/main/java/org/apidesign/demo/anagramwithspringandlookup/Anagrams.java --- a/anagramdemo/anagrambase/src/main/java/org/apidesign/demo/anagramwithspringandlookup/Anagrams.java Sun Apr 26 21:18:14 2009 +0200 +++ b/anagramdemo/anagrambase/src/main/java/org/apidesign/demo/anagramwithspringandlookup/Anagrams.java Mon Feb 08 14:51:45 2010 +0100 @@ -1,18 +1,18 @@ package org.apidesign.demo.anagramwithspringandlookup; -import org.springframework.beans.factory.annotation.Autowired; - /** */ +// BEGIN: anagramdemo.springlookup.Anagrams public class Anagrams extends javax.swing.JFrame implements UI { private WordLibrary wordLibrary; private Scrambler scrambler; - @Autowired public Anagrams(WordLibrary w, Scrambler s) { wordLibrary = w; scrambler = s; + init(); } +// FINISH: anagramdemo.springlookup.Anagrams private WordLibrary getWordLibrary() { return wordLibrary; @@ -29,7 +29,7 @@ String original; String scrambled; - public Anagrams() { + private void init() { initComponents(); getRootPane().setDefaultButton(guessButton); @@ -202,8 +202,8 @@ int index = wordIdx % words.length; original = words[index]; - Scrambler scrambler = getScrambler(); - scrambled = scrambler != null ? scrambler.scramble(original) : original; + Scrambler tmp = getScrambler(); + scrambled = tmp != null ? tmp.scramble(original) : original; scrambledWord.setText(scrambled); }