Refactoring complete

PhoneBook.java

@@ -5,33 +5,28 @@ import java.util.*;
  */
 public class PhoneBook {
     
-    Map<String, ArrayList<String> > entries = new HashMap<String, ArrayList<String>>();
+    Map<String, ArrayList<String> > entries = new TreeMap<String, ArrayList<String>>();
     
-    public void addEntry(String name, String phoneNumber){
-        ArrayList<String> pn = new ArrayList<String>();
-        pn.add(phoneNumber);
-        this.entries.put(name, pn);
-    }
-    
-    public void addNumberTo(String name, String phoneNumber){
-        for(Map.Entry<String, ArrayList<String>> entry: this.entries.entrySet()){
-            if(name.equals(entry.getKey())){
-                entry.getValue().add(phoneNumber);
-                break;
-            }
-        }    
+    public void add(String name, String phoneNumber){
+        if(this.entries.get(name) != null){
+            this.entries.get(name).add(phoneNumber);
+        } else {
+            ArrayList<String> pn = new ArrayList<String>();
+            pn.add(phoneNumber);
+            this.entries.put(name, pn);
+        }
     }
     
     public void removePhoneNumber(String name, String phoneNumber){
-        for(Map.Entry<String, ArrayList<String>> entry: this.entries.entrySet()){
-            if(name.equals(entry.getKey())){
-                int indexOf = entry.getValue().indexOf(phoneNumber);
-                if(indexOf >= 0){
-                    entry.getValue().remove(indexOf);
-                    break;
-                }
-            }
-        }        
+        
+        ArrayList<String> numbers = this.entries.get(name);
+        
+        if(numbers != null){
+           int indexOf = numbers.indexOf(phoneNumber);
+           if(indexOf >= 0){
+               numbers.remove(indexOf);
+           }  
+        }
     }
     
     public void removeRecord(String name){
@@ -40,14 +35,15 @@ public class PhoneBook {
     
     public String lookUp(String name){
         StringBuilder sb = new StringBuilder();
-        for(Map.Entry<String, ArrayList<String>> entry: this.entries.entrySet()){
-            if(entry.getKey().equals(name)){
-                for(String pn : entry.getValue()){
-                    sb.append(pn);
-                }   
+        ArrayList<String> entry = this.entries.get(name);
+        
+        if(entry != null){
+            for(String phoneNumber : entry){
+                sb.append(phoneNumber);
             }
         }
-        return sb.toString();        
+        
+        return sb.toString();      
         
     }
     

PhoneBookTest.java

@@ -44,7 +44,7 @@ public class PhoneBookTest
     public void addEntry()
     {
         PhoneBook phoneBoo1 = new PhoneBook();
-        phoneBoo1.addEntry("nicholas", "3027387978");
+        phoneBoo1.add("nicholas", "3027387978");
         assertEquals("nicholas: 3027387978", phoneBoo1.display());
     }
 
@@ -52,8 +52,8 @@ public class PhoneBookTest
     public void addTwoNumberForOnePersonTest()
     {
         PhoneBook phoneBoo1 = new PhoneBook();
-        phoneBoo1.addEntry("nick", "302");
-        phoneBoo1.addNumberTo("nick", "103");
+        phoneBoo1.add("nick", "302");
+        phoneBoo1.add("nick", "103");
         assertEquals("nick: 302103", phoneBoo1.display());
     }
 
@@ -61,7 +61,7 @@ public class PhoneBookTest
     public void reverseLoopupTest()
     {
         PhoneBook phoneBoo1 = new PhoneBook();
-        phoneBoo1.addEntry("nick", "302");
+        phoneBoo1.add("nick", "302");
         assertEquals("nick", phoneBoo1.reverseLoopup("302"));
     }
 
@@ -69,7 +69,7 @@ public class PhoneBookTest
     public void lookupTest()
     {
         PhoneBook phoneBoo1 = new PhoneBook();
-        phoneBoo1.addEntry("nick", "302");
+        phoneBoo1.add("nick", "302");
         assertEquals("302", phoneBoo1.lookUp("nick"));
     }
 
@@ -77,7 +77,7 @@ public class PhoneBookTest
     public void RemoveRecordTest()
     {
         PhoneBook phoneBoo2 = new PhoneBook();
-        phoneBoo2.addEntry("m", "302");
+        phoneBoo2.add("m", "302");
         phoneBoo2.removeRecord("m");
         assertEquals("", phoneBoo2.lookUp("m"));
     }
@@ -86,8 +86,8 @@ public class PhoneBookTest
     public void removePhoneNumberTest()
     {
         PhoneBook phoneBoo1 = new PhoneBook();
-        phoneBoo1.addEntry("m", "123");
-        phoneBoo1.addNumberTo("m", "456");
+        phoneBoo1.add("m", "123");
+        phoneBoo1.add("m", "456");
         phoneBoo1.removePhoneNumber("m", "456");
         assertEquals("123", phoneBoo1.lookUp("m"));
     }

package.bluej

@@ -1,8 +1,11 @@
 #BlueJ package file
-editor.fx.0.height=0
-editor.fx.0.width=0
-editor.fx.0.x=0
-editor.fx.0.y=0
+dependency1.from=PhoneBookTest
+dependency1.to=PhoneBook
+dependency1.type=UsesDependency
+editor.fx.0.height=821
+editor.fx.0.width=1053
+editor.fx.0.x=560
+editor.fx.0.y=100
 objectbench.height=101
 objectbench.width=461
 package.divider.horizontal=0.6
@@ -13,8 +16,8 @@ package.editor.x=427
 package.editor.y=143
 package.frame.height=600
 package.frame.width=800
-package.numDependencies=0
-package.numTargets=1
+package.numDependencies=1
+package.numTargets=2
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -23,4 +26,17 @@ readme.name=@README
 readme.width=47
 readme.x=10
 readme.y=10
-
+target1.height=50
+target1.name=PhoneBookTest
+target1.showInterface=false
+target1.type=UnitTestTargetJunit4
+target1.width=120
+target1.x=100
+target1.y=10
+target2.height=50
+target2.name=PhoneBook
+target2.showInterface=false
+target2.type=ClassTarget
+target2.width=100
+target2.x=70
+target2.y=70