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); }