Nick Satinover 6 лет назад
Родитель
Сommit
62cba792cf
3 измененных файлов: 755 добавлений и 0 удалений
  1. 702
    0
      .idea/workspace.xml
  2. 29
    0
      src/main/java/MySet.java
  3. 24
    0
      src/test/java/MySetTest.java

+ 702
- 0
.idea/workspace.xml Просмотреть файл

@@ -0,0 +1,702 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="6eefb94a-8003-4639-a54f-0d11804b5db5" name="Default Changelist" comment="">
5
+      <change beforePath="$PROJECT_DIR$/src/main/java/MySet.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/MySet.java" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/test/java/MySetTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MySetTest.java" afterDir="false" />
7
+    </list>
8
+    <ignored path="$PROJECT_DIR$/target/" />
9
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10
+    <option name="SHOW_DIALOG" value="false" />
11
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
12
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13
+    <option name="LAST_RESOLUTION" value="IGNORE" />
14
+  </component>
15
+  <component name="CoverageDataManager">
16
+    <SUITE FILE_PATH="coverage/generics$MySetTest.ic" NAME="MySetTest Coverage Results" MODIFIED="1542306502632" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
17
+    <SUITE FILE_PATH="coverage/generics$MyArrayListTest.ic" NAME="MyArrayListTest Coverage Results" MODIFIED="1542228761533" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
18
+  </component>
19
+  <component name="CoverageViewManager">
20
+    <option name="myElementSize" value="311" />
21
+  </component>
22
+  <component name="FUSProjectUsageTrigger">
23
+    <session id="914426633">
24
+      <usages-collector id="statistics.lifecycle.project">
25
+        <counts>
26
+          <entry key="project.closed" value="4" />
27
+          <entry key="project.open.time.0" value="3" />
28
+          <entry key="project.open.time.2" value="1" />
29
+          <entry key="project.open.time.23" value="1" />
30
+          <entry key="project.opened" value="5" />
31
+        </counts>
32
+      </usages-collector>
33
+      <usages-collector id="statistics.file.extensions.open">
34
+        <counts>
35
+          <entry key="class" value="14" />
36
+          <entry key="iml" value="2" />
37
+          <entry key="java" value="21" />
38
+          <entry key="xml" value="1" />
39
+        </counts>
40
+      </usages-collector>
41
+      <usages-collector id="statistics.file.types.open">
42
+        <counts>
43
+          <entry key="CLASS" value="14" />
44
+          <entry key="IDEA_MODULE" value="2" />
45
+          <entry key="JAVA" value="21" />
46
+          <entry key="XML" value="1" />
47
+        </counts>
48
+      </usages-collector>
49
+      <usages-collector id="statistics.file.extensions.edit">
50
+        <counts>
51
+          <entry key="java" value="2070" />
52
+          <entry key="txt" value="94" />
53
+          <entry key="xml" value="2" />
54
+        </counts>
55
+      </usages-collector>
56
+      <usages-collector id="statistics.file.types.edit">
57
+        <counts>
58
+          <entry key="JAVA" value="2070" />
59
+          <entry key="PLAIN_TEXT" value="94" />
60
+          <entry key="XML" value="2" />
61
+        </counts>
62
+      </usages-collector>
63
+    </session>
64
+  </component>
65
+  <component name="FileEditorManager">
66
+    <splitter split-orientation="horizontal" split-proportion="0.5">
67
+      <split-first>
68
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
69
+          <file pinned="false" current-in-tab="true">
70
+            <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
71
+              <provider selected="true" editor-type-id="text-editor">
72
+                <state relative-caret-position="155">
73
+                  <caret line="113" column="86" lean-forward="true" selection-start-line="113" selection-start-column="86" selection-end-line="113" selection-end-column="86" />
74
+                  <folding>
75
+                    <element signature="imports" expanded="true" />
76
+                    <element signature="e#244#245#0" expanded="true" />
77
+                    <element signature="e#286#287#0" expanded="true" />
78
+                    <element signature="e#310#311#0" expanded="true" />
79
+                    <element signature="e#348#349#0" expanded="true" />
80
+                    <element signature="e#457#458#0" expanded="true" />
81
+                    <element signature="e#485#486#0" expanded="true" />
82
+                    <element signature="e#817#818#0" expanded="true" />
83
+                    <element signature="e#844#845#0" expanded="true" />
84
+                    <element signature="e#1819#1820#0" expanded="true" />
85
+                    <element signature="e#1847#1848#0" expanded="true" />
86
+                    <element signature="e#1907#1908#0" expanded="true" />
87
+                    <element signature="e#1935#1936#0" expanded="true" />
88
+                    <element signature="e#1997#1998#0" expanded="true" />
89
+                    <element signature="e#2025#2026#0" expanded="true" />
90
+                    <element signature="e#2082#2083#0" expanded="true" />
91
+                    <element signature="e#2118#2119#0" expanded="true" />
92
+                  </folding>
93
+                </state>
94
+              </provider>
95
+            </entry>
96
+          </file>
97
+          <file pinned="false" current-in-tab="false">
98
+            <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/Set.java">
99
+              <provider selected="true" editor-type-id="text-editor">
100
+                <state relative-caret-position="299">
101
+                  <caret line="301" column="70" lean-forward="true" selection-start-line="277" selection-start-column="41" selection-end-line="277" selection-end-column="45" />
102
+                </state>
103
+              </provider>
104
+            </entry>
105
+          </file>
106
+        </leaf>
107
+      </split-first>
108
+      <split-second>
109
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
110
+          <file pinned="false" current-in-tab="true">
111
+            <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
112
+              <provider selected="true" editor-type-id="text-editor">
113
+                <state relative-caret-position="336">
114
+                  <caret line="140" column="10" selection-start-line="140" selection-start-column="10" selection-end-line="140" selection-end-column="10" />
115
+                  <folding>
116
+                    <element signature="imports" expanded="true" />
117
+                    <element signature="e#1474#1480#0" expanded="true" />
118
+                    <element signature="e#1815#1823#0" expanded="true" />
119
+                    <element signature="e#2182#2190#0" expanded="true" />
120
+                    <element signature="e#2583#2591#0" expanded="true" />
121
+                    <element signature="e#2969#2977#0" expanded="true" />
122
+                    <element signature="e#3343#3349#0" expanded="true" />
123
+                  </folding>
124
+                </state>
125
+              </provider>
126
+            </entry>
127
+          </file>
128
+          <file pinned="false" current-in-tab="false">
129
+            <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
130
+              <provider selected="true" editor-type-id="text-editor">
131
+                <state relative-caret-position="375">
132
+                  <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="51" />
133
+                  <folding>
134
+                    <element signature="imports" expanded="true" />
135
+                  </folding>
136
+                </state>
137
+              </provider>
138
+            </entry>
139
+          </file>
140
+          <file pinned="false" current-in-tab="false">
141
+            <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
142
+              <provider selected="true" editor-type-id="text-editor">
143
+                <state relative-caret-position="360">
144
+                  <caret line="81" selection-start-line="81" selection-end-line="81" />
145
+                  <folding>
146
+                    <element signature="e#151#152#0" expanded="true" />
147
+                    <element signature="e#197#198#0" expanded="true" />
148
+                    <element signature="method#add#0;class#MyArrayList#0" />
149
+                    <element signature="method#add#1;class#MyArrayList#0" />
150
+                    <element signature="method#isEmpty#0;class#MyArrayList#0" />
151
+                    <element signature="method#contains#0;class#MyArrayList#0" />
152
+                  </folding>
153
+                </state>
154
+              </provider>
155
+            </entry>
156
+          </file>
157
+        </leaf>
158
+      </split-second>
159
+    </splitter>
160
+  </component>
161
+  <component name="FileTemplateManagerImpl">
162
+    <option name="RECENT_TEMPLATES">
163
+      <list>
164
+        <option value="Class" />
165
+      </list>
166
+    </option>
167
+  </component>
168
+  <component name="FindInProjectRecents">
169
+    <findStrings>
170
+      <find>contains</find>
171
+      <find>addA</find>
172
+    </findStrings>
173
+  </component>
174
+  <component name="Git.Settings">
175
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
176
+  </component>
177
+  <component name="IdeDocumentHistory">
178
+    <option name="CHANGED_PATHS">
179
+      <list>
180
+        <option value="$PROJECT_DIR$/src/main/java/ReadThenDelete.java" />
181
+        <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
182
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
183
+        <option value="$PROJECT_DIR$/pom.xml" />
184
+        <option value="$PROJECT_DIR$/src/main/java/MySet.java" />
185
+        <option value="$PROJECT_DIR$/src/test/java/MySetTest.java" />
186
+      </list>
187
+    </option>
188
+  </component>
189
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
190
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
191
+  <component name="JsGulpfileManager">
192
+    <detection-done>true</detection-done>
193
+    <sorting>DEFINITION_ORDER</sorting>
194
+  </component>
195
+  <component name="MavenImportPreferences">
196
+    <option name="importingSettings">
197
+      <MavenImportingSettings>
198
+        <option name="importAutomatically" value="true" />
199
+      </MavenImportingSettings>
200
+    </option>
201
+  </component>
202
+  <component name="ProjectFrameBounds" extendedState="6">
203
+    <option name="y" value="23" />
204
+    <option name="width" value="1280" />
205
+    <option name="height" value="709" />
206
+  </component>
207
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
208
+    <ConfirmationsSetting value="2" id="Add" />
209
+  </component>
210
+  <component name="ProjectView">
211
+    <navigator proportions="" version="1">
212
+      <foldersAlwaysOnTop value="true" />
213
+    </navigator>
214
+    <panes>
215
+      <pane id="ProjectPane">
216
+        <subPane>
217
+          <expand>
218
+            <path>
219
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
220
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
221
+            </path>
222
+            <path>
223
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
224
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
225
+              <item name="src" type="462c0819:PsiDirectoryNode" />
226
+            </path>
227
+            <path>
228
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
229
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
230
+              <item name="src" type="462c0819:PsiDirectoryNode" />
231
+              <item name="main" type="462c0819:PsiDirectoryNode" />
232
+            </path>
233
+            <path>
234
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
235
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
236
+              <item name="src" type="462c0819:PsiDirectoryNode" />
237
+              <item name="main" type="462c0819:PsiDirectoryNode" />
238
+              <item name="java" type="462c0819:PsiDirectoryNode" />
239
+            </path>
240
+            <path>
241
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
242
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
243
+              <item name="src" type="462c0819:PsiDirectoryNode" />
244
+              <item name="test" type="462c0819:PsiDirectoryNode" />
245
+            </path>
246
+            <path>
247
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
248
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
249
+              <item name="src" type="462c0819:PsiDirectoryNode" />
250
+              <item name="test" type="462c0819:PsiDirectoryNode" />
251
+              <item name="java" type="462c0819:PsiDirectoryNode" />
252
+            </path>
253
+          </expand>
254
+          <select />
255
+        </subPane>
256
+      </pane>
257
+      <pane id="PackagesPane" />
258
+      <pane id="Scope" />
259
+    </panes>
260
+  </component>
261
+  <component name="PropertiesComponent">
262
+    <property name="WebServerToolWindowFactoryState" value="false" />
263
+    <property name="aspect.path.notification.shown" value="true" />
264
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542312676654" />
265
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
266
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
267
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
268
+    <property name="settings.editor.selected.configurable" value="reference.settings.ide.settings.file-colors" />
269
+  </component>
270
+  <component name="RunDashboard">
271
+    <option name="ruleStates">
272
+      <list>
273
+        <RuleState>
274
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
275
+        </RuleState>
276
+        <RuleState>
277
+          <option name="name" value="StatusDashboardGroupingRule" />
278
+        </RuleState>
279
+      </list>
280
+    </option>
281
+  </component>
282
+  <component name="RunManager" selected="JUnit.MySetTest.addAllLongTest">
283
+    <configuration name="MySetTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
284
+      <module name="generics" />
285
+      <option name="PACKAGE_NAME" value="" />
286
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
287
+      <method v="2">
288
+        <option name="Make" enabled="true" />
289
+      </method>
290
+    </configuration>
291
+    <configuration name="MySetTest.addAllLongTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
292
+      <module name="generics" />
293
+      <option name="PACKAGE_NAME" value="" />
294
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
295
+      <option name="METHOD_NAME" value="addAllLongTest" />
296
+      <option name="TEST_OBJECT" value="method" />
297
+      <method v="2">
298
+        <option name="Make" enabled="true" />
299
+      </method>
300
+    </configuration>
301
+    <configuration name="MySetTest.removeBooleanReturnStringTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
302
+      <module name="generics" />
303
+      <option name="PACKAGE_NAME" value="" />
304
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
305
+      <option name="METHOD_NAME" value="removeBooleanReturnStringTest" />
306
+      <option name="TEST_OBJECT" value="method" />
307
+      <method v="2">
308
+        <option name="Make" enabled="true" />
309
+      </method>
310
+    </configuration>
311
+    <configuration name="MySetTest.removeMultipleStringTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
312
+      <module name="generics" />
313
+      <option name="PACKAGE_NAME" value="" />
314
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
315
+      <option name="METHOD_NAME" value="removeMultipleStringTest" />
316
+      <option name="TEST_OBJECT" value="method" />
317
+      <method v="2">
318
+        <option name="Make" enabled="true" />
319
+      </method>
320
+    </configuration>
321
+    <configuration name="MySetTest.removeStringTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
322
+      <module name="generics" />
323
+      <option name="PACKAGE_NAME" value="" />
324
+      <option name="MAIN_CLASS_NAME" value="MySetTest" />
325
+      <option name="METHOD_NAME" value="removeStringTest" />
326
+      <option name="TEST_OBJECT" value="method" />
327
+      <method v="2">
328
+        <option name="Make" enabled="true" />
329
+      </method>
330
+    </configuration>
331
+    <list>
332
+      <item itemvalue="JUnit.MySetTest" />
333
+      <item itemvalue="JUnit.MySetTest.removeStringTest" />
334
+      <item itemvalue="JUnit.MySetTest.removeBooleanReturnStringTest" />
335
+      <item itemvalue="JUnit.MySetTest.removeMultipleStringTest" />
336
+      <item itemvalue="JUnit.MySetTest.addAllLongTest" />
337
+    </list>
338
+    <recent_temporary>
339
+      <list>
340
+        <item itemvalue="JUnit.MySetTest.addAllLongTest" />
341
+        <item itemvalue="JUnit.MySetTest.removeBooleanReturnStringTest" />
342
+        <item itemvalue="JUnit.MySetTest.removeMultipleStringTest" />
343
+        <item itemvalue="JUnit.MySetTest.removeStringTest" />
344
+        <item itemvalue="JUnit.MySetTest" />
345
+      </list>
346
+    </recent_temporary>
347
+  </component>
348
+  <component name="SvnConfiguration">
349
+    <configuration />
350
+  </component>
351
+  <component name="TaskManager">
352
+    <task active="true" id="Default" summary="Default task">
353
+      <changelist id="6eefb94a-8003-4639-a54f-0d11804b5db5" name="Default Changelist" comment="" />
354
+      <created>1542138817022</created>
355
+      <option name="number" value="Default" />
356
+      <option name="presentableId" value="Default" />
357
+      <updated>1542138817022</updated>
358
+      <workItem from="1542138818663" duration="80000" />
359
+      <workItem from="1542145228816" duration="418000" />
360
+      <workItem from="1542165623771" duration="4833000" />
361
+      <workItem from="1542225031291" duration="12159000" />
362
+      <workItem from="1542293882069" duration="7429000" />
363
+    </task>
364
+    <task id="LOCAL-00001" summary="MyArrayList&#10;Get, Add">
365
+      <created>1542167642899</created>
366
+      <option name="number" value="00001" />
367
+      <option name="presentableId" value="LOCAL-00001" />
368
+      <option name="project" value="LOCAL" />
369
+      <updated>1542167642899</updated>
370
+    </task>
371
+    <task id="LOCAL-00002" summary="MyArrayList&#10;Working Add at Index">
372
+      <created>1542222053418</created>
373
+      <option name="number" value="00002" />
374
+      <option name="presentableId" value="LOCAL-00002" />
375
+      <option name="project" value="LOCAL" />
376
+      <updated>1542222053418</updated>
377
+    </task>
378
+    <task id="LOCAL-00003" summary="MyArrayList - Complete&#10;MySet - Working">
379
+      <created>1542228265384</created>
380
+      <option name="number" value="00003" />
381
+      <option name="presentableId" value="LOCAL-00003" />
382
+      <option name="project" value="LOCAL" />
383
+      <updated>1542228265384</updated>
384
+    </task>
385
+    <task id="LOCAL-00004" summary="MyArrayList - Complete&#10;MySet - Working&#10;add, get">
386
+      <created>1542236841108</created>
387
+      <option name="number" value="00004" />
388
+      <option name="presentableId" value="LOCAL-00004" />
389
+      <option name="project" value="LOCAL" />
390
+      <updated>1542236841108</updated>
391
+    </task>
392
+    <task id="LOCAL-00005" summary="MyArrayList - Complete&#10;MySet - Working&#10;add, get, contains">
393
+      <created>1542238200821</created>
394
+      <option name="number" value="00005" />
395
+      <option name="presentableId" value="LOCAL-00005" />
396
+      <option name="project" value="LOCAL" />
397
+      <updated>1542238200821</updated>
398
+    </task>
399
+    <task id="LOCAL-00006" summary="MyArrayList - Complete&#10;MySet - Working&#10;add, get, contains, remove">
400
+      <created>1542309133545</created>
401
+      <option name="number" value="00006" />
402
+      <option name="presentableId" value="LOCAL-00006" />
403
+      <option name="project" value="LOCAL" />
404
+      <updated>1542309133545</updated>
405
+    </task>
406
+    <option name="localTasksCounter" value="7" />
407
+    <servers />
408
+  </component>
409
+  <component name="TestHistory">
410
+    <history-entry file="MySetTest_removeStringTest - 2018.11.15 at 14h 01m 59s.xml">
411
+      <configuration name="MySetTest.removeStringTest" configurationId="JUnit" />
412
+    </history-entry>
413
+    <history-entry file="MySetTest_removeStringTest - 2018.11.15 at 14h 03m 39s.xml">
414
+      <configuration name="MySetTest.removeStringTest" configurationId="JUnit" />
415
+    </history-entry>
416
+    <history-entry file="MySetTest_removeBooleanReturnStringTest - 2018.11.15 at 14h 05m 57s.xml">
417
+      <configuration name="MySetTest.removeBooleanReturnStringTest" configurationId="JUnit" />
418
+    </history-entry>
419
+    <history-entry file="MySetTest_removeMultipleStringTest - 2018.11.15 at 14h 06m 57s.xml">
420
+      <configuration name="MySetTest.removeMultipleStringTest" configurationId="JUnit" />
421
+    </history-entry>
422
+    <history-entry file="MySetTest_removeMultipleStringTest - 2018.11.15 at 14h 07m 10s.xml">
423
+      <configuration name="MySetTest.removeMultipleStringTest" configurationId="JUnit" />
424
+    </history-entry>
425
+    <history-entry file="MySetTest_addAllLongTest - 2018.11.15 at 14h 39m 38s.xml">
426
+      <configuration name="MySetTest.addAllLongTest" configurationId="JUnit" />
427
+    </history-entry>
428
+    <history-entry file="MySetTest_addAllLongTest - 2018.11.15 at 14h 51m 04s.xml">
429
+      <configuration name="MySetTest.addAllLongTest" configurationId="JUnit" />
430
+    </history-entry>
431
+    <history-entry file="MySetTest_addAllLongTest - 2018.11.15 at 15h 01m 46s.xml">
432
+      <configuration name="MySetTest.addAllLongTest" configurationId="JUnit" />
433
+    </history-entry>
434
+    <history-entry file="MySetTest_removeBooleanReturnStringTest - 2018.11.15 at 15h 02m 31s.xml">
435
+      <configuration name="MySetTest.removeBooleanReturnStringTest" configurationId="JUnit" />
436
+    </history-entry>
437
+    <history-entry file="MySetTest_addAllLongTest - 2018.11.15 at 15h 09m 59s.xml">
438
+      <configuration name="MySetTest.addAllLongTest" configurationId="JUnit" />
439
+    </history-entry>
440
+  </component>
441
+  <component name="TimeTrackingManager">
442
+    <option name="totallyTimeSpent" value="24919000" />
443
+  </component>
444
+  <component name="ToolWindowManager">
445
+    <frame x="0" y="23" width="1280" height="709" extended-state="6" />
446
+    <editor active="true" />
447
+    <layout>
448
+      <window_info content_ui="combo" id="Project" order="0" weight="0.17285945" />
449
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
450
+      <window_info id="Image Layers" order="2" />
451
+      <window_info id="Designer" order="3" />
452
+      <window_info id="UI Designer" order="4" />
453
+      <window_info id="Capture Tool" order="5" />
454
+      <window_info id="Favorites" order="6" side_tool="true" />
455
+      <window_info anchor="bottom" id="Message" order="0" />
456
+      <window_info anchor="bottom" id="Find" order="1" weight="0.32953367" />
457
+      <window_info anchor="bottom" id="Run" order="2" weight="0.18238342" />
458
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
459
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
460
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
461
+      <window_info anchor="bottom" id="TODO" order="6" />
462
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
463
+      <window_info anchor="bottom" id="Terminal" order="8" />
464
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
465
+      <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
466
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32953367" />
467
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
468
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
469
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
470
+      <window_info anchor="right" id="Palette" order="3" />
471
+      <window_info anchor="right" id="Capture Analysis" order="4" />
472
+      <window_info anchor="right" id="Theme Preview" order="5" />
473
+      <window_info anchor="right" id="Palette&#9;" order="6" />
474
+      <window_info anchor="right" id="Database" order="7" />
475
+      <window_info anchor="right" id="Maven Projects" order="8" />
476
+      <window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.32960597" />
477
+    </layout>
478
+  </component>
479
+  <component name="TypeScriptGeneratedFilesManager">
480
+    <option name="version" value="1" />
481
+  </component>
482
+  <component name="VcsContentAnnotationSettings">
483
+    <option name="myLimit" value="2678400000" />
484
+  </component>
485
+  <component name="VcsManagerConfiguration">
486
+    <MESSAGE value="MyArrayList&#10;Get, Add" />
487
+    <MESSAGE value="MyArrayList&#10;Working Add at Index" />
488
+    <MESSAGE value="MyArrayList - Complete&#10;MySet - Working" />
489
+    <MESSAGE value="MyArrayList - Complete&#10;MySet - Working&#10;add, get" />
490
+    <MESSAGE value="MyArrayList - Complete&#10;MySet - Working&#10;add, get, contains" />
491
+    <MESSAGE value="MyArrayList - Complete&#10;MySet - Working&#10;add, get, contains, remove" />
492
+    <option name="LAST_COMMIT_MESSAGE" value="MyArrayList - Complete&#10;MySet - Working&#10;add, get, contains, remove" />
493
+  </component>
494
+  <component name="XDebuggerManager">
495
+    <breakpoint-manager>
496
+      <breakpoints>
497
+        <line-breakpoint enabled="true" type="java-line">
498
+          <url>file://$PROJECT_DIR$/src/test/java/MySetTest.java</url>
499
+          <line>142</line>
500
+          <properties />
501
+          <option name="timeStamp" value="3" />
502
+        </line-breakpoint>
503
+      </breakpoints>
504
+    </breakpoint-manager>
505
+    <watches-manager>
506
+      <configuration name="JUnit">
507
+        <watch expression="newGenericArray[i]" language="JAVA" />
508
+      </configuration>
509
+    </watches-manager>
510
+  </component>
511
+  <component name="debuggerHistoryManager">
512
+    <expressions id="watch">
513
+      <expression>
514
+        <expression-string>newGenericArray[i]</expression-string>
515
+        <language-id>JAVA</language-id>
516
+        <evaluation-mode>EXPRESSION</evaluation-mode>
517
+      </expression>
518
+    </expressions>
519
+  </component>
520
+  <component name="editorHistoryManager">
521
+    <entry file="file://$PROJECT_DIR$/generics.iml">
522
+      <provider selected="true" editor-type-id="text-editor" />
523
+    </entry>
524
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/model/FrameworkMethod.class">
525
+      <provider selected="true" editor-type-id="text-editor">
526
+        <state relative-caret-position="180">
527
+          <caret line="49" selection-start-line="49" selection-end-line="49" />
528
+        </state>
529
+      </provider>
530
+    </entry>
531
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/Assert.class">
532
+      <provider selected="true" editor-type-id="text-editor">
533
+        <state relative-caret-position="281">
534
+          <caret line="362" selection-start-line="362" selection-end-line="362" />
535
+        </state>
536
+      </provider>
537
+    </entry>
538
+    <entry file="file://$PROJECT_DIR$/src/main/java/ReadThenDelete.java">
539
+      <provider selected="true" editor-type-id="text-editor">
540
+        <state relative-caret-position="45">
541
+          <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
542
+        </state>
543
+      </provider>
544
+    </entry>
545
+    <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
546
+      <provider selected="true" editor-type-id="text-editor">
547
+        <state relative-caret-position="375">
548
+          <caret line="25" column="30" lean-forward="true" selection-start-line="25" selection-start-column="30" selection-end-line="25" selection-end-column="51" />
549
+          <folding>
550
+            <element signature="imports" expanded="true" />
551
+          </folding>
552
+        </state>
553
+      </provider>
554
+    </entry>
555
+    <entry file="file://$PROJECT_DIR$/pom.xml">
556
+      <provider selected="true" editor-type-id="text-editor">
557
+        <state relative-caret-position="240">
558
+          <caret line="16" column="31" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
559
+        </state>
560
+      </provider>
561
+    </entry>
562
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
563
+      <provider selected="true" editor-type-id="text-editor">
564
+        <state relative-caret-position="360">
565
+          <caret line="81" selection-start-line="81" selection-end-line="81" />
566
+          <folding>
567
+            <element signature="e#151#152#0" expanded="true" />
568
+            <element signature="e#197#198#0" expanded="true" />
569
+            <element signature="method#add#0;class#MyArrayList#0" />
570
+            <element signature="method#add#1;class#MyArrayList#0" />
571
+            <element signature="method#isEmpty#0;class#MyArrayList#0" />
572
+            <element signature="method#contains#0;class#MyArrayList#0" />
573
+          </folding>
574
+        </state>
575
+      </provider>
576
+    </entry>
577
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/lang/reflect/Array.java">
578
+      <provider selected="true" editor-type-id="text-editor">
579
+        <state relative-caret-position="254">
580
+          <caret line="74" selection-start-line="74" selection-end-line="74" />
581
+        </state>
582
+      </provider>
583
+    </entry>
584
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/ParentRunner.class">
585
+      <provider selected="true" editor-type-id="text-editor">
586
+        <state relative-caret-position="229">
587
+          <caret line="203" selection-start-line="203" selection-end-line="203" />
588
+        </state>
589
+      </provider>
590
+    </entry>
591
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/internal/runners/model/EachTestNotifier.class">
592
+      <provider selected="true" editor-type-id="text-editor">
593
+        <state relative-caret-position="285">
594
+          <caret line="27" selection-start-line="27" selection-end-line="27" />
595
+        </state>
596
+      </provider>
597
+    </entry>
598
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runner/notification/RunNotifier.class">
599
+      <provider selected="true" editor-type-id="text-editor">
600
+        <state relative-caret-position="163">
601
+          <caret line="77" selection-start-line="77" selection-end-line="77" />
602
+          <folding>
603
+            <element signature="e#2379#2380#0" expanded="true" />
604
+            <element signature="e#2456#2457#0" expanded="true" />
605
+            <element signature="e#4424#4425#0" expanded="true" />
606
+            <element signature="e#4488#4489#0" expanded="true" />
607
+          </folding>
608
+        </state>
609
+      </provider>
610
+    </entry>
611
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runner/notification/Failure.class">
612
+      <provider selected="true" editor-type-id="text-editor">
613
+        <state relative-caret-position="210">
614
+          <caret line="20" selection-start-line="20" selection-end-line="20" />
615
+        </state>
616
+      </provider>
617
+    </entry>
618
+    <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/internal/runners/model/ReflectiveCallable.class">
619
+      <provider selected="true" editor-type-id="text-editor">
620
+        <state relative-caret-position="210">
621
+          <caret line="17" selection-start-line="17" selection-end-line="17" />
622
+        </state>
623
+      </provider>
624
+    </entry>
625
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/Set.java">
626
+      <provider selected="true" editor-type-id="text-editor">
627
+        <state relative-caret-position="299">
628
+          <caret line="301" column="70" lean-forward="true" selection-start-line="277" selection-start-column="41" selection-end-line="277" selection-end-column="45" />
629
+        </state>
630
+      </provider>
631
+    </entry>
632
+    <entry file="file://$PROJECT_DIR$/src/main/java/MySet.java">
633
+      <provider selected="true" editor-type-id="text-editor">
634
+        <state relative-caret-position="155">
635
+          <caret line="113" column="86" lean-forward="true" selection-start-line="113" selection-start-column="86" selection-end-line="113" selection-end-column="86" />
636
+          <folding>
637
+            <element signature="imports" expanded="true" />
638
+            <element signature="e#244#245#0" expanded="true" />
639
+            <element signature="e#286#287#0" expanded="true" />
640
+            <element signature="e#310#311#0" expanded="true" />
641
+            <element signature="e#348#349#0" expanded="true" />
642
+            <element signature="e#457#458#0" expanded="true" />
643
+            <element signature="e#485#486#0" expanded="true" />
644
+            <element signature="e#817#818#0" expanded="true" />
645
+            <element signature="e#844#845#0" expanded="true" />
646
+            <element signature="e#1819#1820#0" expanded="true" />
647
+            <element signature="e#1847#1848#0" expanded="true" />
648
+            <element signature="e#1907#1908#0" expanded="true" />
649
+            <element signature="e#1935#1936#0" expanded="true" />
650
+            <element signature="e#1997#1998#0" expanded="true" />
651
+            <element signature="e#2025#2026#0" expanded="true" />
652
+            <element signature="e#2082#2083#0" expanded="true" />
653
+            <element signature="e#2118#2119#0" expanded="true" />
654
+          </folding>
655
+        </state>
656
+      </provider>
657
+    </entry>
658
+    <entry file="file://$PROJECT_DIR$/src/test/java/MySetTest.java">
659
+      <provider selected="true" editor-type-id="text-editor">
660
+        <state relative-caret-position="336">
661
+          <caret line="140" column="10" selection-start-line="140" selection-start-column="10" selection-end-line="140" selection-end-column="10" />
662
+          <folding>
663
+            <element signature="imports" expanded="true" />
664
+            <element signature="e#1474#1480#0" expanded="true" />
665
+            <element signature="e#1815#1823#0" expanded="true" />
666
+            <element signature="e#2182#2190#0" expanded="true" />
667
+            <element signature="e#2583#2591#0" expanded="true" />
668
+            <element signature="e#2969#2977#0" expanded="true" />
669
+            <element signature="e#3343#3349#0" expanded="true" />
670
+          </folding>
671
+        </state>
672
+      </provider>
673
+    </entry>
674
+  </component>
675
+  <component name="masterDetails">
676
+    <states>
677
+      <state key="ProjectJDKs.UI">
678
+        <settings>
679
+          <last-edited>1.8</last-edited>
680
+          <splitter-proportions>
681
+            <option name="proportions">
682
+              <list>
683
+                <option value="0.2" />
684
+              </list>
685
+            </option>
686
+          </splitter-proportions>
687
+        </settings>
688
+      </state>
689
+      <state key="ScopeChooserConfigurable.UI">
690
+        <settings>
691
+          <splitter-proportions>
692
+            <option name="proportions">
693
+              <list>
694
+                <option value="0.2" />
695
+              </list>
696
+            </option>
697
+          </splitter-proportions>
698
+        </settings>
699
+      </state>
700
+    </states>
701
+  </component>
702
+</project>

+ 29
- 0
src/main/java/MySet.java Просмотреть файл

@@ -1,4 +1,5 @@
1 1
 import java.lang.reflect.Array;
2
+import java.util.Arrays;
2 3
 import java.util.Collection;
3 4
 import java.util.Iterator;
4 5
 import java.util.Set;
@@ -62,6 +63,9 @@ public class MySet<T> extends MyArrayList implements Set {
62 63
 
63 64
     @Override
64 65
     public boolean add(Object o) {
66
+        super.add(o);
67
+
68
+
65 69
         T[] newGenericSet = (T[]) Array.newInstance(this.genericSet.getClass().getComponentType(),
66 70
                 genericSet.length + 1);
67 71
 
@@ -105,6 +109,31 @@ public class MySet<T> extends MyArrayList implements Set {
105 109
 
106 110
     @Override
107 111
     public boolean addAll(Collection c) {
112
+
113
+        T[] newGenericSet = Arrays.copyOf(this.genericSet, size() + c.size());
114
+
115
+
116
+//        T[] newGenericSet = (T[]) Array.newInstance(this.genericSet.getClass().getComponentType(),
117
+//                genericSet.length + c.size());
118
+
119
+//        T[] cSet = (T[]) Array.newInstance(c.getClass().getComponentType(), c.size());
120
+
121
+//        int i = 0;
122
+//        for (T elem: genericSet) {
123
+//            newGenericSet[i] = elem;
124
+//            i++;
125
+//        }
126
+
127
+        int i = size();
128
+
129
+        for (Object elem: c) {
130
+            newGenericSet[i] = elem;
131
+            i++;
132
+        }
133
+
134
+        genericSet = newGenericSet;
135
+
136
+
108 137
         return false;
109 138
     }
110 139
 

+ 24
- 0
src/test/java/MySetTest.java Просмотреть файл

@@ -1,6 +1,10 @@
1 1
 import org.junit.Assert;
2 2
 import org.junit.Test;
3 3
 
4
+import java.util.ArrayList;
5
+import java.util.Arrays;
6
+import java.util.Collection;
7
+
4 8
 public class MySetTest {
5 9
     MyArrayList myArrayList = new MyArrayList();
6 10
 
@@ -122,4 +126,24 @@ public class MySetTest {
122 126
         // Then
123 127
         Assert.assertEquals(expected, actual);
124 128
     }
129
+
130
+    @Test
131
+    public void addAllLongTest() {
132
+        // Given
133
+        Long[] expected = {1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L};
134
+        Long[] inputArray = {1L, 2L, 3L, 4L};
135
+        //Long[] addAllArray = {5L, 6L, 7L, 8L};
136
+        ArrayList<Long> addAllArray = new ArrayList<>();
137
+        addAllArray.add(5L); addAllArray.add(6L); addAllArray.add(7L); addAllArray.add(8L);
138
+
139
+        MySet<Long> mySet = new MySet<Long>(inputArray);
140
+
141
+        // When
142
+        //mySet.addAll(Arrays.asList(addAllArray));
143
+        mySet.addAll(addAllArray);
144
+        Long[] actual = mySet.get();
145
+
146
+        // Then
147
+        Assert.assertEquals(expected, actual);
148
+    }
125 149
 }