1.1 --- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:35 2008 +0200
     1.2 +++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:08:42 2008 +0200
     1.3 @@ -28,6 +28,7 @@
     1.4      protected abstract Scrambler getScrambler();
     1.5      
     1.6      public void display() {
     1.7 +        initWord();
     1.8          setVisible(true);
     1.9      }
    1.10  // FINISH: anagram.ui.Anagrams
    1.11 @@ -35,10 +36,12 @@
    1.12      String original;
    1.13      String scrambled;
    1.14      
    1.15 -    @Override
    1.16 -    public void addNotify() {
    1.17 -        super.addNotify();
    1.18 -        initWord();
    1.19 +    public final String getOriginalWord() {
    1.20 +        return original;
    1.21 +    }
    1.22 +    
    1.23 +    public final String getScrambledWord() {
    1.24 +        return scrambled;
    1.25      }
    1.26      
    1.27      /** This method is called from within the constructor to
    1.28 @@ -190,13 +193,14 @@
    1.29          guessedWord.requestFocus();
    1.30      }//GEN-LAST:event_nextTrialActionPerformed
    1.31  
    1.32 -    private void initWord() {
    1.33 +    protected final void initWord() {
    1.34          
    1.35          String[] words = getWordLibrary().getWords();
    1.36          int index = wordIdx % words.length;
    1.37          
    1.38          original = words[index];
    1.39 -        scrambled = getScrambler().scramble(original);
    1.40 +        Scrambler scrambler = getScrambler();
    1.41 +        scrambled = scrambler != null ? scrambler.scramble(original) : original;
    1.42          
    1.43          scrambledWord.setText(scrambled);
    1.44      }