# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1213430850 -7200
# Node ID 15d31c98a1296df6173af4437885be846d04faed
# Parent  e8d817c1bdc414236bf08d5d981780f8c24c124a
Making the examples more appropriate for the book

diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/Scrambler.java
--- a/samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/Scrambler.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/Scrambler.java	Sat Jun 14 10:07:30 2008 +0200
@@ -1,7 +1,8 @@
 
 package org.apidesign.anagram.api;
 
-
+// BEGIN: anagram.api.scrambler
 public interface Scrambler {
     public String scramble(String word);
 }
+// END: anagram.api.scrambler
diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/UI.java
--- a/samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/UI.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/UI.java	Sat Jun 14 10:07:30 2008 +0200
@@ -1,7 +1,8 @@
 
 package org.apidesign.anagram.api;
 
-
+// BEGIN: anagram.api.ui
 public interface UI {
     public void display();
 }
+// END: anagram.api.ui
diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/WordLibrary.java
--- a/samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/WordLibrary.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-api/org/apidesign/anagram/api/WordLibrary.java	Sat Jun 14 10:07:30 2008 +0200
@@ -1,7 +1,8 @@
 
 package org.apidesign.anagram.api;
 
-
+// BEGIN: anagram.api.library
 public interface WordLibrary {
     public String[] getWords();
 }
+// END: anagram.api.library
diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-app-property/org/apidesign/anagram/app/property/AnagramsWithProperties.java
--- a/samples/componentinjection/anagram-modular/src-app-property/org/apidesign/anagram/app/property/AnagramsWithProperties.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-property/org/apidesign/anagram/app/property/AnagramsWithProperties.java	Sat Jun 14 10:07:30 2008 +0200
@@ -10,7 +10,8 @@
     
     public AnagramsWithProperties() {
     }
-    
+
+    // BEGIN: anagram.property
     @Override
     protected WordLibrary getWordLibrary() {
         try {
@@ -44,4 +45,5 @@
             throw new IllegalStateException(ex);
         }
     }
+    // END: anagram.property
 }
diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-app-register-general/org/apidesign/anagram/app/registergeneral/Registry.java
--- a/samples/componentinjection/anagram-modular/src-app-register-general/org/apidesign/anagram/app/registergeneral/Registry.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-register-general/org/apidesign/anagram/app/registergeneral/Registry.java	Sat Jun 14 10:07:30 2008 +0200
@@ -4,11 +4,13 @@
 import java.util.Map;
 
 public final class Registry {
-    private static Map<Class<?>,Object[]> instances = new LinkedHashMap<Class<?>,Object[]>();
     
     private Registry() {
     }
-    
+
+    // BEGIN: anagram.registry
+    private static Map<Class<?>,Object[]> instances = 
+        new LinkedHashMap<Class<?>,Object[]>();
     public static void registerClass(Class<?> impl) {
         instances.put(impl, new Object[1]);
     }
@@ -28,5 +30,6 @@
         }
         return null;
     }
+    // END: anagram.registry
 }
 
diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Launcher.java
--- a/samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Launcher.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-app-register/org/apidesign/anagram/app/register/Launcher.java	Sat Jun 14 10:07:30 2008 +0200
@@ -4,6 +4,7 @@
 import org.apidesign.anagram.api.UI;
 import org.apidesign.anagram.api.WordLibrary;
 
+// BEGIN: anagram.programatic.register
 public final class Launcher {
     private static Class<? extends WordLibrary> wordLibrary;
     private static Class<? extends Scrambler> scrambler;
@@ -14,10 +15,14 @@
     }
 
     
-    public static void registerWordLibrary(Class<? extends WordLibrary> libraryClass) {
+    public static void registerWordLibrary(
+        Class<? extends WordLibrary> libraryClass
+    ) {
         wordLibrary = libraryClass;
     }
-    public static void registerScrambler(Class<? extends Scrambler> scramblerClass) {
+    public static void registerScrambler(
+        Class<? extends Scrambler> scramblerClass
+    ) {
         scrambler = scramblerClass;
     }
     public static void registerUI(Class<? extends UI> uiClass) {
@@ -27,6 +32,9 @@
     public static UI launch() throws Exception {
         WordLibrary w = wordLibrary.newInstance();
         Scrambler s = scrambler.newInstance();
-        return ui.getConstructor(WordLibrary.class, Scrambler.class).newInstance(w, s);
+        return ui.getConstructor(
+            WordLibrary.class, Scrambler.class
+        ).newInstance(w, s);
     }
 }
+// END: anagram.programatic.register
diff -r e8d817c1bdc4 -r 15d31c98a129 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:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/Anagrams.java	Sat Jun 14 10:07:30 2008 +0200
@@ -9,13 +9,8 @@
  *
  * @author  Dirk Ruiz, Jaroslav Tulach
  */
+// BEGIN: anagram.ui.Anagrams
 public abstract class Anagrams extends javax.swing.JFrame implements UI {
-    int wordIdx = 0;
-    String original;
-    String scrambled;
-    
-    
-    /** Creates new form Anagrams */
     public Anagrams() {
         initComponents();        
         getRootPane().setDefaultButton(guessButton);
@@ -24,10 +19,13 @@
     protected abstract WordLibrary getWordLibrary();
     protected abstract Scrambler getScrambler();
     
-    
     public void display() {
         setVisible(true);
     }
+// FINISH: anagram.ui.Anagrams
+    int wordIdx = 0;
+    String original;
+    String scrambled;
     
     @Override
     public void addNotify() {
diff -r e8d817c1bdc4 -r 15d31c98a129 samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java
--- a/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java	Sat Jun 14 10:07:27 2008 +0200
+++ b/samples/componentinjection/anagram-modular/src-gui/org/apidesign/anagram/gui/AnagramsWithConstructor.java	Sat Jun 14 10:07:30 2008 +0200
@@ -3,12 +3,15 @@
 import org.apidesign.anagram.api.Scrambler;
 import org.apidesign.anagram.api.WordLibrary;
 
+// BEGIN: anagram.ui.init
 public class AnagramsWithConstructor extends Anagrams {
     
     private final WordLibrary library;
     private final Scrambler scrambler;
 
-    public AnagramsWithConstructor(WordLibrary library, Scrambler scrambler) {
+    public AnagramsWithConstructor(
+        WordLibrary library, Scrambler scrambler
+    ) {
         this.library = library;
         this.scrambler = scrambler;
     }
@@ -22,7 +25,9 @@
     protected Scrambler getScrambler() {
         return scrambler;
     }
+// FINISH: anagram.ui.init
 
+    @Override
     public void display() {
         setVisible(true);
     }