From 5265da3a705b59abb16cb6f823a09f872c16b3eb Mon Sep 17 00:00:00 2001
From: Vincent Gasbarro <vincentgasbarro@zipcoders-MacBook-Pro.local>
Date: Thu, 8 Mar 2018 19:51:52 -0500
Subject: [PATCH 1/4] vg

---
 .idea/.name                                   |   1 +
 .idea/compiler.xml                            |  16 +
 .idea/libraries/Maven__junit_junit_4_12.xml   |  13 +
 .../Maven__org_hamcrest_hamcrest_core_1_3.xml |  13 +
 .idea/misc.xml                                |  13 +
 .idea/modules.xml                             |   8 +
 .idea/vcs.xml                                 |   6 +
 .idea/workspace.xml                           | 580 ++++++++++++++++++
 generics.iml                                  |  16 +
 src/main/java/.deleteme                       |   0
 src/main/java/MyArrayList.java                | 106 ++++
 src/test/java/.deleteme                       |   0
 src/test/java/MyArrayListTest.java            | 118 ++++
 13 files changed, 890 insertions(+)
 create mode 100644 .idea/.name
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml
 create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 generics.iml
 delete mode 100644 src/main/java/.deleteme
 create mode 100644 src/main/java/MyArrayList.java
 delete mode 100644 src/test/java/.deleteme
 create mode 100644 src/test/java/MyArrayListTest.java

diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..1f58a0f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+generics
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..c20d346
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="generics" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="generics" target="1.7" />
+    </bytecodeTargetLevel>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml
new file mode 100644
index 0000000..d411041
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_12.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.12">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
new file mode 100644
index 0000000..f58bbc1
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..d30d09e
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/classes" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..ca63f44
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/generics.iml" filepath="$PROJECT_DIR$/generics.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..cc19d68
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,580 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="563e87b0-8c69-4b03-b1c1-b362d5a367c6" name="Default" comment="">
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/generics.iml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/.deleteme" afterPath="" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/.deleteme" afterPath="" />
+    </list>
+    <ignored path="$PROJECT_DIR$/target/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileEditorManager">
+    <splitter split-orientation="horizontal" split-proportion="0.5984589">
+      <split-first>
+        <leaf>
+          <file leaf-file-name="MyArrayList.java" 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="435">
+                  <caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                    <element signature="e#417#418#0" expanded="true" />
+                    <element signature="e#450#451#0" expanded="true" />
+                    <element signature="e#1644#1645#0" expanded="true" />
+                    <element signature="e#1671#1672#0" expanded="true" />
+                    <element signature="e#1922#1923#0" expanded="true" />
+                    <element signature="e#1966#1967#0" expanded="true" />
+                    <element signature="e#1998#1999#0" expanded="true" />
+                    <element signature="e#2034#2035#0" expanded="true" />
+                    <element signature="e#2070#2071#0" expanded="true" />
+                    <element signature="e#2110#2111#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-first>
+      <split-second>
+        <leaf>
+          <file leaf-file-name="MyArrayListTest.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="1425">
+                  <caret line="95" column="50" lean-forward="false" selection-start-line="95" selection-start-column="50" selection-end-line="95" selection-end-column="50" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+        </leaf>
+      </split-second>
+    </splitter>
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GradleLocalSettings">
+    <option name="externalProjectsViewState">
+      <projects_view />
+    </option>
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+      </list>
+    </option>
+  </component>
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="y" value="23" />
+    <option name="width" value="1440" />
+    <option name="height" value="797" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="AndroidView" />
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="aspect.path.notification.shown" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager" selected="Application.MyArrayList">
+    <configuration default="true" type="Applet" factoryName="Applet">
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <module />
+    </configuration>
+    <configuration name="MyArrayList" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayList" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="generics" />
+      <envs />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <module name="" />
+      <envs />
+    </configuration>
+    <configuration name="MyArrayListTest.addTest3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
+      <option name="METHOD_NAME" value="addTest3" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="MyArrayListTest.removeTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
+      <option name="METHOD_NAME" value="removeTest2" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="MyArrayListTest.setTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
+      <option name="METHOD_NAME" value="setTest" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration name="MyArrayListTest.setTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="generics" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
+      <option name="METHOD_NAME" value="setTest2" />
+      <option name="TEST_OBJECT" value="method" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+    </configuration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
+    <configuration default="true" type="TestNG" factoryName="TestNG">
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+      <module name="" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="SUITE_NAME" />
+      <option name="PACKAGE_NAME" />
+      <option name="MAIN_CLASS_NAME" />
+      <option name="METHOD_NAME" />
+      <option name="GROUP_NAME" />
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
+      <option name="OUTPUT_DIRECTORY" />
+      <option name="ANNOTATION_TYPE" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
+      <option name="PROPERTIES_FILE" />
+      <envs />
+      <properties />
+      <listeners />
+    </configuration>
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+      <module name="" />
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+      <option name="PROGRAM_PARAMETERS" />
+      <predefined_log_file id="idea.log" enabled="true" />
+    </configuration>
+    <list size="5">
+      <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest2" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest3" />
+      <item index="4" class="java.lang.String" itemvalue="Application.MyArrayList" />
+    </list>
+    <recent_temporary>
+      <list size="5">
+        <item index="0" class="java.lang.String" itemvalue="Application.MyArrayList" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest3" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest2" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="SvnConfiguration">
+    <configuration />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="563e87b0-8c69-4b03-b1c1-b362d5a367c6" name="Default" comment="" />
+      <created>1520538929269</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1520538929269</updated>
+      <workItem from="1520538931743" duration="12834000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TestHistory">
+    <history-entry file="MyArrayListTest_addTest3 - 2018.03.08 at 18h 01m 46s.xml">
+      <configuration name="MyArrayListTest.addTest3" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_getTest1 - 2018.03.08 at 17h 36m 08s.xml">
+      <configuration name="MyArrayListTest.getTest1" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_getTest1 - 2018.03.08 at 17h 36m 26s.xml">
+      <configuration name="MyArrayListTest.getTest1" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_getTest2 - 2018.03.08 at 17h 40m 02s.xml">
+      <configuration name="MyArrayListTest.getTest2" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_removeTest - 2018.03.08 at 17h 44m 46s.xml">
+      <configuration name="MyArrayListTest.removeTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_removeTest2 - 2018.03.08 at 17h 45m 42s.xml">
+      <configuration name="MyArrayListTest.removeTest2" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_removeTest2 - 2018.03.08 at 17h 45m 56s.xml">
+      <configuration name="MyArrayListTest.removeTest2" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_setTest - 2018.03.08 at 17h 54m 35s.xml">
+      <configuration name="MyArrayListTest.setTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_setTest2 - 2018.03.08 at 17h 57m 57s.xml">
+      <configuration name="MyArrayListTest.setTest2" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MyArrayListTest_setTest2 - 2018.03.08 at 17h 58m 24s.xml">
+      <configuration name="MyArrayListTest.setTest2" configurationId="JUnit" />
+    </history-entry>
+  </component>
+  <component name="TimeTrackingManager">
+    <option name="totallyTimeSpent" value="12834000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="0" y="23" width="1440" height="797" extended-state="6" />
+    <editor active="true" />
+    <layout>
+      <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27492878" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16094421" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="1" />
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2505">
+          <caret line="167" column="0" lean-forward="true" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#54492#0" expanded="true" />
+            <element signature="imports" expanded="false" />
+            <element signature="e#6283#6284#0" expanded="false" />
+            <element signature="e#6351#6352#0" expanded="false" />
+            <element signature="e#10361#10362#0" expanded="false" />
+            <element signature="e#10388#10389#0" expanded="false" />
+            <element signature="e#10570#10571#0" expanded="false" />
+            <element signature="e#10602#10603#0" expanded="false" />
+            <element signature="e#11079#11080#0" expanded="false" />
+            <element signature="e#11117#11118#0" expanded="false" />
+            <element signature="e#13713#13714#0" expanded="false" />
+            <element signature="e#13768#13769#0" expanded="false" />
+            <element signature="e#15110#15140#0" expanded="false" />
+            <element signature="e#15526#15556#1" expanded="false" />
+            <element signature="e#15586#15587#0" expanded="false" />
+            <element signature="e#15631#15632#0" expanded="false" />
+            <element signature="e#24721#24722#0" expanded="false" />
+            <element signature="e#24775#24776#0" expanded="false" />
+            <element signature="e#30670#30671#0" expanded="false" />
+            <element signature="e#30707#30708#0" expanded="false" />
+            <element signature="e#31007#31008#0" expanded="false" />
+            <element signature="e#31039#31040#0" expanded="false" />
+            <element signature="e#31382#31383#0" expanded="false" />
+            <element signature="e#31427#31428#0" expanded="false" />
+            <element signature="e#31438#31468#0" expanded="false" />
+            <element signature="e#32383#32413#0" expanded="false" />
+            <element signature="e#33603#33604#0" expanded="false" />
+            <element signature="e#33645#33646#0" expanded="false" />
+            <element signature="e#33679#33680#0" expanded="false" />
+            <element signature="e#33716#33717#0" expanded="false" />
+            <element signature="e#33754#33755#0" expanded="false" />
+            <element signature="e#33795#33796#0" expanded="false" />
+            <element signature="e#33806#33836#0" expanded="false" />
+            <element signature="e#39284#39285#0" expanded="false" />
+            <element signature="e#39335#39336#0" expanded="false" />
+            <element signature="e#39777#39778#0" expanded="false" />
+            <element signature="e#39822#39823#0" expanded="false" />
+            <element signature="e#40227#40228#0" expanded="false" />
+            <element signature="e#40301#40302#0" expanded="false" />
+            <element signature="e#40320#40350#0" expanded="false" />
+            <element signature="e#40941#40942#0" expanded="false" />
+            <element signature="e#40999#41000#0" expanded="false" />
+            <element signature="e#41018#41048#0" expanded="false" />
+            <element signature="e#41597#41627#0" expanded="false" />
+            <element signature="e#42568#42569#0" expanded="false" />
+            <element signature="e#42621#42622#0" expanded="false" />
+            <element signature="e#42667#42668#0" expanded="false" />
+            <element signature="e#42724#42725#0" expanded="false" />
+            <element signature="e#45116#45117#0" expanded="false" />
+            <element signature="e#45183#45184#0" expanded="false" />
+            <element signature="e#45782#45812#0" expanded="false" />
+            <element signature="e#46731#46732#0" expanded="false" />
+            <element signature="e#46796#46797#0" expanded="false" />
+            <element signature="e#50563#50593#1" expanded="false" />
+            <element signature="e#51518#51548#1" expanded="false" />
+            <element signature="e#51840#51841#0" expanded="false" />
+            <element signature="e#51898#51899#0" expanded="false" />
+            <element signature="e#51938#51939#0" expanded="false" />
+            <element signature="e#52031#52032#0" expanded="false" />
+            <element signature="e#52574#52604#0" expanded="false" />
+            <element signature="e#53661#53691#0" expanded="false" />
+            <element signature="e#54175#54205#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1425">
+          <caret line="95" column="50" lean-forward="false" selection-start-line="95" selection-start-column="50" selection-end-line="95" selection-end-column="50" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </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="435">
+          <caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#417#418#0" expanded="true" />
+            <element signature="e#450#451#0" expanded="true" />
+            <element signature="e#1644#1645#0" expanded="true" />
+            <element signature="e#1671#1672#0" expanded="true" />
+            <element signature="e#1922#1923#0" expanded="true" />
+            <element signature="e#1966#1967#0" expanded="true" />
+            <element signature="e#1998#1999#0" expanded="true" />
+            <element signature="e#2034#2035#0" expanded="true" />
+            <element signature="e#2070#2071#0" expanded="true" />
+            <element signature="e#2110#2111#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
diff --git a/generics.iml b/generics.iml
new file mode 100644
index 0000000..9717c26
--- /dev/null
+++ b/generics.iml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/.deleteme b/src/main/java/.deleteme
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
new file mode 100644
index 0000000..ea12e62
--- /dev/null
+++ b/src/main/java/MyArrayList.java
@@ -0,0 +1,106 @@
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class MyArrayList<T> {
+
+    private T[] array;
+    private int capacity;
+    private int currentIndex = 0;
+
+    public MyArrayList() {
+        this.array = (T[]) new Object[10];
+        this.capacity = 10;
+    }
+
+    public MyArrayList(int size) {
+        this.array = (T[]) new Object[size];
+        this.capacity = size;
+    }
+
+    public T[] getArray() {
+        return this.array;
+    }
+
+    public T[] getArrayList() {
+        T[] arrayList = (T[]) new Object[currentIndex + 1];
+
+        for (int i = 0; i < currentIndex + 1; i++) {
+            arrayList[i] = this.array[i];
+        }
+        return arrayList;
+    }
+
+    public void add(T aThing) {
+
+        if (currentIndex <= capacity) {
+            this.array[currentIndex] = aThing;
+            currentIndex++;
+        } else {
+            this.array = Arrays.copyOf(this.array, this.array.length * 2);
+            this.array[currentIndex] = aThing;
+            currentIndex++;
+        }
+
+    }
+
+    public T get(int index) {
+
+        return this.array[index];
+
+    }
+
+    public void remove(T athing) {
+
+        T[] newArray = Arrays.copyOf(this.array, this.array.length - 1);
+
+        int secondIterator = 0;
+
+        for (int i = 0; i < this.array.length; i++) {
+            if (!this.array[i].equals(athing)) {
+                newArray[secondIterator] = this.array[i];
+                secondIterator++;
+            }
+        }
+
+        this.array = newArray;
+
+    }
+
+    public void set(int index, T aThing) {
+
+        this.array[index] = aThing;
+
+    }
+
+    public void clear() {
+
+
+    }
+
+    public boolean isEmpty() {
+        return true;
+    }
+
+    public boolean contains(T aThing) {
+
+        for (int i = 0; i < this.array.length; i++) {
+            if (this.array[i].equals(aThing)) {
+                return true;
+            }
+        }
+        return false;
+
+    }
+
+    public int size() {
+        return this.currentIndex + 1;
+    }
+
+    public int getCapacity() {
+        return this.capacity;
+    }
+
+    public int getCurrentIndex() {
+        return this.currentIndex;
+    }
+}
diff --git a/src/test/java/.deleteme b/src/test/java/.deleteme
deleted file mode 100644
index e69de29..0000000
diff --git a/src/test/java/MyArrayListTest.java b/src/test/java/MyArrayListTest.java
new file mode 100644
index 0000000..0dc958a
--- /dev/null
+++ b/src/test/java/MyArrayListTest.java
@@ -0,0 +1,118 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class MyArrayListTest {
+
+    @Test
+    public void addTest1() {
+        MyArrayList tester = new MyArrayList();
+        tester.add(7);
+        int expected = 1;
+        int actual = tester.getArray().length;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addTest2() {
+        MyArrayList tester = new MyArrayList(3);
+        tester.add("Hello");
+        int expected = 4;
+        int actual = tester.getArray().length;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addTest3() {
+        MyArrayList tester = new MyArrayList(3);
+        Object expected = null;
+        Object actual = tester.get(1);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getTest1() {
+        MyArrayList tester = new MyArrayList(3);
+        tester.add("Hello");
+        Object expected = "Hello";
+        Object actual = tester.get(3);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getTest2() {
+        MyArrayList tester = new MyArrayList();
+        double input = 8.885;
+        tester.add(input);
+        Object expected = input;
+        Object actual = tester.get(0);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeTest1() {
+        MyArrayList tester = new MyArrayList();
+        tester.add("Abra");
+        tester.add("Kadabra");
+        tester.add("Alakazam");
+        tester.remove("Kadabra");
+        int expected = 2;
+        int actual = tester.getArray().length;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeTest2() {
+        MyArrayList tester = new MyArrayList();
+        tester.add(3);
+        tester.add(6);
+        tester.add(9);
+        tester.remove(9);
+        tester.remove(3);
+        int expected = 1;
+        int actual = tester.getArray().length;
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void setTest1() {
+        MyArrayList tester = new MyArrayList();
+        Object expected = "Will";
+        tester.add("Marky");
+        tester.add("Ricky");
+        tester.add("Danny");
+        tester.set(1, expected);
+        Object actual = tester.getArray()[1];
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void setTest2() {
+        MyArrayList tester = new MyArrayList();
+        Integer expected = 14;
+        tester.add(9);
+        tester.add(4);
+        tester.add(11);
+        tester.set(1, expected);
+        Integer actual = (Integer) tester.getArray()[1];
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void clearTest() {
+
+
+    }
+
+    @Test
+    public void isEmptyTest() {
+
+
+    }
+
+    @Test
+    public void containsTest() {
+
+
+    }
+
+}

From 54edea513f97caf07724a085308fd9962e8658b5 Mon Sep 17 00:00:00 2001
From: Vincent Gasbarro <vincentgasbarro@zipcoders-MacBook-Pro.local>
Date: Fri, 9 Mar 2018 13:39:54 -0500
Subject: [PATCH 2/4] finished part 1

---
 .idea/workspace.xml                | 316 ++++++++++++++---------------
 src/main/java/MyArrayList.java     |  81 +++++---
 src/main/java/MySet.java           |   5 +
 src/test/java/MyArrayListTest.java | 138 ++++++++++---
 src/test/java/MySetTest.java       |   2 +
 5 files changed, 323 insertions(+), 219 deletions(-)
 create mode 100644 src/main/java/MySet.java
 create mode 100644 src/test/java/MySetTest.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cc19d68..8ca7462 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="563e87b0-8c69-4b03-b1c1-b362d5a367c6" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/generics.iml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/.deleteme" afterPath="" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/.deleteme" afterPath="" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/MySetTest.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" afterPath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,40 +17,52 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5984589">
+    <splitter split-orientation="horizontal" split-proportion="0.5443491">
       <split-first>
         <leaf>
-          <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="435">
-                  <caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
+                <state relative-caret-position="684">
+                  <caret line="90" column="0" lean-forward="true" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
                   <folding>
                     <element signature="imports" expanded="true" />
                     <element signature="e#417#418#0" expanded="true" />
                     <element signature="e#450#451#0" expanded="true" />
-                    <element signature="e#1644#1645#0" expanded="true" />
-                    <element signature="e#1671#1672#0" expanded="true" />
-                    <element signature="e#1922#1923#0" expanded="true" />
-                    <element signature="e#1966#1967#0" expanded="true" />
-                    <element signature="e#1998#1999#0" expanded="true" />
-                    <element signature="e#2034#2035#0" expanded="true" />
-                    <element signature="e#2070#2071#0" expanded="true" />
-                    <element signature="e#2110#2111#0" expanded="true" />
+                    <element signature="e#1083#1084#0" expanded="true" />
+                    <element signature="e#1123#1124#0" expanded="true" />
+                    <element signature="e#1643#1644#0" expanded="true" />
+                    <element signature="e#1685#1686#0" expanded="true" />
+                    <element signature="e#2225#2226#0" expanded="true" />
+                    <element signature="e#2265#2266#0" expanded="true" />
+                    <element signature="e#2539#2540#0" expanded="true" />
+                    <element signature="e#2575#2576#0" expanded="true" />
+                    <element signature="e#2611#2612#0" expanded="true" />
+                    <element signature="e#2651#2652#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="MySet.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="30">
+                  <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="MyArrayListTest.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="MyArrayListTest.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1425">
-                  <caret line="95" column="50" lean-forward="false" selection-start-line="95" selection-start-column="50" selection-end-line="95" selection-end-column="50" />
+                <state relative-caret-position="1005">
+                  <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
                   <folding>
                     <element signature="imports" expanded="true" />
                   </folding>
@@ -64,6 +70,16 @@
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="MySetTest.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="0">
+                  <caret line="0" column="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
+                  <folding />
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -88,6 +104,8 @@
       <list>
         <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
+        <option value="$PROJECT_DIR$/src/test/java/MySetTest.java" />
       </list>
     </option>
   </component>
@@ -98,9 +116,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="23" />
-    <option name="width" value="1440" />
-    <option name="height" value="797" />
+    <option name="x" value="-281" />
+    <option name="y" value="-1057" />
+    <option name="width" value="1920" />
+    <option name="height" value="1057" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -186,7 +205,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.MyArrayList">
+  <component name="RunManager" selected="JUnit.MyArrayListTest">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -194,9 +213,9 @@
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
       <module />
     </configuration>
-    <configuration name="MyArrayList" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+    <configuration default="true" type="Application" factoryName="Application">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" value="MyArrayList" />
+      <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" />
       <option name="PROGRAM_PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
@@ -205,31 +224,37 @@
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
       <option name="ENV_VARIABLES" />
       <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="generics" />
+      <module name="" />
       <envs />
     </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
+    <configuration name="MyArrayListTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
       <option name="ENV_VARIABLES" />
       <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
       <envs />
+      <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.addTest3" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.addTest4" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="addTest3" />
+      <option name="METHOD_NAME" value="addTest4" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -242,14 +267,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.removeTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.addTest5" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="removeTest2" />
+      <option name="METHOD_NAME" value="addTest5" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -262,14 +287,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.setTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.removeTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="setTest" />
+      <option name="METHOD_NAME" value="removeTest1" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -282,14 +307,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.setTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyArrayListTest.removeTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
       <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="setTest2" />
+      <option name="METHOD_NAME" value="removeTest2" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -363,19 +388,19 @@
       <predefined_log_file id="idea.log" enabled="true" />
     </configuration>
     <list size="5">
-      <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest2" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest3" />
-      <item index="4" class="java.lang.String" itemvalue="Application.MyArrayList" />
+      <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest4" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest1" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest5" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="Application.MyArrayList" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest3" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest2" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.setTest" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest5" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest4" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest1" />
       </list>
     </recent_temporary>
   </component>
@@ -392,63 +417,63 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520538929269</updated>
-      <workItem from="1520538931743" duration="12834000" />
+      <workItem from="1520538931743" duration="25531000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MyArrayListTest_addTest3 - 2018.03.08 at 18h 01m 46s.xml">
-      <configuration name="MyArrayListTest.addTest3" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest - 2018.03.09 at 13h 24m 11s.xml">
+      <configuration name="MyArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_getTest1 - 2018.03.08 at 17h 36m 08s.xml">
-      <configuration name="MyArrayListTest.getTest1" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest - 2018.03.09 at 13h 31m 20s.xml">
+      <configuration name="MyArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_getTest1 - 2018.03.08 at 17h 36m 26s.xml">
-      <configuration name="MyArrayListTest.getTest1" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest - 2018.03.09 at 13h 34m 03s.xml">
+      <configuration name="MyArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_getTest2 - 2018.03.08 at 17h 40m 02s.xml">
-      <configuration name="MyArrayListTest.getTest2" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_addTest4 - 2018.03.09 at 13h 16m 28s.xml">
+      <configuration name="MyArrayListTest.addTest4" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest - 2018.03.08 at 17h 44m 46s.xml">
-      <configuration name="MyArrayListTest.removeTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_addTest4 - 2018.03.09 at 13h 18m 59s.xml">
+      <configuration name="MyArrayListTest.addTest4" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest2 - 2018.03.08 at 17h 45m 42s.xml">
-      <configuration name="MyArrayListTest.removeTest2" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_addTest4 - 2018.03.09 at 13h 24m 07s.xml">
+      <configuration name="MyArrayListTest.addTest4" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest2 - 2018.03.08 at 17h 45m 56s.xml">
-      <configuration name="MyArrayListTest.removeTest2" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_addTest5 - 2018.03.09 at 13h 29m 32s.xml">
+      <configuration name="MyArrayListTest.addTest5" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_setTest - 2018.03.08 at 17h 54m 35s.xml">
-      <configuration name="MyArrayListTest.setTest" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_addTest5 - 2018.03.09 at 13h 31m 17s.xml">
+      <configuration name="MyArrayListTest.addTest5" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_setTest2 - 2018.03.08 at 17h 57m 57s.xml">
-      <configuration name="MyArrayListTest.setTest2" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_removeTest1 - 2018.03.09 at 13h 18m 18s.xml">
+      <configuration name="MyArrayListTest.removeTest1" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_setTest2 - 2018.03.08 at 17h 58m 24s.xml">
-      <configuration name="MyArrayListTest.setTest2" configurationId="JUnit" />
+    <history-entry file="MyArrayListTest_removeTest2 - 2018.03.09 at 13h 18m 21s.xml">
+      <configuration name="MyArrayListTest.removeTest2" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="12834000" />
+    <option name="totallyTimeSpent" value="25531000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1440" height="797" extended-state="6" />
+    <frame x="-281" y="-1057" width="1920" height="1057" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32905984" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19022869" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27492878" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2006237" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16094421" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12193823" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -471,108 +496,67 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="1" />
+    </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="684">
+          <caret line="90" column="0" lean-forward="true" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#417#418#0" expanded="true" />
+            <element signature="e#450#451#0" expanded="true" />
+            <element signature="e#1083#1084#0" expanded="true" />
+            <element signature="e#1123#1124#0" expanded="true" />
+            <element signature="e#1643#1644#0" expanded="true" />
+            <element signature="e#1685#1686#0" expanded="true" />
+            <element signature="e#2225#2226#0" expanded="true" />
+            <element signature="e#2265#2266#0" expanded="true" />
+            <element signature="e#2539#2540#0" expanded="true" />
+            <element signature="e#2575#2576#0" expanded="true" />
+            <element signature="e#2611#2612#0" expanded="true" />
+            <element signature="e#2651#2652#0" expanded="true" />
+          </folding>
+        </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="30">
+          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2505">
-          <caret line="167" column="0" lean-forward="true" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" />
+        <state relative-caret-position="612">
+          <caret line="141" column="21" lean-forward="true" selection-start-line="141" selection-start-column="21" selection-end-line="141" selection-end-column="21" />
           <folding>
             <element signature="e#0#54492#0" expanded="true" />
-            <element signature="imports" expanded="false" />
-            <element signature="e#6283#6284#0" expanded="false" />
-            <element signature="e#6351#6352#0" expanded="false" />
-            <element signature="e#10361#10362#0" expanded="false" />
-            <element signature="e#10388#10389#0" expanded="false" />
-            <element signature="e#10570#10571#0" expanded="false" />
-            <element signature="e#10602#10603#0" expanded="false" />
-            <element signature="e#11079#11080#0" expanded="false" />
-            <element signature="e#11117#11118#0" expanded="false" />
-            <element signature="e#13713#13714#0" expanded="false" />
-            <element signature="e#13768#13769#0" expanded="false" />
-            <element signature="e#15110#15140#0" expanded="false" />
-            <element signature="e#15526#15556#1" expanded="false" />
-            <element signature="e#15586#15587#0" expanded="false" />
-            <element signature="e#15631#15632#0" expanded="false" />
-            <element signature="e#24721#24722#0" expanded="false" />
-            <element signature="e#24775#24776#0" expanded="false" />
-            <element signature="e#30670#30671#0" expanded="false" />
-            <element signature="e#30707#30708#0" expanded="false" />
-            <element signature="e#31007#31008#0" expanded="false" />
-            <element signature="e#31039#31040#0" expanded="false" />
-            <element signature="e#31382#31383#0" expanded="false" />
-            <element signature="e#31427#31428#0" expanded="false" />
-            <element signature="e#31438#31468#0" expanded="false" />
-            <element signature="e#32383#32413#0" expanded="false" />
-            <element signature="e#33603#33604#0" expanded="false" />
-            <element signature="e#33645#33646#0" expanded="false" />
-            <element signature="e#33679#33680#0" expanded="false" />
-            <element signature="e#33716#33717#0" expanded="false" />
-            <element signature="e#33754#33755#0" expanded="false" />
-            <element signature="e#33795#33796#0" expanded="false" />
-            <element signature="e#33806#33836#0" expanded="false" />
-            <element signature="e#39284#39285#0" expanded="false" />
-            <element signature="e#39335#39336#0" expanded="false" />
-            <element signature="e#39777#39778#0" expanded="false" />
-            <element signature="e#39822#39823#0" expanded="false" />
-            <element signature="e#40227#40228#0" expanded="false" />
-            <element signature="e#40301#40302#0" expanded="false" />
-            <element signature="e#40320#40350#0" expanded="false" />
-            <element signature="e#40941#40942#0" expanded="false" />
-            <element signature="e#40999#41000#0" expanded="false" />
-            <element signature="e#41018#41048#0" expanded="false" />
-            <element signature="e#41597#41627#0" expanded="false" />
-            <element signature="e#42568#42569#0" expanded="false" />
-            <element signature="e#42621#42622#0" expanded="false" />
-            <element signature="e#42667#42668#0" expanded="false" />
-            <element signature="e#42724#42725#0" expanded="false" />
-            <element signature="e#45116#45117#0" expanded="false" />
-            <element signature="e#45183#45184#0" expanded="false" />
-            <element signature="e#45782#45812#0" expanded="false" />
-            <element signature="e#46731#46732#0" expanded="false" />
-            <element signature="e#46796#46797#0" expanded="false" />
-            <element signature="e#50563#50593#1" expanded="false" />
-            <element signature="e#51518#51548#1" expanded="false" />
-            <element signature="e#51840#51841#0" expanded="false" />
-            <element signature="e#51898#51899#0" expanded="false" />
-            <element signature="e#51938#51939#0" expanded="false" />
-            <element signature="e#52031#52032#0" expanded="false" />
-            <element signature="e#52574#52604#0" expanded="false" />
-            <element signature="e#53661#53691#0" expanded="false" />
-            <element signature="e#54175#54205#0" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1425">
-          <caret line="95" column="50" lean-forward="false" selection-start-line="95" selection-start-column="50" selection-end-line="95" selection-end-column="50" />
+        <state relative-caret-position="1005">
+          <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="435">
-          <caret line="29" column="25" lean-forward="true" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#417#418#0" expanded="true" />
-            <element signature="e#450#451#0" expanded="true" />
-            <element signature="e#1644#1645#0" expanded="true" />
-            <element signature="e#1671#1672#0" expanded="true" />
-            <element signature="e#1922#1923#0" expanded="true" />
-            <element signature="e#1966#1967#0" expanded="true" />
-            <element signature="e#1998#1999#0" expanded="true" />
-            <element signature="e#2034#2035#0" expanded="true" />
-            <element signature="e#2070#2071#0" expanded="true" />
-            <element signature="e#2110#2111#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="0">
+          <caret line="0" column="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
+          <folding />
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
index ea12e62..e72b8b0 100644
--- a/src/main/java/MyArrayList.java
+++ b/src/main/java/MyArrayList.java
@@ -21,18 +21,9 @@ public T[] getArray() {
         return this.array;
     }
 
-    public T[] getArrayList() {
-        T[] arrayList = (T[]) new Object[currentIndex + 1];
-
-        for (int i = 0; i < currentIndex + 1; i++) {
-            arrayList[i] = this.array[i];
-        }
-        return arrayList;
-    }
-
     public void add(T aThing) {
 
-        if (currentIndex <= capacity) {
+        if (currentIndex < capacity) {
             this.array[currentIndex] = aThing;
             currentIndex++;
         } else {
@@ -40,50 +31,56 @@ public void add(T aThing) {
             this.array[currentIndex] = aThing;
             currentIndex++;
         }
+    }
 
+    public void add(T aThing, int index) {
+        Arrays.copyOf(this.array, this.array.length + 1);
+        System.arraycopy(this.array, index, this.array, index + 1, ((this.array.length - index) - 1));
+        this.array[index] = aThing;
+        currentIndex++;
     }
 
     public T get(int index) {
-
         return this.array[index];
-
     }
 
-    public void remove(T athing) {
-
-        T[] newArray = Arrays.copyOf(this.array, this.array.length - 1);
-
-        int secondIterator = 0;
-
-        for (int i = 0; i < this.array.length; i++) {
-            if (!this.array[i].equals(athing)) {
-                newArray[secondIterator] = this.array[i];
-                secondIterator++;
-            }
-        }
+    public void remove(int index) {
+        System.arraycopy(this.array, index + 1, this.array, index, (this.array.length - 1) - index);
+        this.array[this.array.length - 1] = null;
+        this.currentIndex--;
+    }
 
-        this.array = newArray;
 
+    public void remove(T aThing) {
+        System.arraycopy(this.array, indexOf(aThing) + 1, this.array, indexOf(aThing), (this.array.length - 1) - indexOf(aThing));
+        this.array[this.array.length - 1] = null;
+        this.currentIndex--;
     }
 
     public void set(int index, T aThing) {
-
         this.array[index] = aThing;
-
     }
 
     public void clear() {
 
+        for (int i = 0; i < size() + 1; i++) {
+            this.array[i] = null;
+        }
 
+        this.currentIndex = 0;
     }
 
     public boolean isEmpty() {
-        return true;
+        if (size() == 0) {
+            return true;
+        } else {
+            return false;
+        }
     }
 
     public boolean contains(T aThing) {
 
-        for (int i = 0; i < this.array.length; i++) {
+        for (int i = 0; i < size(); i++) {
             if (this.array[i].equals(aThing)) {
                 return true;
             }
@@ -93,7 +90,20 @@ public boolean contains(T aThing) {
     }
 
     public int size() {
-        return this.currentIndex + 1;
+        return this.currentIndex;
+    }
+
+
+    public int indexOf(T aThing) {
+
+        int indexOf = -1;
+
+        for (int i = 0; i < this.array.length; i++) {
+            if (array[i] == (aThing)) {
+                indexOf = i;
+            }
+        }
+        return indexOf;
     }
 
     public int getCapacity() {
@@ -103,4 +113,15 @@ public int getCapacity() {
     public int getCurrentIndex() {
         return this.currentIndex;
     }
+
+    public T[] getArrayList() {
+        T[] arrayList = (T[]) new Object[currentIndex + 1];
+
+        for (int i = 0; i < currentIndex + 1; i++) {
+            arrayList[i] = this.array[i];
+        }
+        return arrayList;
+    }
+
+
 }
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
new file mode 100644
index 0000000..ac9b02c
--- /dev/null
+++ b/src/main/java/MySet.java
@@ -0,0 +1,5 @@
+public class MySet {
+
+
+
+}
diff --git a/src/test/java/MyArrayListTest.java b/src/test/java/MyArrayListTest.java
index 0dc958a..258cdc7 100644
--- a/src/test/java/MyArrayListTest.java
+++ b/src/test/java/MyArrayListTest.java
@@ -3,19 +3,29 @@
 
 public class MyArrayListTest {
 
+    @Test
+    public void sizeTest() {
+        MyArrayList tester = new MyArrayList(5);
+        int expected = 0;
+        int actual = tester.size();
+        Assert.assertEquals(expected, actual);
+    }
+
     @Test
     public void addTest1() {
         MyArrayList tester = new MyArrayList();
         tester.add(7);
         int expected = 1;
-        int actual = tester.getArray().length;
+        int actual = tester.size();
         Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void addTest2() {
-        MyArrayList tester = new MyArrayList(3);
-        tester.add("Hello");
+        MyArrayList tester = new MyArrayList(2);
+        tester.add("Test");
+        tester.add("hello");
+        tester.add("world");
         int expected = 4;
         int actual = tester.getArray().length;
         Assert.assertEquals(expected, actual);
@@ -23,9 +33,36 @@ public void addTest2() {
 
     @Test
     public void addTest3() {
+        MyArrayList tester = new MyArrayList();
+        Integer expected = 14;
+        tester.add(11);
+        tester.add(expected);
+        tester.add(22);
+        Integer actual = (Integer) tester.get(1);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addTest4() {
         MyArrayList tester = new MyArrayList(3);
-        Object expected = null;
-        Object actual = tester.get(1);
+        Object expected = "Go";
+        tester.add("Grease");
+        tester.add("Lightning");
+        tester.add(expected, 0);
+        Object actual = tester.get(0);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addTest5() {
+        MyArrayList tester = new MyArrayList(2);
+        Integer expected = 99;
+        tester.add(14);
+        tester.add(7);
+        tester.add(expected);
+        tester.add(11);
+        tester.add(197, 2);
+        Integer actual = (Integer) tester.get(3);
         Assert.assertEquals(expected, actual);
     }
 
@@ -34,7 +71,7 @@ public void getTest1() {
         MyArrayList tester = new MyArrayList(3);
         tester.add("Hello");
         Object expected = "Hello";
-        Object actual = tester.get(3);
+        Object actual = tester.get(0);
         Assert.assertEquals(expected, actual);
     }
 
@@ -42,21 +79,23 @@ public void getTest1() {
     public void getTest2() {
         MyArrayList tester = new MyArrayList();
         double input = 8.885;
+        tester.add(3.14);
         tester.add(input);
         Object expected = input;
-        Object actual = tester.get(0);
+        Object actual = tester.get(1);
         Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void removeTest1() {
         MyArrayList tester = new MyArrayList();
+        Object toRemove = "Kadabra";
+        Object expected = "Alakazam";
         tester.add("Abra");
-        tester.add("Kadabra");
-        tester.add("Alakazam");
-        tester.remove("Kadabra");
-        int expected = 2;
-        int actual = tester.getArray().length;
+        tester.add(toRemove);
+        tester.add(expected);
+        tester.remove(toRemove);
+        Object actual = tester.get(1);
         Assert.assertEquals(expected, actual);
     }
 
@@ -66,10 +105,9 @@ public void removeTest2() {
         tester.add(3);
         tester.add(6);
         tester.add(9);
-        tester.remove(9);
-        tester.remove(3);
-        int expected = 1;
-        int actual = tester.getArray().length;
+        tester.remove(1);
+        int expected = 2;
+        int actual = tester.size();
         Assert.assertEquals(expected, actual);
     }
 
@@ -92,27 +130,81 @@ public void setTest2() {
         tester.add(9);
         tester.add(4);
         tester.add(11);
-        tester.set(1, expected);
-        Integer actual = (Integer) tester.getArray()[1];
+        tester.set(2, expected);
+        Integer actual = (Integer) tester.getArray()[2];
         Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void clearTest() {
-
-
+    public void clearTest1() {
+        MyArrayList tester = new MyArrayList();
+        tester.add("Scooby");
+        tester.add("Dooby");
+        tester.add("Do");
+        tester.clear();
+        int expected = 0;
+        int actual = tester.size();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void isEmptyTest() {
+    public void clearTest2() {
+        MyArrayList tester = new MyArrayList();
+        tester.add("Scooby");
+        tester.add("Dooby");
+        tester.add("Do");
+        tester.clear();
+        int expected = 10;
+        int actual = tester.getArray().length;
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void clearTest3() {
+        MyArrayList tester = new MyArrayList();
+        tester.add("Scooby");
+        tester.add("Dooby");
+        tester.add("Do");
+        tester.clear();
+        Object expected = null;
+        Object actual = tester.get(1);
+        Assert.assertEquals(expected, actual);
+    }
 
+    @Test
+    public void isEmptyTest1() {
+        MyArrayList tester = new MyArrayList(8);
+        tester.add(14);
+        tester.add(7);
+        boolean expected = false;
+        boolean actual = tester.isEmpty();
+        Assert.assertEquals(expected, actual);
     }
 
     @Test
-    public void containsTest() {
+    public void isEmptyTest2() {
+        MyArrayList tester = new MyArrayList(8);
+        tester.add(14);
+        tester.add(7);
+        tester.clear();
+        Assert.assertTrue(tester.isEmpty());
+    }
 
+    @Test
+    public void containsTest1() {
+        MyArrayList tester = new MyArrayList();
+        String thing = "Pinocchio";
+        tester.add(thing);
+        Assert.assertTrue(tester.contains(thing));
+    }
 
+    @Test
+    public void containsTest2() {
+        MyArrayList tester = new MyArrayList();
+        String thing = "Pinocchio";
+        String anotherThing = "Aladdin";
+        tester.add(thing);
+        Assert.assertFalse(tester.contains(anotherThing));
     }
 
 }
diff --git a/src/test/java/MySetTest.java b/src/test/java/MySetTest.java
new file mode 100644
index 0000000..5e36d52
--- /dev/null
+++ b/src/test/java/MySetTest.java
@@ -0,0 +1,2 @@
+public class MySetTest   {
+}

From 62222ab36ef300b82d8db6a81785c4a5934e55b6 Mon Sep 17 00:00:00 2001
From: Vincent Gasbarro <vincentgasbarro@zipcoders-MacBook-Pro.local>
Date: Sat, 10 Mar 2018 09:17:58 -0500
Subject: [PATCH 3/4] vg

---
 .idea/workspace.xml            | 276 +++++++++++++++++++++------------
 src/main/java/MyArrayList.java |   6 +-
 src/main/java/MyMap.java       |   2 +
 src/main/java/MySet.java       | 104 ++++++++++++-
 src/test/java/MyMapTest.java   |   2 +
 src/test/java/MySetTest.java   | 173 +++++++++++++++++++++
 6 files changed, 462 insertions(+), 101 deletions(-)
 create mode 100644 src/main/java/MyMap.java
 create mode 100644 src/test/java/MyMapTest.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8ca7462..5ee7ea5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="563e87b0-8c69-4b03-b1c1-b362d5a367c6" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/MySetTest.java" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
       <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" afterPath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/MySetTest.java" afterPath="$PROJECT_DIR$/src/test/java/MySetTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,38 +17,58 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.5443491">
+    <splitter split-orientation="horizontal" split-proportion="0.55427533">
       <split-first>
         <leaf>
           <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="684">
-                  <caret line="90" column="0" lean-forward="true" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
+                <state relative-caret-position="572">
+                  <caret line="121" column="5" lean-forward="true" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
                   <folding>
                     <element signature="imports" expanded="true" />
                     <element signature="e#417#418#0" expanded="true" />
                     <element signature="e#450#451#0" expanded="true" />
-                    <element signature="e#1083#1084#0" expanded="true" />
-                    <element signature="e#1123#1124#0" expanded="true" />
-                    <element signature="e#1643#1644#0" expanded="true" />
-                    <element signature="e#1685#1686#0" expanded="true" />
-                    <element signature="e#2225#2226#0" expanded="true" />
-                    <element signature="e#2265#2266#0" expanded="true" />
-                    <element signature="e#2539#2540#0" expanded="true" />
-                    <element signature="e#2575#2576#0" expanded="true" />
-                    <element signature="e#2611#2612#0" expanded="true" />
-                    <element signature="e#2651#2652#0" expanded="true" />
+                    <element signature="e#1025#1026#0" expanded="true" />
+                    <element signature="e#1065#1066#0" expanded="true" />
+                    <element signature="e#1582#1583#0" expanded="true" />
+                    <element signature="e#1624#1625#0" expanded="true" />
+                    <element signature="e#2164#2165#0" expanded="true" />
+                    <element signature="e#2204#2205#0" expanded="true" />
+                    <element signature="e#2477#2478#0" expanded="true" />
+                    <element signature="e#2513#2514#0" expanded="true" />
+                    <element signature="e#2549#2550#0" expanded="true" />
+                    <element signature="e#2589#2590#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="MySet.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="MySet.java" 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="30">
-                  <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+                  <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                    <element signature="e#451#452#0" expanded="true" />
+                    <element signature="e#483#484#0" expanded="true" />
+                    <element signature="e#1108#1109#0" expanded="true" />
+                    <element signature="e#1147#1148#0" expanded="true" />
+                    <element signature="e#1311#1312#0" expanded="true" />
+                    <element signature="e#1349#1350#0" expanded="true" />
+                    <element signature="e#1595#1596#0" expanded="true" />
+                    <element signature="e#1626#1627#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="MyMap.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="15">
+                  <caret line="1" column="1" lean-forward="true" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
                   <folding />
                 </state>
               </provider>
@@ -70,16 +90,30 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="MySetTest.java" pinned="false" current-in-tab="true">
-            <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
+          <file leaf-file-name="MyMapTest.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="0">
-                  <caret line="0" column="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
+                  <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
                   <folding />
                 </state>
               </provider>
             </entry>
           </file>
+          <file leaf-file-name="MySetTest.java" pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="2595">
+                  <caret line="173" column="0" lean-forward="true" selection-start-line="173" selection-start-column="0" selection-end-line="173" selection-end-column="0" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                    <element signature="e#165#166#0" expanded="true" />
+                    <element signature="e#201#202#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -91,6 +125,11 @@
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>iterator</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -104,8 +143,8 @@
       <list>
         <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
         <option value="$PROJECT_DIR$/src/test/java/MySetTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
       </list>
     </option>
   </component>
@@ -116,10 +155,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-281" />
-    <option name="y" value="-1057" />
-    <option name="width" value="1920" />
-    <option name="height" value="1057" />
+    <option name="y" value="23" />
+    <option name="width" value="1440" />
+    <option name="height" value="797" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -247,15 +285,15 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.addTest4" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="addTest4" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -267,14 +305,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.addTest5" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MySetTest.removeAllTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="addTest5" />
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
+      <option name="METHOD_NAME" value="removeAllTest2" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -287,14 +325,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.removeTest1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MySetTest.sizeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="removeTest1" />
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
+      <option name="METHOD_NAME" value="sizeTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -307,14 +345,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MyArrayListTest.removeTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MySetTest.toArrayTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
-      <option name="METHOD_NAME" value="removeTest2" />
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
+      <option name="METHOD_NAME" value="toArrayTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -389,18 +427,18 @@
     </configuration>
     <list size="5">
       <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest4" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest1" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest5" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.MySetTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.MySetTest.removeAllTest2" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.MySetTest.sizeTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.MySetTest.toArrayTest" />
     </list>
     <recent_temporary>
       <list size="5">
         <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest5" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.addTest4" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest2" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest.removeTest1" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.MySetTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.MySetTest.toArrayTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.MySetTest.sizeTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.MySetTest.removeAllTest2" />
       </list>
     </recent_temporary>
   </component>
@@ -417,69 +455,69 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520538929269</updated>
-      <workItem from="1520538931743" duration="25531000" />
+      <workItem from="1520538931743" duration="39151000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="MyArrayListTest - 2018.03.09 at 13h 24m 11s.xml">
+    <history-entry file="MyArrayListTest - 2018.03.10 at 09h 15m 39s.xml">
       <configuration name="MyArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest - 2018.03.09 at 13h 31m 20s.xml">
-      <configuration name="MyArrayListTest" configurationId="JUnit" />
+    <history-entry file="MySetTest - 2018.03.10 at 08h 49m 33s.xml">
+      <configuration name="MySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest - 2018.03.09 at 13h 34m 03s.xml">
-      <configuration name="MyArrayListTest" configurationId="JUnit" />
+    <history-entry file="MySetTest - 2018.03.10 at 09h 15m 27s.xml">
+      <configuration name="MySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_addTest4 - 2018.03.09 at 13h 16m 28s.xml">
-      <configuration name="MyArrayListTest.addTest4" configurationId="JUnit" />
+    <history-entry file="MySetTest - 2018.03.10 at 09h 15m 35s.xml">
+      <configuration name="MySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_addTest4 - 2018.03.09 at 13h 18m 59s.xml">
-      <configuration name="MyArrayListTest.addTest4" configurationId="JUnit" />
+    <history-entry file="MySetTest_removeAllTest2 - 2018.03.10 at 08h 50m 24s.xml">
+      <configuration name="MySetTest.removeAllTest2" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_addTest4 - 2018.03.09 at 13h 24m 07s.xml">
-      <configuration name="MyArrayListTest.addTest4" configurationId="JUnit" />
+    <history-entry file="MySetTest_sizeTest - 2018.03.10 at 08h 53m 32s.xml">
+      <configuration name="MySetTest.sizeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_addTest5 - 2018.03.09 at 13h 29m 32s.xml">
-      <configuration name="MyArrayListTest.addTest5" configurationId="JUnit" />
+    <history-entry file="MySetTest_sizeTest - 2018.03.10 at 08h 54m 00s.xml">
+      <configuration name="MySetTest.sizeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_addTest5 - 2018.03.09 at 13h 31m 17s.xml">
-      <configuration name="MyArrayListTest.addTest5" configurationId="JUnit" />
+    <history-entry file="MySetTest_sizeTest - 2018.03.10 at 08h 54m 47s.xml">
+      <configuration name="MySetTest.sizeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest1 - 2018.03.09 at 13h 18m 18s.xml">
-      <configuration name="MyArrayListTest.removeTest1" configurationId="JUnit" />
+    <history-entry file="MySetTest_toArrayTest - 2018.03.10 at 09h 06m 44s.xml">
+      <configuration name="MySetTest.toArrayTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MyArrayListTest_removeTest2 - 2018.03.09 at 13h 18m 21s.xml">
-      <configuration name="MyArrayListTest.removeTest2" configurationId="JUnit" />
+    <history-entry file="MySetTest_toArrayTest - 2018.03.10 at 09h 09m 48s.xml">
+      <configuration name="MySetTest.toArrayTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="25531000" />
+    <option name="totallyTimeSpent" value="39151000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-281" y="-1057" width="1920" height="1057" extended-state="6" />
+    <frame x="0" y="23" width="1440" height="797" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19022869" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18945868" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2006237" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27492878" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12193823" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16595136" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3988604" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -497,47 +535,85 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="1" />
+      <option name="time" value="2" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="612">
+          <caret line="141" column="21" lean-forward="true" selection-start-line="141" selection-start-column="21" selection-end-line="141" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#54492#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/Arrays.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="248">
+          <caret line="3179" column="26" lean-forward="false" selection-start-line="3179" selection-start-column="26" selection-end-line="3179" selection-end-column="26" />
+          <folding />
+        </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="684">
-          <caret line="90" column="0" lean-forward="true" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" />
+        <state relative-caret-position="572">
+          <caret line="121" column="5" lean-forward="true" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#417#418#0" expanded="true" />
             <element signature="e#450#451#0" expanded="true" />
-            <element signature="e#1083#1084#0" expanded="true" />
-            <element signature="e#1123#1124#0" expanded="true" />
-            <element signature="e#1643#1644#0" expanded="true" />
-            <element signature="e#1685#1686#0" expanded="true" />
-            <element signature="e#2225#2226#0" expanded="true" />
-            <element signature="e#2265#2266#0" expanded="true" />
-            <element signature="e#2539#2540#0" expanded="true" />
-            <element signature="e#2575#2576#0" expanded="true" />
-            <element signature="e#2611#2612#0" expanded="true" />
-            <element signature="e#2651#2652#0" expanded="true" />
+            <element signature="e#1025#1026#0" expanded="true" />
+            <element signature="e#1065#1066#0" expanded="true" />
+            <element signature="e#1582#1583#0" expanded="true" />
+            <element signature="e#1624#1625#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2204#2205#0" expanded="true" />
+            <element signature="e#2477#2478#0" expanded="true" />
+            <element signature="e#2513#2514#0" expanded="true" />
+            <element signature="e#2549#2550#0" expanded="true" />
+            <element signature="e#2589#2590#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/Set.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state relative-caret-position="145">
+          <caret line="125" column="32" lean-forward="true" selection-start-line="125" selection-start-column="32" selection-end-line="125" selection-end-column="32" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="612">
-          <caret line="141" column="21" lean-forward="true" selection-start-line="141" selection-start-column="21" selection-end-line="141" selection-end-column="21" />
+        <state relative-caret-position="2595">
+          <caret line="173" column="0" lean-forward="true" selection-start-line="173" selection-start-column="0" selection-end-line="173" selection-end-column="0" />
           <folding>
-            <element signature="e#0#54492#0" expanded="true" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#165#166#0" expanded="true" />
+            <element signature="e#201#202#0" expanded="true" />
+          </folding>
+        </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="30">
+          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#451#452#0" expanded="true" />
+            <element signature="e#483#484#0" expanded="true" />
+            <element signature="e#1108#1109#0" expanded="true" />
+            <element signature="e#1147#1148#0" expanded="true" />
+            <element signature="e#1311#1312#0" expanded="true" />
+            <element signature="e#1349#1350#0" expanded="true" />
+            <element signature="e#1595#1596#0" expanded="true" />
+            <element signature="e#1626#1627#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -552,10 +628,18 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
-          <caret line="0" column="24" lean-forward="false" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
+          <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
+          <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="15">
+          <caret line="1" column="1" lean-forward="true" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
           <folding />
         </state>
       </provider>
diff --git a/src/main/java/MyArrayList.java b/src/main/java/MyArrayList.java
index e72b8b0..9802be3 100644
--- a/src/main/java/MyArrayList.java
+++ b/src/main/java/MyArrayList.java
@@ -34,7 +34,6 @@ public void add(T aThing) {
     }
 
     public void add(T aThing, int index) {
-        Arrays.copyOf(this.array, this.array.length + 1);
         System.arraycopy(this.array, index, this.array, index + 1, ((this.array.length - index) - 1));
         this.array[index] = aThing;
         currentIndex++;
@@ -50,9 +49,8 @@ public void remove(int index) {
         this.currentIndex--;
     }
 
-
     public void remove(T aThing) {
-        System.arraycopy(this.array, indexOf(aThing) + 1, this.array, indexOf(aThing), (this.array.length - 1) - indexOf(aThing));
+        System.arraycopy(this.array,indexOf(aThing) + 1, this.array, indexOf(aThing),(this.array.length - 1) - indexOf(aThing));
         this.array[this.array.length - 1] = null;
         this.currentIndex--;
     }
@@ -96,7 +94,7 @@ public int size() {
 
     public int indexOf(T aThing) {
 
-        int indexOf = -1;
+        int indexOf = 0;
 
         for (int i = 0; i < this.array.length; i++) {
             if (array[i] == (aThing)) {
diff --git a/src/main/java/MyMap.java b/src/main/java/MyMap.java
new file mode 100644
index 0000000..87e35e8
--- /dev/null
+++ b/src/main/java/MyMap.java
@@ -0,0 +1,2 @@
+public class MyMap {
+}
diff --git a/src/main/java/MySet.java b/src/main/java/MySet.java
index ac9b02c..a4cbe7f 100644
--- a/src/main/java/MySet.java
+++ b/src/main/java/MySet.java
@@ -1,5 +1,107 @@
-public class MySet {
+import java.util.Iterator;
+import java.util.Set;
 
+public class MySet<T> {
+
+    private MyArrayList<T> set;
+
+    public MySet() {
+        this.set = new MyArrayList<>(1);
+
+    }
+
+    public void add(T aThing) {
+        if (!contains(aThing)) {
+            this.set.add(aThing);
+        }
+    }
+
+    public void addAll(T... things) {
+        for (int i = 0; i < things.length; i++) {
+            add(things[i]);
+        }
+    }
+
+    public void clear() {
+        this.set.clear();
+    }
+
+    public boolean contains(T aThing) {
+
+        for (int i = 0; i < set.size(); i++) {
+            if (this.set.get(i).equals(aThing)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean containsAll(T... things) {
+        for (int i = 0; i < things.length; i++) {
+            if (!contains(things[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean isEmpty() {
+        if (this.set.size() > 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    public void remove(T aThing) {
+        this.set.remove(aThing);
+    }
+
+    public void removeAll(T... things) {
+        for (int i = 0; i < things.length; i++) {
+            remove(things[i]);
+        }
+    }
+
+    public int size() {
+        return getSet().size();
+    }
+
+    public Object[] toArray() {
+
+        Object[] objArray = new Object[size()];
+
+        for (int i = 0; i < size(); i++) {
+            objArray[i] = this.set.get(i);
+        }
+
+        return objArray;
+    }
+
+    public MyArrayList getSet() {
+        return this.set;
+    }
+
+//    public Iterator<T> iterator() {
+//        return new Iterator<T>() {
+//            @Override
+//            public void remove() {
+//
+//            }
+//
+//            @Override
+//            public boolean hasNext() {
+//                return false;
+//            }
+//
+//            @Override
+//            public T next() {
+//
+//
+//                return null;
+//            }
+//        };
+//    }
 
 
 }
diff --git a/src/test/java/MyMapTest.java b/src/test/java/MyMapTest.java
new file mode 100644
index 0000000..d4d696f
--- /dev/null
+++ b/src/test/java/MyMapTest.java
@@ -0,0 +1,2 @@
+public class MyMapTest {
+}
diff --git a/src/test/java/MySetTest.java b/src/test/java/MySetTest.java
index 5e36d52..e3d6875 100644
--- a/src/test/java/MySetTest.java
+++ b/src/test/java/MySetTest.java
@@ -1,2 +1,175 @@
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 public class MySetTest   {
+
+    private MySet tester;
+
+    @Before
+    public void setup() {
+        tester = new MySet();
+    }
+
+    @Test
+    public void addTest1() {
+        tester.add(14);
+        int expected = 1;
+        int actual = tester.getSet().size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addTest2() {
+        tester.add(14);
+        tester.add(11);
+        tester.add(14);
+        int expected = 2;
+        int actual = tester.getSet().size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addAllTest1() {
+        String[] stringArray = {"Scooby", "Dooby", "Do"};
+        tester.addAll(stringArray);
+        int expected = 3;
+        int actual = tester.getSet().size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void addAllTest2() {
+        String[] stringArray = {"Scooby", "Scooby", "Do"};
+        tester.addAll(stringArray);
+        int expected = 2;
+        int actual = tester.getSet().size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void clearTest() {
+        Integer[] intArray = {50, 25, 14, 11};
+        tester.addAll(intArray);
+        int expected = 0;
+        tester.clear();
+        int actual = tester.getSet().size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void containsTest1() {
+        Object toAdd = new Object();
+        tester.add(toAdd);
+        Assert.assertTrue(tester.contains(toAdd));
+    }
+
+    @Test
+    public void containsTest2() {
+        String[] stringArray = {"Super", "Duper", "Fly"};
+        tester.addAll(stringArray);
+        String testing = "Duper";
+        boolean expected = true;
+        boolean actual = tester.contains(testing);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void containsAllTest1() {
+        tester.add("Marky");
+        tester.add("Ricky");
+        tester.add("Danny");
+        tester.add("Terri");
+        boolean expected = true;
+        String[] stringArray = {"Terri", "Ricky"};
+        boolean actual = tester.containsAll(stringArray);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void containsAllTest2() {
+        tester.add(14);
+        tester.add(11);
+        tester.add(7);
+        tester.add(99);
+        boolean expected = false;
+        Integer[] intArray = {7, 11, 16, 99};
+        boolean actual = tester.containsAll(intArray);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void isEmptyTest1() {
+        Integer[] intArray = {4, 8, 15, 16, 23, 42};
+        tester.addAll(intArray);
+        boolean expected = false;
+        boolean actual = tester.isEmpty();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void isEmptyTest2() {
+        boolean expected = true;
+        boolean actual = tester.isEmpty();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeTest1() {
+        String[] stringArray = {"Going", "up", "the", "river"};
+        tester.addAll(stringArray);
+        tester.remove("the");
+        boolean expected = false;
+        boolean actual = tester.contains("the");
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeTest2() {
+        Integer input = 612;
+        Integer[] intArray = {98, 5, input, 17};
+        tester.addAll(intArray);
+        tester.remove(input);
+        boolean expected = false;
+        boolean actual = tester.contains(input);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeAllTest1() {
+        String[] stringArray = {"Going", "up", "the", "river"};
+        tester.addAll(stringArray);
+        tester.removeAll(stringArray);
+        int expected = 0;
+        int actual = tester.getSet().size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeAllTest2() {
+        String[] stringArray = {"Going", "up", "the", "river"};
+        tester.addAll(stringArray);
+        tester.removeAll(stringArray);
+        Assert.assertFalse(tester.contains("the"));
+    }
+
+    @Test
+    public void sizeTest() {
+        Integer[] intArray = {645, 809, 765, 238};
+        tester.addAll(intArray);
+        int expected = 4;
+        int actual = tester.size();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void toArrayTest() {
+        Integer[] intArray = {645, 809, 765, 238};
+        tester.addAll(intArray);
+        Object[] expected = {645, 809, 765, 238};
+        Object[] actual = tester.toArray();
+        Assert.assertEquals(expected, actual);
+    }
+
+
 }

From 462cc4c3d68a45fa6539ed75600b1cd049b766bf Mon Sep 17 00:00:00 2001
From: Vincent Gasbarro <vincentgasbarro@zipcoders-MacBook-Pro.local>
Date: Sat, 10 Mar 2018 11:08:48 -0500
Subject: [PATCH 4/4] finished

---
 .idea/workspace.xml          | 238 +++++++++++++++++++++--------------
 src/main/java/Entry.java     |  23 ++++
 src/main/java/MyMap.java     |  62 ++++++++-
 src/test/java/MyMapTest.java |  48 +++++++
 4 files changed, 277 insertions(+), 94 deletions(-)
 create mode 100644 src/main/java/Entry.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5ee7ea5..ec148f1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="563e87b0-8c69-4b03-b1c1-b362d5a367c6" name="Default" comment="">
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/MySetTest.java" afterPath="$PROJECT_DIR$/src/test/java/MySetTest.java" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/src/main/java/Entry.java" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/MyMap.java" afterPath="$PROJECT_DIR$/src/main/java/MyMap.java" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/MyMapTest.java" afterPath="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -23,7 +22,7 @@
           <file leaf-file-name="MyArrayList.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="572">
+                <state relative-caret-position="1815">
                   <caret line="121" column="5" lean-forward="true" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
                   <folding>
                     <element signature="imports" expanded="true" />
@@ -47,8 +46,8 @@
           <file leaf-file-name="MySet.java" 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="30">
-                  <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+                <state relative-caret-position="-667">
+                  <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
                   <folding>
                     <element signature="imports" expanded="true" />
                     <element signature="e#451#452#0" expanded="true" />
@@ -64,12 +63,34 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="MyMap.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="Entry.java" pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/src/main/java/Entry.java">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="300">
+                  <caret line="20" column="5" lean-forward="false" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
+                  <folding>
+                    <element signature="e#171#172#0" expanded="true" />
+                    <element signature="e#204#205#0" expanded="true" />
+                    <element signature="e#229#230#0" expanded="true" />
+                    <element signature="e#260#261#0" expanded="true" />
+                    <element signature="e#304#305#0" expanded="true" />
+                    <element signature="e#345#346#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file leaf-file-name="MyMap.java" 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="15">
-                  <caret line="1" column="1" lean-forward="true" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
-                  <folding />
+                <state relative-caret-position="840">
+                  <caret line="56" column="26" lean-forward="false" selection-start-line="56" selection-start-column="26" selection-end-line="56" selection-end-column="26" />
+                  <folding>
+                    <element signature="e#85#86#0" expanded="true" />
+                    <element signature="e#126#127#0" expanded="true" />
+                    <element signature="e#1302#1303#0" expanded="true" />
+                    <element signature="e#1335#1336#0" expanded="true" />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -78,7 +99,7 @@
       </split-first>
       <split-second>
         <leaf>
-          <file leaf-file-name="MyArrayListTest.java" pinned="false" current-in-tab="false">
+          <file leaf-file-name="MyArrayListTest.java" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="1005">
@@ -90,12 +111,16 @@
               </provider>
             </entry>
           </file>
-          <file leaf-file-name="MyMapTest.java" pinned="false" current-in-tab="true">
+          <file leaf-file-name="MyMapTest.java" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="0">
-                  <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
-                  <folding />
+                <state relative-caret-position="675">
+                  <caret line="45" column="46" lean-forward="false" selection-start-line="45" selection-start-column="46" selection-end-line="45" selection-end-column="46" />
+                  <folding>
+                    <element signature="imports" expanded="true" />
+                    <element signature="e#163#164#0" expanded="true" />
+                    <element signature="e#199#200#0" expanded="true" />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -145,6 +170,9 @@
         <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
         <option value="$PROJECT_DIR$/src/test/java/MySetTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
+        <option value="$PROJECT_DIR$/src/main/java/Entry.java" />
+        <option value="$PROJECT_DIR$/src/main/java/MyMap.java" />
+        <option value="$PROJECT_DIR$/src/test/java/MyMapTest.java" />
       </list>
     </option>
   </component>
@@ -243,7 +271,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.MyArrayListTest">
+  <component name="RunManager" selected="JUnit.MyMapTest.sizeTest">
     <configuration default="true" type="Applet" factoryName="Applet">
       <option name="HTML_USED" value="false" />
       <option name="WIDTH" value="400" />
@@ -285,15 +313,15 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.getTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="getTest" />
+      <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
@@ -305,14 +333,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MySetTest.removeAllTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.putTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
-      <option name="METHOD_NAME" value="removeAllTest2" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="putTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -325,14 +353,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MySetTest.sizeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.removeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
-      <option name="METHOD_NAME" value="sizeTest" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="removeTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -345,14 +373,14 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration name="MySetTest.toArrayTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="MyMapTest.sizeTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
       <module name="generics" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="MySetTest" />
-      <option name="METHOD_NAME" value="toArrayTest" />
+      <option name="MAIN_CLASS_NAME" value="MyMapTest" />
+      <option name="METHOD_NAME" value="sizeTest" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -427,18 +455,18 @@
     </configuration>
     <list size="5">
       <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
-      <item index="1" class="java.lang.String" itemvalue="JUnit.MySetTest" />
-      <item index="2" class="java.lang.String" itemvalue="JUnit.MySetTest.removeAllTest2" />
-      <item index="3" class="java.lang.String" itemvalue="JUnit.MySetTest.sizeTest" />
-      <item index="4" class="java.lang.String" itemvalue="JUnit.MySetTest.toArrayTest" />
+      <item index="1" class="java.lang.String" itemvalue="JUnit.MyMapTest.putTest" />
+      <item index="2" class="java.lang.String" itemvalue="JUnit.MyMapTest.getTest" />
+      <item index="3" class="java.lang.String" itemvalue="JUnit.MyMapTest.removeTest" />
+      <item index="4" class="java.lang.String" itemvalue="JUnit.MyMapTest.sizeTest" />
     </list>
     <recent_temporary>
       <list size="5">
-        <item index="0" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
-        <item index="1" class="java.lang.String" itemvalue="JUnit.MySetTest" />
-        <item index="2" class="java.lang.String" itemvalue="JUnit.MySetTest.toArrayTest" />
-        <item index="3" class="java.lang.String" itemvalue="JUnit.MySetTest.sizeTest" />
-        <item index="4" class="java.lang.String" itemvalue="JUnit.MySetTest.removeAllTest2" />
+        <item index="0" class="java.lang.String" itemvalue="JUnit.MyMapTest.sizeTest" />
+        <item index="1" class="java.lang.String" itemvalue="JUnit.MyMapTest.removeTest" />
+        <item index="2" class="java.lang.String" itemvalue="JUnit.MyMapTest.getTest" />
+        <item index="3" class="java.lang.String" itemvalue="JUnit.MyMapTest.putTest" />
+        <item index="4" class="java.lang.String" itemvalue="JUnit.MyArrayListTest" />
       </list>
     </recent_temporary>
   </component>
@@ -455,7 +483,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1520538929269</updated>
-      <workItem from="1520538931743" duration="39151000" />
+      <workItem from="1520538931743" duration="43335000" />
     </task>
     <servers />
   </component>
@@ -463,36 +491,36 @@
     <history-entry file="MyArrayListTest - 2018.03.10 at 09h 15m 39s.xml">
       <configuration name="MyArrayListTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.03.10 at 08h 49m 33s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_getTest - 2018.03.10 at 11h 02m 59s.xml">
+      <configuration name="MyMapTest.getTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.03.10 at 09h 15m 27s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.03.10 at 10h 57m 19s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest - 2018.03.10 at 09h 15m 35s.xml">
-      <configuration name="MySetTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.03.10 at 10h 57m 31s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_removeAllTest2 - 2018.03.10 at 08h 50m 24s.xml">
-      <configuration name="MySetTest.removeAllTest2" configurationId="JUnit" />
+    <history-entry file="MyMapTest_putTest - 2018.03.10 at 10h 57m 49s.xml">
+      <configuration name="MyMapTest.putTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_sizeTest - 2018.03.10 at 08h 53m 32s.xml">
-      <configuration name="MySetTest.sizeTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_removeTest - 2018.03.10 at 11h 07m 27s.xml">
+      <configuration name="MyMapTest.removeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_sizeTest - 2018.03.10 at 08h 54m 00s.xml">
-      <configuration name="MySetTest.sizeTest" configurationId="JUnit" />
+    <history-entry file="MyMapTest_sizeTest - 2018.03.10 at 11h 08m 16s.xml">
+      <configuration name="MyMapTest.sizeTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_sizeTest - 2018.03.10 at 08h 54m 47s.xml">
-      <configuration name="MySetTest.sizeTest" configurationId="JUnit" />
+    <history-entry file="MySetTest - 2018.03.10 at 09h 15m 27s.xml">
+      <configuration name="MySetTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="MySetTest_toArrayTest - 2018.03.10 at 09h 06m 44s.xml">
-      <configuration name="MySetTest.toArrayTest" configurationId="JUnit" />
+    <history-entry file="MySetTest - 2018.03.10 at 09h 15m 35s.xml">
+      <configuration name="MySetTest" configurationId="JUnit" />
     </history-entry>
     <history-entry file="MySetTest_toArrayTest - 2018.03.10 at 09h 09m 48s.xml">
       <configuration name="MySetTest.toArrayTest" configurationId="JUnit" />
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="39151000" />
+    <option name="totallyTimeSpent" value="43335000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="797" extended-state="6" />
@@ -558,28 +586,6 @@
         </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="572">
-          <caret line="121" column="5" lean-forward="true" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#417#418#0" expanded="true" />
-            <element signature="e#450#451#0" expanded="true" />
-            <element signature="e#1025#1026#0" expanded="true" />
-            <element signature="e#1065#1066#0" expanded="true" />
-            <element signature="e#1582#1583#0" expanded="true" />
-            <element signature="e#1624#1625#0" expanded="true" />
-            <element signature="e#2164#2165#0" expanded="true" />
-            <element signature="e#2204#2205#0" expanded="true" />
-            <element signature="e#2477#2478#0" expanded="true" />
-            <element signature="e#2513#2514#0" expanded="true" />
-            <element signature="e#2549#2550#0" expanded="true" />
-            <element signature="e#2589#2590#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/Set.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="145">
@@ -602,8 +608,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
+        <state relative-caret-position="-667">
+          <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#451#452#0" expanded="true" />
@@ -618,29 +624,75 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1005">
-          <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
+        <state relative-caret-position="840">
+          <caret line="56" column="26" lean-forward="false" selection-start-line="56" selection-start-column="26" selection-end-line="56" selection-end-column="26" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#85#86#0" expanded="true" />
+            <element signature="e#126#127#0" expanded="true" />
+            <element signature="e#1302#1303#0" expanded="true" />
+            <element signature="e#1335#1336#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/MyMapTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="22" lean-forward="false" selection-start-line="0" selection-start-column="22" selection-end-line="0" selection-end-column="22" />
-          <folding />
+        <state relative-caret-position="675">
+          <caret line="45" column="46" lean-forward="false" selection-start-line="45" selection-start-column="46" selection-end-line="45" selection-end-column="46" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#163#164#0" expanded="true" />
+            <element signature="e#199#200#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/MyMap.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="1" lean-forward="true" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
-          <folding />
+        <state relative-caret-position="1815">
+          <caret line="121" column="5" lean-forward="true" selection-start-line="121" selection-start-column="5" selection-end-line="121" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#417#418#0" expanded="true" />
+            <element signature="e#450#451#0" expanded="true" />
+            <element signature="e#1025#1026#0" expanded="true" />
+            <element signature="e#1065#1066#0" expanded="true" />
+            <element signature="e#1582#1583#0" expanded="true" />
+            <element signature="e#1624#1625#0" expanded="true" />
+            <element signature="e#2164#2165#0" expanded="true" />
+            <element signature="e#2204#2205#0" expanded="true" />
+            <element signature="e#2477#2478#0" expanded="true" />
+            <element signature="e#2513#2514#0" expanded="true" />
+            <element signature="e#2549#2550#0" expanded="true" />
+            <element signature="e#2589#2590#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1005">
+          <caret line="67" column="0" lean-forward="true" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/Entry.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="300">
+          <caret line="20" column="5" lean-forward="false" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
+          <folding>
+            <element signature="e#171#172#0" expanded="true" />
+            <element signature="e#204#205#0" expanded="true" />
+            <element signature="e#229#230#0" expanded="true" />
+            <element signature="e#260#261#0" expanded="true" />
+            <element signature="e#304#305#0" expanded="true" />
+            <element signature="e#345#346#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/main/java/Entry.java b/src/main/java/Entry.java
new file mode 100644
index 0000000..bcc3eaa
--- /dev/null
+++ b/src/main/java/Entry.java
@@ -0,0 +1,23 @@
+public class Entry<K, V> {
+
+    K key;
+    V value;
+
+    public Entry(K key, V value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public V getValue() {
+        return this.value;
+    }
+
+    public K getKey() {
+        return this.key;
+    }
+
+    public void setValue(V anotherValue) {
+        this.value = anotherValue;
+    }
+
+}
diff --git a/src/main/java/MyMap.java b/src/main/java/MyMap.java
index 87e35e8..d745385 100644
--- a/src/main/java/MyMap.java
+++ b/src/main/java/MyMap.java
@@ -1,2 +1,62 @@
-public class MyMap {
+
+public class MyMap<K, V> {
+
+    private MyArrayList<Entry> map;
+
+    public MyMap() {
+        map = new MyArrayList<>();
+    }
+
+    public boolean containsKey(K key) {
+        for (int i = 0; i < this.map.size(); i++) {
+            if (map.get(i).getKey().equals(key)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public boolean containsValue(V value) {
+        for (int i = 0; i < this.map.size(); i++) {
+            if (map.get(i).getValue().equals(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void put(K key, V value) {
+        for (int i = 0; i < map.size(); i++) {
+            if (containsKey(key)) {
+                map.set(i, new Entry<>(key, value));
+                return;
+            }
+        }
+        map.add(new Entry<>(key, value));
+    }
+
+    public V get(K key) {
+        for (int i = 0; i < map.size(); i++) {
+            if (map.get(i).getKey().equals(key)) {
+                return (V)map.get(i).getValue();
+            }
+        }
+        return null;
+    }
+
+    public void remove(K key) {
+        for (int i = 0; i < map.size(); i++) {
+            if (map.get(i).getKey().equals(key)) {
+                map.remove(i);
+            }
+        }
+
+    }
+
+    public Integer size() {
+        return map.size();
+    }
+
+
+
 }
diff --git a/src/test/java/MyMapTest.java b/src/test/java/MyMapTest.java
index d4d696f..18fc65e 100644
--- a/src/test/java/MyMapTest.java
+++ b/src/test/java/MyMapTest.java
@@ -1,2 +1,50 @@
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
 public class MyMapTest {
+
+    private MyMap tester;
+
+    @Before
+    public void setup() {
+        tester = new MyMap();
+    }
+
+    @Test
+    public void putTest() {
+        tester.put(1, "Red");
+        Assert.assertTrue(tester.containsKey(1));
+        Assert.assertTrue(tester.containsValue("Red"));
+    }
+
+    @Test
+    public void getTest() {
+        tester.put(2, "Orange");
+        Object expected = "Orange";
+        Object actual = tester.get(2);
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void removeTest() {
+        tester.put(1, "Red");
+        tester.put(2, "Orange");
+        tester.put(3, "Yellow");
+        tester.remove(2);
+        Assert.assertFalse(tester.containsValue(2));
+    }
+
+    @Test
+    public void sizeTest() {
+        tester.put(1, "Red");
+        tester.put(2, "Orange");
+        tester.put(3, "Yellow");
+        tester.remove(2);
+        Integer expected = 2;
+        Integer actual = tester.size();
+        Assert.assertEquals(expected, actual);
+    }
+
+
 }