Leon 6 lat temu
rodzic
commit
5eaa9de8f2

+ 117
- 115
.idea/workspace.xml Wyświetl plik

@@ -2,12 +2,11 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
6 6
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java" afterDir="false" />
7 7
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Product.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Product.java" afterDir="false" />
9 8
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/MockConsole.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/MockConsole.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java" afterDir="false" />
11 10
     </list>
12 11
     <ignored path="$PROJECT_DIR$/out/" />
13 12
     <ignored path="$PROJECT_DIR$/target/" />
@@ -20,23 +19,11 @@
20 19
   </component>
21 20
   <component name="FileEditorManager">
22 21
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
23
-      <file leaf-file-name="InventoryToStringTest.java" pinned="false" current-in-tab="false">
24
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryToStringTest.java">
25
-          <provider selected="true" editor-type-id="text-editor">
26
-            <state relative-caret-position="165">
27
-              <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
28
-              <folding>
29
-                <element signature="imports" expanded="true" />
30
-              </folding>
31
-            </state>
32
-          </provider>
33
-        </entry>
34
-      </file>
35
-      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
22
+      <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="false">
36 23
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java">
37 24
           <provider selected="true" editor-type-id="text-editor">
38 25
             <state relative-caret-position="135">
39
-              <caret line="9" column="39" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
26
+              <caret line="9" selection-start-line="9" selection-end-line="9" />
40 27
             </state>
41 28
           </provider>
42 29
         </entry>
@@ -44,26 +31,29 @@
44 31
       <file leaf-file-name="Inventory.java" pinned="false" current-in-tab="false">
45 32
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java">
46 33
           <provider selected="true" editor-type-id="text-editor">
47
-            <state relative-caret-position="690">
48
-              <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
34
+            <state relative-caret-position="189">
35
+              <caret line="36" column="31" lean-forward="true" selection-start-line="36" selection-end-line="37" />
49 36
             </state>
50 37
           </provider>
51 38
         </entry>
52 39
       </file>
53
-      <file leaf-file-name="Product.java" pinned="false" current-in-tab="false">
54
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Product.java">
40
+      <file leaf-file-name="InventoryGetQuantityTest.java" pinned="false" current-in-tab="false">
41
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryGetQuantityTest.java">
55 42
           <provider selected="true" editor-type-id="text-editor">
56
-            <state relative-caret-position="414">
57
-              <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
43
+            <state relative-caret-position="180">
44
+              <caret line="12" column="39" lean-forward="true" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
45
+              <folding>
46
+                <element signature="imports" expanded="true" />
47
+              </folding>
58 48
             </state>
59 49
           </provider>
60 50
         </entry>
61 51
       </file>
62
-      <file leaf-file-name="Console.java" pinned="false" current-in-tab="false">
63
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java">
52
+      <file leaf-file-name="ProductTest.java" pinned="false" current-in-tab="false">
53
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ProductTest.java">
64 54
           <provider selected="true" editor-type-id="text-editor">
65
-            <state relative-caret-position="444">
66
-              <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
55
+            <state relative-caret-position="286">
56
+              <caret line="66" column="16" lean-forward="true" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" />
67 57
               <folding>
68 58
                 <element signature="imports" expanded="true" />
69 59
               </folding>
@@ -71,11 +61,11 @@
71 61
           </provider>
72 62
         </entry>
73 63
       </file>
74
-      <file leaf-file-name="MockConsole.java" pinned="false" current-in-tab="false">
75
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/MockConsole.java">
64
+      <file leaf-file-name="InventoryRemoveTest.java" pinned="false" current-in-tab="false">
65
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java">
76 66
           <provider selected="true" editor-type-id="text-editor">
77
-            <state relative-caret-position="105">
78
-              <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="69" />
67
+            <state relative-caret-position="328">
68
+              <caret line="30" column="15" lean-forward="true" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
79 69
               <folding>
80 70
                 <element signature="imports" expanded="true" />
81 71
               </folding>
@@ -83,20 +73,23 @@
83 73
           </provider>
84 74
         </entry>
85 75
       </file>
86
-      <file leaf-file-name="InventoryManager.java" pinned="false" current-in-tab="false">
87
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java">
88
-          <provider selected="true" editor-type-id="text-editor">
89
-            <state relative-caret-position="-303">
90
-              <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
76
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
77
+        <entry file="file://$PROJECT_DIR$/README.md">
78
+          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
79
+            <state split_layout="SPLIT">
80
+              <first_editor relative-caret-position="380">
81
+                <caret line="49" column="44" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" />
82
+              </first_editor>
83
+              <second_editor />
91 84
             </state>
92 85
           </provider>
93 86
         </entry>
94 87
       </file>
95
-      <file leaf-file-name="InventoryManagerConstructorTest.java" pinned="false" current-in-tab="false">
96
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventorymanager/InventoryManagerConstructorTest.java">
88
+      <file leaf-file-name="Console.java" pinned="false" current-in-tab="false">
89
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java">
97 90
           <provider selected="true" editor-type-id="text-editor">
98
-            <state relative-caret-position="165">
99
-              <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
91
+            <state relative-caret-position="54">
92
+              <caret line="14" column="70" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
100 93
               <folding>
101 94
                 <element signature="imports" expanded="true" />
102 95
               </folding>
@@ -104,11 +97,11 @@
104 97
           </provider>
105 98
         </entry>
106 99
       </file>
107
-      <file leaf-file-name="InventoryManagerAddTest.java" pinned="false" current-in-tab="false">
108
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventorymanager/InventoryManagerAddTest.java">
100
+      <file leaf-file-name="MockConsole.java" pinned="false" current-in-tab="false">
101
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/MockConsole.java">
109 102
           <provider selected="true" editor-type-id="text-editor">
110
-            <state relative-caret-position="165">
111
-              <caret line="12" column="29" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
103
+            <state relative-caret-position="105">
104
+              <caret line="7" column="3" selection-start-line="7" selection-start-column="3" selection-end-line="7" selection-end-column="69" />
112 105
               <folding>
113 106
                 <element signature="imports" expanded="true" />
114 107
               </folding>
@@ -116,14 +109,11 @@
116 109
           </provider>
117 110
         </entry>
118 111
       </file>
119
-      <file leaf-file-name="InventoryRemoveTest.java" pinned="false" current-in-tab="false">
120
-        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java">
112
+      <file leaf-file-name="InventoryManager.java" pinned="false" current-in-tab="true">
113
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java">
121 114
           <provider selected="true" editor-type-id="text-editor">
122
-            <state relative-caret-position="120">
123
-              <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
124
-              <folding>
125
-                <element signature="imports" expanded="true" />
126
-              </folding>
115
+            <state relative-caret-position="606">
116
+              <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
127 117
             </state>
128 118
           </provider>
129 119
         </entry>
@@ -140,6 +130,11 @@
140 130
   <component name="FindInProjectRecents">
141 131
     <findStrings>
142 132
       <find>10</find>
133
+      <find>get(int ind</find>
134
+      <find>get(int</find>
135
+      <find>get(int index)</find>
136
+      <find>get(int index</find>
137
+      <find>int index</find>
143 138
     </findStrings>
144 139
   </component>
145 140
   <component name="Git.Settings">
@@ -149,7 +144,6 @@
149 144
     <option name="CHANGED_PATHS">
150 145
       <list>
151 146
         <option value="$PROJECT_DIR$/.gitignore" />
152
-        <option value="$PROJECT_DIR$/README.md" />
153 147
         <option value="$PROJECT_DIR$/pom.xml" />
154 148
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MockConsole.java" />
155 149
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/InventoryTest.java" />
@@ -184,16 +178,17 @@
184 178
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/GetTotalValueTest.java" />
185 179
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryGetTotalValueTest.java" />
186 180
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/RemoveTest.java" />
187
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java" />
188 181
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventorymanager/InventoryManagerToStringTest.java" />
189 182
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventorymanager/InventoryToStringTest.java" />
190 183
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryToStringTest.java" />
191
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java" />
192
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java" />
193 184
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Product.java" />
194
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java" />
195 185
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/MockConsole.java" />
196 186
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java" />
187
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java" />
188
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java" />
189
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java" />
190
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java" />
191
+        <option value="$PROJECT_DIR$/README.md" />
197 192
       </list>
198 193
     </option>
199 194
   </component>
@@ -637,14 +632,11 @@
637 632
       <option name="number" value="Default" />
638 633
       <option name="presentableId" value="Default" />
639 634
       <updated>1515620835041</updated>
640
-      <workItem from="1542298993587" duration="6946000" />
635
+      <workItem from="1542298993587" duration="9301000" />
641 636
     </task>
642 637
     <servers />
643 638
   </component>
644 639
   <component name="TestHistory">
645
-    <history-entry file="com_zipcodewilmington_in_productmanager - 2018.11.15 at 13h 09m 06s.xml">
646
-      <configuration name="com.zipcodewilmington in productmanager" configurationId="JUnit" />
647
-    </history-entry>
648 640
     <history-entry file="com_zipcodewilmington_in_productmanager - 2018.11.15 at 13h 09m 59s.xml">
649 641
       <configuration name="com.zipcodewilmington in productmanager" configurationId="JUnit" />
650 642
     </history-entry>
@@ -672,9 +664,12 @@
672 664
     <history-entry file="InventoryManagerToStringTest_toStringTest2 - 2018.11.15 at 13h 19m 44s.xml">
673 665
       <configuration name="InventoryManagerToStringTest.toStringTest2" configurationId="JUnit" />
674 666
     </history-entry>
667
+    <history-entry file="com_zipcodewilmington_in_productmanager - 2018.11.15 at 13h 27m 50s.xml">
668
+      <configuration name="com.zipcodewilmington in productmanager" configurationId="JUnit" />
669
+    </history-entry>
675 670
   </component>
676 671
   <component name="TimeTrackingManager">
677
-    <option name="totallyTimeSpent" value="6946000" />
672
+    <option name="totallyTimeSpent" value="9301000" />
678 673
   </component>
679 674
   <component name="ToolWindowManager">
680 675
     <frame x="0" y="23" width="1440" height="873" extended-state="6" />
@@ -774,16 +769,6 @@
774 769
         </state>
775 770
       </provider>
776 771
     </entry>
777
-    <entry file="file://$PROJECT_DIR$/README.md">
778
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
779
-        <state split_layout="SPLIT">
780
-          <first_editor relative-caret-position="285">
781
-            <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
782
-          </first_editor>
783
-          <second_editor />
784
-        </state>
785
-      </provider>
786
-    </entry>
787 772
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/src.zip!/java/util/function/BinaryOperator.java">
788 773
       <provider selected="true" editor-type-id="text-editor">
789 774
         <state relative-caret-position="165">
@@ -833,16 +818,6 @@
833 818
         </state>
834 819
       </provider>
835 820
     </entry>
836
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ProductTest.java">
837
-      <provider selected="true" editor-type-id="text-editor">
838
-        <state relative-caret-position="1170">
839
-          <caret line="78" column="29" selection-start-line="78" selection-start-column="29" selection-end-line="78" selection-end-column="29" />
840
-          <folding>
841
-            <element signature="imports" expanded="true" />
842
-          </folding>
843
-        </state>
844
-      </provider>
845
-    </entry>
846 821
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ConsoleTest.java">
847 822
       <provider selected="true" editor-type-id="text-editor">
848 823
         <state relative-caret-position="294">
@@ -893,16 +868,6 @@
893 868
         </state>
894 869
       </provider>
895 870
     </entry>
896
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryGetQuantityTest.java">
897
-      <provider selected="true" editor-type-id="text-editor">
898
-        <state relative-caret-position="120">
899
-          <caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" />
900
-          <folding>
901
-            <element signature="imports" expanded="true" />
902
-          </folding>
903
-        </state>
904
-      </provider>
905
-    </entry>
906 871
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryGetTotalValueTest.java">
907 872
       <provider selected="true" editor-type-id="text-editor">
908 873
         <state relative-caret-position="120">
@@ -913,16 +878,6 @@
913 878
         </state>
914 879
       </provider>
915 880
     </entry>
916
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java">
917
-      <provider selected="true" editor-type-id="text-editor">
918
-        <state relative-caret-position="120">
919
-          <caret line="8" column="22" selection-start-line="8" selection-start-column="22" selection-end-line="8" selection-end-column="22" />
920
-          <folding>
921
-            <element signature="imports" expanded="true" />
922
-          </folding>
923
-        </state>
924
-      </provider>
925
-    </entry>
926 881
     <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventorymanager/InventoryManagerAddTest.java">
927 882
       <provider selected="true" editor-type-id="text-editor">
928 883
         <state relative-caret-position="165">
@@ -953,37 +908,64 @@
953 908
         </state>
954 909
       </provider>
955 910
     </entry>
956
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java">
911
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java">
957 912
       <provider selected="true" editor-type-id="text-editor">
958
-        <state relative-caret-position="690">
959
-          <caret line="46" column="20" selection-start-line="46" selection-start-column="20" selection-end-line="46" selection-end-column="20" />
913
+        <state relative-caret-position="135">
914
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
960 915
         </state>
961 916
       </provider>
962 917
     </entry>
963
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java">
918
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/ProductTest.java">
964 919
       <provider selected="true" editor-type-id="text-editor">
965
-        <state relative-caret-position="-303">
966
-          <caret line="10" lean-forward="true" selection-start-line="10" selection-end-line="10" />
920
+        <state relative-caret-position="286">
921
+          <caret line="66" column="16" lean-forward="true" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" />
922
+          <folding>
923
+            <element signature="imports" expanded="true" />
924
+          </folding>
925
+        </state>
926
+      </provider>
927
+    </entry>
928
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java">
929
+      <provider selected="true" editor-type-id="text-editor">
930
+        <state relative-caret-position="328">
931
+          <caret line="30" column="15" lean-forward="true" selection-start-line="30" selection-start-column="15" selection-end-line="30" selection-end-column="15" />
932
+          <folding>
933
+            <element signature="imports" expanded="true" />
934
+          </folding>
967 935
         </state>
968 936
       </provider>
969 937
     </entry>
970 938
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Product.java">
971 939
       <provider selected="true" editor-type-id="text-editor">
972
-        <state relative-caret-position="414">
973
-          <caret line="36" column="20" selection-start-line="36" selection-start-column="20" selection-end-line="36" selection-end-column="20" />
940
+        <state relative-caret-position="208">
941
+          <caret line="17" column="19" lean-forward="true" selection-start-line="17" selection-start-column="19" selection-end-line="17" selection-end-column="19" />
974 942
         </state>
975 943
       </provider>
976 944
     </entry>
977
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java">
945
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryGetQuantityTest.java">
978 946
       <provider selected="true" editor-type-id="text-editor">
979
-        <state relative-caret-position="444">
980
-          <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
947
+        <state relative-caret-position="180">
948
+          <caret line="12" column="39" lean-forward="true" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
981 949
           <folding>
982 950
             <element signature="imports" expanded="true" />
983 951
           </folding>
984 952
         </state>
985 953
       </provider>
986 954
     </entry>
955
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java">
956
+      <provider selected="true" editor-type-id="text-editor">
957
+        <state relative-caret-position="189">
958
+          <caret line="36" column="31" lean-forward="true" selection-start-line="36" selection-end-line="37" />
959
+        </state>
960
+      </provider>
961
+    </entry>
962
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_131.jdk/Contents/Home/src.zip!/java/util/List.java">
963
+      <provider selected="true" editor-type-id="text-editor">
964
+        <state relative-caret-position="149">
965
+          <caret line="563" column="19" selection-start-line="563" selection-start-column="10" selection-end-line="563" selection-end-column="19" />
966
+        </state>
967
+      </provider>
968
+    </entry>
987 969
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/MockConsole.java">
988 970
       <provider selected="true" editor-type-id="text-editor">
989 971
         <state relative-caret-position="105">
@@ -994,10 +976,30 @@
994 976
         </state>
995 977
       </provider>
996 978
     </entry>
997
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/MainApplication.java">
979
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/utils/Console.java">
998 980
       <provider selected="true" editor-type-id="text-editor">
999
-        <state relative-caret-position="135">
1000
-          <caret line="9" column="39" selection-start-line="9" selection-start-column="39" selection-end-line="9" selection-end-column="39" />
981
+        <state relative-caret-position="54">
982
+          <caret line="14" column="70" selection-start-line="14" selection-start-column="70" selection-end-line="14" selection-end-column="70" />
983
+          <folding>
984
+            <element signature="imports" expanded="true" />
985
+          </folding>
986
+        </state>
987
+      </provider>
988
+    </entry>
989
+    <entry file="file://$PROJECT_DIR$/README.md">
990
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
991
+        <state split_layout="SPLIT">
992
+          <first_editor relative-caret-position="380">
993
+            <caret line="49" column="44" selection-start-line="49" selection-start-column="44" selection-end-line="49" selection-end-column="44" />
994
+          </first_editor>
995
+          <second_editor />
996
+        </state>
997
+      </provider>
998
+    </entry>
999
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java">
1000
+      <provider selected="true" editor-type-id="text-editor">
1001
+        <state relative-caret-position="606">
1002
+          <caret line="69" column="5" lean-forward="true" selection-start-line="69" selection-start-column="5" selection-end-line="69" selection-end-column="5" />
1001 1003
         </state>
1002 1004
       </provider>
1003 1005
     </entry>

+ 61
- 26
README.md Wyświetl plik

@@ -1,26 +1,61 @@
1
-# Class Manager
2
-
3
-## Product Inventory Project 
4
-
5
-## Objectives
6
-
7
-1. To demonstrate your understanding of objects and functions
8
-2. To demonstrate your understanding of controlling execution
9
-3. To demonstrate your understanding of access control
10
-4. To demonstrate your understanding of reusing classes
11
-
12
-
13
-## Overview
14
-
15
-Create an application which manages an inventory of products. Create a product class which has a price, id, and quantity on hand. Then create an inventory class which keeps track of various products and can sum up the inventory value.
16
-
17
-## Unit Test
18
-
19
-UML is required
20
-Unit test in  place before proceeding with code
21
-
22
-## Instructions
23
-
24
-1. In your main class initialize your manager and populate your inventory
25
-2. Demonstrate calling methods on your manager
26
-3. Print all output to screen
1
+# Product Inventory Project
2
+* **Objective** - to implement an `InventoryManager` which interacts with a _composite_ `Inventory` object by parsing incoming commands from a _composite_ `Console` object.
3
+* **Purpose** - to demonstrate understanding of
4
+	* objects and functions
5
+	* controlling execution
6
+	* access control
7
+	* reusing classes
8
+
9
+
10
+# Part 1.0 - Create class `Product`
11
+* Create a `Product` class.
12
+	* declare a field named `id` of type `Long`.
13
+	* declare a field named `price` of type `Double`.
14
+	* declare a field named `quantity` of type `Integer`.
15
+	* define a constructor, which has paramters of type `(Long, Double, Integer)` used to set each of the respective fields.
16
+	* define a nullary constructor, which sets each field to a `null` value.
17
+	* define getters and setters for each of the fields
18
+
19
+# Part 2.0 - Create class `Inventory`
20
+* Create an `Inventory` class.
21
+	* declare a field named `productList` of type `List` of `Product` objects.
22
+	* define a constructor, which has a paramter of type `List` of `Product` used to set the respective field.
23
+	* define a nullary constructor, which sets the `productList` field to a `new` instance of `ArrayList`.
24
+	* define method named `add`, which adds a `Product` to the _composite_`productList`.
25
+	* define method named `remove`, which makes use of a `Product product` parameter to remove a `Product` from the _composite_`productList`.
26
+	* define method named `contains`, which makes use of a `Product product` parameter to return `true` if the provided `Product` has been added to the `productList` field.
27
+	* define method named `findById` which makes use of a `Long id` parameter to return a `Product` with the respective `id` from the `productList` field.
28
+	* define method named `removeById`, which makes use of a `Long id` parameter to remove a `Product` with the respective `id` from the `productList` field.
29
+	* define method named `getTotalQuantity` which returns the sum of the `quantity` fields of the `Product` objects in the `productList` field.
30
+	* define method named `getTotalValue` which returns the product of the `quantity` and `price` field of each of the `Product` objects in the `productList` field.
31
+	* define getters and setters for each of the fields
32
+
33
+
34
+# Part 3.0 - Create class `Console`
35
+* Create a `Console` class.
36
+	* declare a field named `scanner` of type `Scanner`.
37
+	* declare a field named `out` of type `PrintStream`.
38
+	* define a constructor which makes use of a `(InputStream inputStream, PrintStream printStream)` parameter to set the composite `scanner` and `out` fields.
39
+	* define a nullary constructor, which
40
+		* sets the `scanner` field to a new `Scanner` which takes an argument of `System.in`
41
+		* sets the `out` field to `System.out`
42
+	* define a method named `println`, which makes use of a `String prompt` parameter to print to the `out` field.
43
+	* define a method named `getStringInput` which makes use of a `String prompt` parameter to prompt the user for some input, then returns the input of the user as a string.
44
+	* define a method named `getStringInput` which makes use of a `String prompt` parameter to prompt the user for some input, then returns the input of the user as a string.
45
+	* define a method named `getDoubleInput` which makes use of a `String prompt` parameter to prompt the user for some input, then returns the input of the user as a double.
46
+	* define a method named `getIntegerInput` which makes use of a `String prompt` parameter to prompt the user for some input, then returns the input of the user as a integer.
47
+	* define a method named `getLongInput` which makes use of a `String prompt` parameter to prompt the user for some input, then returns the input of the user as a long.
48
+	
49
+	
50
+# Part 4.0 - Create class `InventoryManager`
51
+* Create an `InventoryManager` class.
52
+	* declare a field named `inventory` of type `Inventory`
53
+	* declare a field named `console` of type `Console`
54
+	* define a constructor which makes use of a `(Inventory inventory, Console console` parameters to set the `inventory` and `console` fields to the respective values
55
+	* define a nullary constructor, which initializes the `inventory` and `console` fields to nullary-constructed `Inventory` and nullary-constructed `Console`.
56
+	* define a method named `getUserInput` which prompts the user to input some variation of `add`, `remove`, `view inventory`, `view product`, or `exit`, then returns the input as a `String.
57
+	* define a method named `add` which makes use of user to input to construct a new `Product` and add it to the `inventory` field.
58
+	* define a method named `remove` which prompts a user to input an `id` and removes a `Product` with the respective `id` from the `inventory` field.
59
+	* define a method named `viewProduct` which prompts a user to input an `id` and displays details about a `Product` with the repspective `id` from the `inventory field.
60
+	* define a method named `viewInventory` which which displays the contents of the inventory.
61
+	* define getters and setters for each of the fields.

+ 8
- 8
src/main/java/com/zipcodewilmington/productmanager/inventory/Inventory.java Wyświetl plik

@@ -16,8 +16,10 @@ public class Inventory {
16 16
     public void add(Product product) {
17 17
     }
18 18
 
19
-    public List<Product> getProductList() {
20
-        return null;
19
+    public void remove(Product product) {
20
+    }
21
+
22
+    public void removeById(Long id) {
21 23
     }
22 24
 
23 25
     public Boolean contains(Product product) {
@@ -28,18 +30,16 @@ public class Inventory {
28 30
         return null;
29 31
     }
30 32
 
31
-    public Integer getTotalQuantity() {
33
+    public List<Product> getProductList() {
32 34
         return null;
33 35
     }
34 36
 
35
-    public Double getTotalValue() {
37
+    public Integer getTotalQuantity() {
36 38
         return null;
37 39
     }
38 40
 
39
-    public void remove(Product product) {
40
-    }
41
-
42
-    public void removeById(Long id) {
41
+    public Double getTotalValue() {
42
+        return null;
43 43
     }
44 44
 
45 45
     @Override

+ 4
- 0
src/main/java/com/zipcodewilmington/productmanager/inventory/InventoryManager.java Wyświetl plik

@@ -12,6 +12,10 @@ public class InventoryManager {
12 12
     public InventoryManager(Inventory inventory, Console console) {
13 13
     }
14 14
 
15
+    /**
16
+     * @ATTENTION_TO_STUDENTS
17
+     * It is recommended that you DO NOT modify this method definition
18
+     */
15 19
     public void start() {
16 20
         while (true) {
17 21
             switch (getUserInput().toLowerCase()) {

+ 1
- 1
src/main/java/com/zipcodewilmington/productmanager/utils/Console.java Wyświetl plik

@@ -2,7 +2,7 @@ package com.zipcodewilmington.productmanager.utils;
2 2
 
3 3
 import java.io.InputStream;
4 4
 import java.io.PrintStream;
5
-import java.util.Scanner;
5
+import java.util.List;
6 6
 
7 7
 /**
8 8
  * @author leon on 15/11/2018.

+ 14
- 0
src/test/java/com/zipcodewilmington/productmanager/inventory/InventoryRemoveTest.java Wyświetl plik

@@ -20,4 +20,18 @@ public class InventoryRemoveTest {
20 20
         // then
21 21
         Assert.assertFalse(inventory.contains(product));
22 22
     }
23
+
24
+    @Test
25
+    public void removeByIdTest() {
26
+        // given
27
+        Inventory inventory = new Inventory();
28
+        Product product = new Product(0L, null, null);
29
+        inventory.add(product);
30
+
31
+        // when
32
+        inventory.removeById(product.getId());
33
+
34
+        // then
35
+        Assert.assertFalse(inventory.contains(product));
36
+    }
23 37
 }