diff -r 266127621c8f -r 763bf709a318 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:35 2008 +0200 +++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java Sat Jun 14 10:08:42 2008 +0200 @@ -28,6 +28,7 @@ protected abstract Scrambler getScrambler(); public void display() { + initWord(); setVisible(true); } // FINISH: anagram.ui.Anagrams @@ -35,10 +36,12 @@ String original; String scrambled; - @Override - public void addNotify() { - super.addNotify(); - initWord(); + public final String getOriginalWord() { + return original; + } + + public final String getScrambledWord() { + return scrambled; } /** This method is called from within the constructor to @@ -190,13 +193,14 @@ guessedWord.requestFocus(); }//GEN-LAST:event_nextTrialActionPerformed - private void initWord() { + protected final void initWord() { String[] words = getWordLibrary().getWords(); int index = wordIdx % words.length; original = words[index]; - scrambled = getScrambler().scramble(original); + Scrambler scrambler = getScrambler(); + scrambled = scrambler != null ? scrambler.scramble(original) : original; scrambledWord.setText(scrambled); }