final edits, cleaned up code

.idea/workspace.xml

@@ -2,14 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="11ae2380-b501-43a2-a9ac-78d83deebe8d" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/MySet.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/TestArrayList.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/TestMap.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/TestSet.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/.deleteme" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/.deleteme" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyMap.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -45,12 +38,12 @@
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
           <entry key="dummy" value="28" />
-          <entry key="java" value="8107" />
+          <entry key="java" value="8130" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="8107" />
+          <entry key="JAVA" value="8130" />
           <entry key="PLAIN_TEXT" value="28" />
         </counts>
       </usages-collector>
@@ -63,8 +56,8 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="180">
-                  <caret line="103" column="39" selection-start-line="103" selection-start-column="39" selection-end-line="103" selection-end-column="39" />
+                <state relative-caret-position="745">
+                  <caret line="52" column="49" lean-forward="true" selection-start-line="52" selection-start-column="49" selection-end-line="52" selection-end-column="49" />
                 </state>
               </provider>
             </entry>
@@ -72,7 +65,7 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-160">
+                <state relative-caret-position="-14">
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -83,8 +76,8 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="150">
-                  <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
+                <state relative-caret-position="585">
+                  <caret line="39" column="45" selection-start-line="39" selection-start-column="45" selection-end-line="39" selection-end-column="45" />
                 </state>
               </provider>
             </entry>
@@ -96,7 +89,7 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/TestArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="-620">
+                <state relative-caret-position="405">
                   <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
                   <folding>
                     <element signature="imports" expanded="true" />
@@ -185,11 +178,11 @@
         <option value="$PROJECT_DIR$/src/main/java/ArrayList.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyNewArrayList.java" />
         <option value="$PROJECT_DIR$/src/test/java/TestArrayList.java" />
-        <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
         <option value="$PROJECT_DIR$/src/test/java/TestSet.java" />
         <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
         <option value="$PROJECT_DIR$/src/test/java/TestMap.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
       </list>
     </option>
   </component>
@@ -350,26 +343,11 @@
       <option name="presentableId" value="Default" />
       <updated>1542237905466</updated>
       <workItem from="1542237907308" duration="25454000" />
-      <workItem from="1542390933928" duration="34652000" />
+      <workItem from="1542390933928" duration="35226000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="TestSet - 2018.11.17 at 13h 02m 01s.xml">
-      <configuration name="TestSet" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestSet - 2018.11.17 at 13h 03m 28s.xml">
-      <configuration name="TestSet" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestSet_testContainsAll - 2018.11.17 at 13h 05m 23s.xml">
-      <configuration name="TestSet.testContainsAll" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestSet - 2018.11.17 at 13h 05m 32s.xml">
-      <configuration name="TestSet" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestSet_testContainsAll - 2018.11.17 at 13h 18m 39s.xml">
-      <configuration name="TestSet.testContainsAll" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="TestArrayList - 2018.11.17 at 13h 20m 08s.xml">
       <configuration name="TestArrayList" configurationId="JUnit" />
     </history-entry>
@@ -385,15 +363,30 @@
     <history-entry file="TestArrayList_testRemove - 2018.11.17 at 13h 28m 27s.xml">
       <configuration name="TestArrayList.testRemove" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="TestArrayList_testRemove - 2018.11.17 at 13h 29m 27s.xml">
+      <configuration name="TestArrayList.testRemove" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestArrayList_testRemove - 2018.11.17 at 13h 29m 42s.xml">
+      <configuration name="TestArrayList.testRemove" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestArrayList_testRemove - 2018.11.17 at 13h 29m 56s.xml">
+      <configuration name="TestArrayList.testRemove" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="TestArrayList - 2018.11.17 at 13h 30m 38s.xml">
+      <configuration name="TestArrayList" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="All_in_generics - 2018.11.17 at 13h 30m 48s.xml">
+      <configuration name="All in generics" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="60106000" />
+    <option name="totallyTimeSpent" value="60680000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-336" y="-1055" width="1883" height="1055" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.117870726" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.117870726" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="UI Designer" order="3" />
@@ -401,7 +394,7 @@
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32917964" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.20872274" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.3748702" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.3748702" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -457,22 +450,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-160">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="5" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/TestMap.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1125">
@@ -502,23 +479,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/TestArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="103" column="39" selection-start-line="103" selection-start-column="39" selection-end-line="103" selection-end-column="39" />
+        <state relative-caret-position="405">
+          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/TestArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-620">
-          <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
+        <state relative-caret-position="-14">
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="585">
+          <caret line="39" column="45" selection-start-line="39" selection-start-column="45" selection-end-line="39" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="745">
+          <caret line="52" column="49" lean-forward="true" selection-start-line="52" selection-start-column="49" selection-end-line="52" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

src/main/java/MyMap.java

@@ -12,10 +12,6 @@ public class MyMap<K,V> {
 
     public int size() { return size; }
 
-    public void setSize(int size) { this.size = size; }
-
-    public void setValue(int index, V value) { values.set(index, value); }
-
     public boolean isEmpty() { return (size == 0); }
 
     public boolean containsKey(K key) { return (keySet.contains(key)); }
@@ -25,7 +21,7 @@ public class MyMap<K,V> {
     public void clear(){
         keySet.clear();
         values.clear();
-        setSize(0);
+        size = 0;
     }
 
     public V get(K key) {
@@ -39,11 +35,9 @@ public class MyMap<K,V> {
         if (!containsKey(key)) {
             keySet.add(key);
             values.add(value);
-            setSize(size + 1);
-        } else {
-            int index = keyIndex(key);
-            setValue(index, value);
-        }
+            size = size + 1;
+        } else
+            values.set(keyIndex(key), value);
     }
 
     public int keyIndex(K key) {