finished 2nd part of phonebook

.idea/workspace.xml

@@ -2,9 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="cb125da0-90b8-46e4-b936-89bfc9d100db" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/PhoneBook.java" beforeDir="false" afterPath="$PROJECT_DIR$/PhoneBook.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/PhoneBookTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/PhoneBookTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.bluej" beforeDir="false" afterPath="$PROJECT_DIR$/package.bluej" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -15,21 +13,21 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="PhoneBook.java" pinned="false" current-in-tab="false">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file leaf-file-name="PhoneBook.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/PhoneBook.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" selection-start-line="9" selection-end-line="9" />
+            <state relative-caret-position="213">
+              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="PhoneBookTest.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="PhoneBookTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/PhoneBookTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="25" selection-start-line="25" selection-end-line="25" />
+            <state relative-caret-position="93">
+              <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
               <folding>
                 <element signature="e#581#582#0" expanded="true" />
                 <element signature="e#634#635#0" expanded="true" />
@@ -48,6 +46,8 @@
       <list>
         <option value="$PROJECT_DIR$/pets" />
         <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_1.java" />
+        <option value="$PROJECT_DIR$/PhoneBook.java" />
+        <option value="$PROJECT_DIR$/PhoneBookTest.java" />
       </list>
     </option>
   </component>
@@ -67,8 +67,8 @@
     <packageJsonPaths />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="202" />
-    <option name="y" value="167" />
+    <option name="x" value="39" />
+    <option name="y" value="107" />
     <option name="width" value="1401" />
     <option name="height" value="721" />
   </component>
@@ -107,8 +107,8 @@
           <select />
         </subPane>
       </pane>
-      <pane id="AndroidView" />
       <pane id="Scope" />
+      <pane id="AndroidView" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -186,14 +186,16 @@
       <option name="presentableId" value="Default" />
       <updated>1528392361016</updated>
       <workItem from="1528392362380" duration="10476000" />
+      <workItem from="1528750637434" duration="2893000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10476000" />
+    <option name="totallyTimeSpent" value="13369000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="202" y="167" width="1401" height="721" extended-state="0" />
+    <frame x="39" y="107" width="1401" height="721" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="5" />
       <window_info anchor="bottom" id="TODO" order="11" />
@@ -207,9 +209,8 @@
       <window_info anchor="bottom" id="Version Control" order="4" />
       <window_info anchor="bottom" id="Terminal" order="2" />
       <window_info id="Capture Tool" order="2" />
-      <window_info anchor="bottom" id="TypeScript" order="0" />
       <window_info id="Designer" order="0" />
-      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.24944812" />
+      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.2531273" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
@@ -217,12 +218,13 @@
       <window_info anchor="right" id="Theme Preview" order="2" />
       <window_info anchor="bottom" id="Debug" order="8" weight="0.4" />
       <window_info id="Favorites" order="3" side_tool="true" />
-      <window_info anchor="bottom" id="Find" order="6" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
+      <window_info anchor="bottom" id="TypeScript" order="0" />
       <window_info anchor="bottom" id="Message" order="5" />
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="6" />
     </layout>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -232,17 +234,28 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pets">
+    <entry file="file://$PROJECT_DIR$/PhoneBook.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
+        <state relative-caret-position="135">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/PhoneBook.java">
+    <entry file="file://$PROJECT_DIR$/PhoneBookTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" selection-start-line="9" selection-end-line="9" />
+        <state relative-caret-position="300">
+          <caret line="25" selection-start-line="25" selection-end-line="25" />
+          <folding>
+            <element signature="e#581#582#0" expanded="true" />
+            <element signature="e#634#635#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pets">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" lean-forward="true" selection-start-line="1" selection-end-line="1" />
         </state>
       </provider>
     </entry>
@@ -250,17 +263,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
           <caret line="2" column="9" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
-          <folding>
-            <element signature="e#59#60#0" expanded="true" />
-            <element signature="e#71#72#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/PhoneBookTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="25" selection-start-line="25" selection-end-line="25" />
+        <state relative-caret-position="93">
+          <caret line="18" column="38" selection-start-line="18" selection-start-column="38" selection-end-line="18" selection-end-column="38" />
           <folding>
             <element signature="e#581#582#0" expanded="true" />
             <element signature="e#634#635#0" expanded="true" />
@@ -268,5 +277,12 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/PhoneBook.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="213">
+          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

PhoneBook.java

@@ -4,84 +4,89 @@ import java.util.*;
  * Created by leon on 1/23/18.
  */
 public class PhoneBook {
-  String name;
-  String phoneNumber;
-  TreeMap<String, ArrayList<String>> phoneBook = new TreeMap<>();
+    String name;
+    String phoneNumber;
+    TreeMap<String, ArrayList<String>> phoneBook = new TreeMap<>();
 
-  public PhoneBook(TreeMap<String, ArrayList<String>> phoneBook) {
-    this.phoneBook = phoneBook;
-  }
+    public PhoneBook(TreeMap<String, ArrayList<String>> phoneBook) {
+        this.phoneBook = phoneBook;
+    }
 
-  public PhoneBook(){}
+    public PhoneBook(){}
 
-  public void add(String name, String phoneNumber){
-    ArrayList<String> list;
+    public void add(String name, String phoneNumber){
+        if (!phoneBook.containsKey(name)) {
+            ArrayList<String> list = new ArrayList<>();
+            list.add(phoneNumber);
+            phoneBook.put(name, list);          
+        } else {
 
-    if (!phoneBook.containsKey(name)) {
-      list = new ArrayList<>();
-      phoneBook.put(name, list);
-    }
-    else
-    {
-      list = phoneBook.get(name);
-      list.add(phoneNumber);
-      phoneBook.replace(name, list);
+            ArrayList<String> temp = phoneBook.get(name);
+            temp.add(phoneNumber);
+            phoneBook.replace(name, phoneBook.get(name), temp);//key,old,new
+
+        }   
     }
-  }
 
-  public void remove(String name){
-    phoneBook.remove(name);
-  }
+    public void remove(String name, String phoneNumber){
+        ArrayList<String> list = phoneBook.get(name);
 
-  public String lookup(String name){
-    ArrayList<String> numbers = phoneBook.get(name);
-    StringBuilder sb = new StringBuilder();
+        if(list.size() == 1) {
+            phoneBook.remove(name); 
+        } else {
+            ArrayList<String> temp = phoneBook.get(name);
+            temp.remove(phoneNumber);
+            phoneBook.replace(name,list,temp);
+        }
+    }
 
-    for (int i=0; i<numbers.size(); i++) {
-      sb.append(numbers.get(i));
-      if (i == numbers.size()-1) {
-        break;
-      } else {
-        sb.append(", ");
-      }
+    public void removeRecord(String name) {
+        phoneBook.remove(name);
     }
-    sb.append("");
-    return sb.toString();
-  }
 
-  public String reverseLookup(String phoneNumber) {
-    for (Map.Entry<String, ArrayList<String>> e : phoneBook.entrySet()) {
-      String name = e.getKey();
-      ArrayList<String> numbers = e.getValue();
+    public ArrayList<String> lookup(String name){
+        return phoneBook.get(name);
+    }
 
-      for (String s : numbers) {
-        if (s == phoneNumber) {
-          return name;
+    public String reverseLookup(String phoneNumber) {
+        // for each entry in phonebook
+        for (Map.Entry<String, ArrayList<String>> entry : phoneBook.entrySet()) {
+            // gets name
+            String name = entry.getKey();
+            // gets list of numbers
+            ArrayList<String> list = entry.getValue();
+            // if number equals the number we are looking for, return name
+            for (String number: list) {
+                if (number.equals(phoneNumber)) {
+                    return name;
+                } 
+            }           
         }
-      }
+        return "Not found";
     }
-    return "Name not found";
-  }
 
-  public String display() {
-    StringBuilder sb = new StringBuilder();
+    public String display() {
+        // build a string to display
+        StringBuilder sb = new StringBuilder();
+        
+        for (Map.Entry<String, ArrayList<String>> entry : phoneBook.entrySet()){
+            
+            String name = entry.getKey();
+            ArrayList<String> numbers = entry.getValue();
 
-    for (Map.Entry<String, ArrayList<String>> e : phoneBook.entrySet()){
-      String name = e.getKey();
-      ArrayList<String> numbers = e.getValue();
+            sb.append(name).append(" ");
 
-      sb.append(name).append(" ");
+            // for each number in element, append to name
+            for (int i = 0; i < numbers.size(); i++) {
+                sb.append(numbers.get(i));
 
-      for (int i=0; i<numbers.size(); i++) {
-        sb.append(numbers.get(i));
-        if (i == numbers.size()-1) {
-          break;
-        } else {
-          sb.append(", ");
+                // append a space if i is not the last number in list
+                if (i != numbers.size()-1) {
+                    sb.append(" ");
+                }
+            }
+            sb.append("\n");
         }
-      }
-      sb.append("");
+        return sb.toString();
     }
-    return sb.toString();
-  }
 }

PhoneBookTest.java

@@ -1,5 +1,4 @@
 
-
 import org.junit.Assert;
 import org.junit.After;
 import org.junit.Before;
@@ -32,7 +31,7 @@ public class PhoneBookTest
     @Before
     public void setUp()
     {
-      PhoneBook pb = new PhoneBook(phoneBook);
+        PhoneBook pb = new PhoneBook();
     }
 
     /**
@@ -48,74 +47,72 @@ public class PhoneBookTest
 
     // add entries
     @Test
-    public void testOne() { 
-      String expected = "Dog 222-444-5555\nZebra 111-222-3333\n";
+    public void testAdd() { 
+        String expected = "Zebra 111-222-3333 222-444-5555\n";
 
-      PhoneBook pb = new PhoneBook(phoneBook);
-      pb.add("Zebra", "111-222-3333");
-      pb.add("Dog", "222-444-5555");
+        PhoneBook pb = new PhoneBook();
+        pb.add("Zebra", "111-222-3333");
+        pb.add("Zebra", "222-444-5555");
 
-      String actual = pb.display();
+        String actual = pb.display();
 
-      Assert.assertEquals(expected, actual);
-    }
-    @Test
-    public void testTwo() {
-      String expected = "Dog 222-444-5555\n";
-      PhoneBook pb = new PhoneBook(phoneBook);
-        
-      pb.add("Zebra", "111-222-3333");
-      pb.add("Dog", "222-444-5555");
-      pb.remove("Zebra");
-        
-      String actual = pb.display();
-
-      Assert.assertEquals(expected, actual);  
-    }
-    @Test
-    public void TestThree() {
-      String expected = "222-444-5555";
-      PhoneBook pb = new PhoneBook(phoneBook);
-        
-      pb.add("Zebra", "111-222-3333");
-      pb.add("Dog", "222-444-5555");
-      
-      String actual = pb.lookup("Dog");
-        
-      Assert.assertEquals(expected, actual);
+        Assert.assertEquals(expected, actual);
     }
+
     @Test
-    public void TestFour() {
-      String expected = "Dog";
-      PhoneBook pb = new PhoneBook(phoneBook);
-        
-      pb.add("Zebra", "111-222-3333");
-      pb.add("Dog", "222-444-5555");
-      
-      String actual = pb.reverseLookup("222-444-5555");
-      Assert.assertEquals(expected, actual);
+    public void testRemove() {
+        String expected = "Zebra 222-444-5555\n";
+        PhoneBook pb = new PhoneBook(phoneBook);
+
+        pb.add("Zebra", "111-222-3333");
+        pb.add("Zebra", "222-444-5555");
+        pb.remove("Zebra", "111-222-3333");
+
+        String actual = pb.display();
+
+        Assert.assertEquals(expected, actual);  
     }
 
-    // Testing list of phonenumbers for an entry
     @Test
-    public void TestFive() {
-        String expected = "Dog 111-222-3333, 444-555-6666\n";
+    public void testRemoveRecord() {
+        String expected = "Zebra 222-444-5555\n";
         PhoneBook pb = new PhoneBook(phoneBook);
-        
+
         pb.add("Dog", "111-222-3333");
-        pb.add("Dog", "444-555-6666");
-        
+        pb.add("Dog", "333-444-5555");
+        pb.add("Zebra", "222-444-5555");
+        pb.removeRecord("Dog");
+
         String actual = pb.display();
-        Assert.assertEquals(expected, actual);
+
+        Assert.assertEquals(expected, actual);  
     }
-    
 
     @Test
-    public void Test2()
-    {
+    public void testLookup() {
+
+        ArrayList<String> expected = new ArrayList<>();
+        expected.add("111-222-3333");
+        expected.add("222-444-5555");
+        PhoneBook pb = new PhoneBook(phoneBook);
+
+        pb.add("Zebra", "111-222-3333");
+        pb.add("Zebra", "222-444-5555");
+
+        ArrayList<String> actual = pb.lookup("Zebra");
+        Assert.assertEquals(expected, actual);  
     }
 
-    
-}
+    @Test
+    public void testReverseLookup() {
+
+        String expected = "Zebra";    
+        PhoneBook pb = new PhoneBook(phoneBook);
 
+        pb.add("Zebra", "111-222-3333");
+        pb.add("Zebra", "222-444-5555");
 
+        String actual = pb.reverseLookup("222-444-5555");
+        Assert.assertEquals(expected, actual);  
+    }
+}

package.bluej

@@ -2,18 +2,18 @@
 dependency1.from=PhoneBookTest
 dependency1.to=PhoneBook
 dependency1.type=UsesDependency
-editor.fx.0.height=722
+editor.fx.0.height=800
 editor.fx.0.width=800
-editor.fx.0.x=590
-editor.fx.0.y=125
+editor.fx.0.x=486
+editor.fx.0.y=23
 objectbench.height=101
 objectbench.width=461
 package.divider.horizontal=0.6
 package.divider.vertical=0.8007380073800738
 package.editor.height=427
 package.editor.width=674
-package.editor.x=35
-package.editor.y=158
+package.editor.x=499
+package.editor.y=60
 package.frame.height=600
 package.frame.width=800
 package.numDependencies=1
@@ -38,5 +38,5 @@ target2.name=PhoneBook
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=100
-target2.x=70
-target2.y=70
+target2.x=80
+target2.y=100