Explorar el Código

new changes wk 10

Xcuello hace 5 años
padre
commit
5db92ed825

+ 1
- 0
.idea/.name Ver fichero

@@ -0,0 +1 @@
1
+generics

+ 16
- 0
.idea/compiler.xml Ver fichero

@@ -0,0 +1,16 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="CompilerConfiguration">
4
+    <annotationProcessing>
5
+      <profile name="Maven default annotation processors profile" enabled="true">
6
+        <sourceOutputDir name="target/generated-sources/annotations" />
7
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8
+        <outputRelativeToContentRoot value="true" />
9
+        <module name="generics" />
10
+      </profile>
11
+    </annotationProcessing>
12
+    <bytecodeTargetLevel>
13
+      <module name="generics" target="1.8" />
14
+    </bytecodeTargetLevel>
15
+  </component>
16
+</project>

+ 13
- 0
.idea/libraries/Maven__junit_junit_4_12.xml Ver fichero

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: junit:junit:4.12">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 13
- 0
.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml Ver fichero

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 13
- 0
.idea/misc.xml Ver fichero

@@ -0,0 +1,13 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="MavenProjectsManager">
4
+    <option name="originalFiles">
5
+      <list>
6
+        <option value="$PROJECT_DIR$/pom.xml" />
7
+      </list>
8
+    </option>
9
+  </component>
10
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
11
+    <output url="file://$PROJECT_DIR$/classes" />
12
+  </component>
13
+</project>

+ 8
- 0
.idea/modules.xml Ver fichero

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/generics.iml" filepath="$PROJECT_DIR$/generics.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6
- 0
.idea/vcs.xml Ver fichero

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
+  </component>
6
+</project>

+ 443
- 0
.idea/workspace.xml Ver fichero

@@ -0,0 +1,443 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="c25d28c5-c849-41d5-8318-4f1ab8f4c3ec" name="Default Changelist" comment="">
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/MyArrayList.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
8
+    </list>
9
+    <ignored path="$PROJECT_DIR$/target/" />
10
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11
+    <option name="SHOW_DIALOG" value="false" />
12
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
13
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
14
+    <option name="LAST_RESOLUTION" value="IGNORE" />
15
+  </component>
16
+  <component name="FUSProjectUsageTrigger">
17
+    <session id="-629860460">
18
+      <usages-collector id="statistics.lifecycle.project">
19
+        <counts>
20
+          <entry key="project.closed" value="22" />
21
+          <entry key="project.open.time.0" value="7" />
22
+          <entry key="project.open.time.1" value="10" />
23
+          <entry key="project.open.time.2" value="1" />
24
+          <entry key="project.open.time.8" value="4" />
25
+          <entry key="project.opened" value="22" />
26
+        </counts>
27
+      </usages-collector>
28
+      <usages-collector id="statistics.file.extensions.open">
29
+        <counts>
30
+          <entry key="JAVA/MyArrayList" value="1" />
31
+          <entry key="java" value="6" />
32
+          <entry key="xml" value="1" />
33
+        </counts>
34
+      </usages-collector>
35
+      <usages-collector id="statistics.file.types.open">
36
+        <counts>
37
+          <entry key="JAVA" value="5" />
38
+          <entry key="Scratch" value="1" />
39
+          <entry key="UML" value="1" />
40
+          <entry key="XML" value="1" />
41
+        </counts>
42
+      </usages-collector>
43
+      <usages-collector id="statistics.file.extensions.edit">
44
+        <counts>
45
+          <entry key="java" value="3587" />
46
+          <entry key="xml" value="2" />
47
+        </counts>
48
+      </usages-collector>
49
+      <usages-collector id="statistics.file.types.edit">
50
+        <counts>
51
+          <entry key="JAVA" value="3587" />
52
+          <entry key="XML" value="2" />
53
+        </counts>
54
+      </usages-collector>
55
+    </session>
56
+  </component>
57
+  <component name="FileEditorManager">
58
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
59
+      <file pinned="false" current-in-tab="true">
60
+        <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
61
+          <provider selected="true" editor-type-id="text-editor">
62
+            <state relative-caret-position="283">
63
+              <caret line="38" column="48" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
64
+              <folding>
65
+                <element signature="e#125#126#0" expanded="true" />
66
+                <element signature="e#159#160#0" expanded="true" />
67
+              </folding>
68
+            </state>
69
+          </provider>
70
+        </entry>
71
+      </file>
72
+      <file pinned="false" current-in-tab="false">
73
+        <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
74
+          <provider selected="true" editor-type-id="text-editor">
75
+            <state relative-caret-position="1815">
76
+              <caret line="121" column="8" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="8" />
77
+              <folding>
78
+                <element signature="imports" expanded="true" />
79
+              </folding>
80
+            </state>
81
+          </provider>
82
+        </entry>
83
+      </file>
84
+    </leaf>
85
+  </component>
86
+  <component name="FileTemplateManagerImpl">
87
+    <option name="RECENT_TEMPLATES">
88
+      <list>
89
+        <option value="Class" />
90
+      </list>
91
+    </option>
92
+  </component>
93
+  <component name="Git.Settings">
94
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
95
+  </component>
96
+  <component name="IdeDocumentHistory">
97
+    <option name="CHANGED_PATHS">
98
+      <list>
99
+        <option value="$PROJECT_DIR$/pom.xml" />
100
+        <option value="$PROJECT_DIR$/src/main/java/MyArrayList.java" />
101
+        <option value="$PROJECT_DIR$/src/test/java/MyArrayListTest.java" />
102
+      </list>
103
+    </option>
104
+  </component>
105
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
106
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
107
+  <component name="JsGulpfileManager">
108
+    <detection-done>true</detection-done>
109
+    <sorting>DEFINITION_ORDER</sorting>
110
+  </component>
111
+  <component name="MavenImportPreferences">
112
+    <option name="importingSettings">
113
+      <MavenImportingSettings>
114
+        <option name="importAutomatically" value="true" />
115
+      </MavenImportingSettings>
116
+    </option>
117
+  </component>
118
+  <component name="ProjectFrameBounds" extendedState="6">
119
+    <option name="y" value="23" />
120
+    <option name="width" value="1920" />
121
+    <option name="height" value="945" />
122
+  </component>
123
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
124
+  <component name="ProjectView">
125
+    <navigator proportions="" version="1">
126
+      <foldersAlwaysOnTop value="true" />
127
+    </navigator>
128
+    <panes>
129
+      <pane id="Scope" />
130
+      <pane id="ProjectPane">
131
+        <subPane>
132
+          <expand>
133
+            <path>
134
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
135
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
136
+            </path>
137
+            <path>
138
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
139
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
140
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
141
+            </path>
142
+            <path>
143
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
144
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
145
+              <item name="src" type="462c0819:PsiDirectoryNode" />
146
+            </path>
147
+            <path>
148
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
149
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
150
+              <item name="src" type="462c0819:PsiDirectoryNode" />
151
+              <item name="main" type="462c0819:PsiDirectoryNode" />
152
+            </path>
153
+            <path>
154
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
155
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
156
+              <item name="src" type="462c0819:PsiDirectoryNode" />
157
+              <item name="main" type="462c0819:PsiDirectoryNode" />
158
+              <item name="java" type="462c0819:PsiDirectoryNode" />
159
+            </path>
160
+            <path>
161
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
162
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
163
+              <item name="src" type="462c0819:PsiDirectoryNode" />
164
+              <item name="test" type="462c0819:PsiDirectoryNode" />
165
+            </path>
166
+            <path>
167
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
168
+              <item name="CR-MicroLabs-Generics-MyArrayList" type="462c0819:PsiDirectoryNode" />
169
+              <item name="src" type="462c0819:PsiDirectoryNode" />
170
+              <item name="test" type="462c0819:PsiDirectoryNode" />
171
+              <item name="java" type="462c0819:PsiDirectoryNode" />
172
+            </path>
173
+            <path>
174
+              <item name="generics" type="b2602c69:ProjectViewProjectNode" />
175
+              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
176
+            </path>
177
+          </expand>
178
+          <select />
179
+        </subPane>
180
+      </pane>
181
+      <pane id="PackagesPane" />
182
+    </panes>
183
+  </component>
184
+  <component name="PropertiesComponent">
185
+    <property name="WebServerToolWindowFactoryState" value="false" />
186
+    <property name="aspect.path.notification.shown" value="true" />
187
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1545943789677" />
188
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
189
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
190
+    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
191
+  </component>
192
+  <component name="RunDashboard">
193
+    <option name="ruleStates">
194
+      <list>
195
+        <RuleState>
196
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
197
+        </RuleState>
198
+        <RuleState>
199
+          <option name="name" value="StatusDashboardGroupingRule" />
200
+        </RuleState>
201
+      </list>
202
+    </option>
203
+  </component>
204
+  <component name="RunManager" selected="JUnit.MyArrayListTest.removeIndexInteger">
205
+    <configuration name="MyArrayListTest.addTestInteger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
206
+      <module name="generics" />
207
+      <option name="PACKAGE_NAME" value="" />
208
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
209
+      <option name="METHOD_NAME" value="addTestInteger" />
210
+      <option name="TEST_OBJECT" value="method" />
211
+      <method v="2">
212
+        <option name="Make" enabled="true" />
213
+      </method>
214
+    </configuration>
215
+    <configuration name="MyArrayListTest.getIntegerTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
216
+      <module name="generics" />
217
+      <option name="PACKAGE_NAME" value="" />
218
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
219
+      <option name="METHOD_NAME" value="getIntegerTest" />
220
+      <option name="TEST_OBJECT" value="method" />
221
+      <method v="2">
222
+        <option name="Make" enabled="true" />
223
+      </method>
224
+    </configuration>
225
+    <configuration name="MyArrayListTest.removeIndexInteger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
226
+      <module name="generics" />
227
+      <option name="PACKAGE_NAME" value="" />
228
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
229
+      <option name="METHOD_NAME" value="removeIndexInteger" />
230
+      <option name="TEST_OBJECT" value="method" />
231
+      <method v="2">
232
+        <option name="Make" enabled="true" />
233
+      </method>
234
+    </configuration>
235
+    <configuration name="MyArrayListTest.removeTestInteger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
236
+      <module name="generics" />
237
+      <option name="PACKAGE_NAME" value="" />
238
+      <option name="MAIN_CLASS_NAME" value="MyArrayListTest" />
239
+      <option name="METHOD_NAME" value="removeTestInteger" />
240
+      <option name="TEST_OBJECT" value="method" />
241
+      <method v="2">
242
+        <option name="Make" enabled="true" />
243
+      </method>
244
+    </configuration>
245
+    <list>
246
+      <item itemvalue="JUnit.MyArrayListTest.addTestInteger" />
247
+      <item itemvalue="JUnit.MyArrayListTest.getIntegerTest" />
248
+      <item itemvalue="JUnit.MyArrayListTest.removeTestInteger" />
249
+      <item itemvalue="JUnit.MyArrayListTest.removeIndexInteger" />
250
+    </list>
251
+    <recent_temporary>
252
+      <list>
253
+        <item itemvalue="JUnit.MyArrayListTest.removeIndexInteger" />
254
+        <item itemvalue="JUnit.MyArrayListTest.removeTestInteger" />
255
+        <item itemvalue="JUnit.MyArrayListTest.getIntegerTest" />
256
+        <item itemvalue="JUnit.MyArrayListTest.addTestInteger" />
257
+      </list>
258
+    </recent_temporary>
259
+  </component>
260
+  <component name="SvnConfiguration">
261
+    <configuration />
262
+  </component>
263
+  <component name="TaskManager">
264
+    <task active="true" id="Default" summary="Default task">
265
+      <changelist id="c25d28c5-c849-41d5-8318-4f1ab8f4c3ec" name="Default Changelist" comment="" />
266
+      <created>1542230465056</created>
267
+      <option name="number" value="Default" />
268
+      <option name="presentableId" value="Default" />
269
+      <updated>1542230465056</updated>
270
+      <workItem from="1542230466498" duration="99000" />
271
+      <workItem from="1542748879211" duration="108000" />
272
+      <workItem from="1542749003166" duration="4806000" />
273
+      <workItem from="1542757023495" duration="2082000" />
274
+      <workItem from="1542759471602" duration="300000" />
275
+      <workItem from="1542811158373" duration="29000" />
276
+      <workItem from="1542811413085" duration="447000" />
277
+      <workItem from="1542816415276" duration="23000" />
278
+      <workItem from="1542816452249" duration="945000" />
279
+      <workItem from="1542818646775" duration="10000" />
280
+      <workItem from="1542818783005" duration="25000" />
281
+      <workItem from="1542818832957" duration="32000" />
282
+      <workItem from="1542818911372" duration="177000" />
283
+      <workItem from="1542827972532" duration="542000" />
284
+      <workItem from="1542832181823" duration="1384000" />
285
+      <workItem from="1543516990414" duration="20000" />
286
+      <workItem from="1544569675027" duration="719000" />
287
+      <workItem from="1545931266941" duration="3514000" />
288
+      <workItem from="1545936571176" duration="3744000" />
289
+      <workItem from="1545940574553" duration="47000" />
290
+      <workItem from="1545940718223" duration="17000" />
291
+      <workItem from="1545941257503" duration="2662000" />
292
+    </task>
293
+    <servers />
294
+  </component>
295
+  <component name="TestHistory">
296
+    <history-entry file="MyArrayListTest_getIntegerTest - 2018.12.27 at 14h 37m 58s.xml">
297
+      <configuration name="MyArrayListTest.getIntegerTest" configurationId="JUnit" />
298
+    </history-entry>
299
+    <history-entry file="MyArrayListTest_removeTestInteger - 2018.12.27 at 15h 37m 59s.xml">
300
+      <configuration name="MyArrayListTest.removeTestInteger" configurationId="JUnit" />
301
+    </history-entry>
302
+    <history-entry file="MyArrayListTest_removeTestInteger - 2018.12.27 at 15h 38m 09s.xml">
303
+      <configuration name="MyArrayListTest.removeTestInteger" configurationId="JUnit" />
304
+    </history-entry>
305
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 38m 24s.xml">
306
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
307
+    </history-entry>
308
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 39m 31s.xml">
309
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
310
+    </history-entry>
311
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 43m 58s.xml">
312
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
313
+    </history-entry>
314
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 45m 09s.xml">
315
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
316
+    </history-entry>
317
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 46m 13s.xml">
318
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
319
+    </history-entry>
320
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 48m 01s.xml">
321
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
322
+    </history-entry>
323
+    <history-entry file="MyArrayListTest_removeIndexInteger - 2018.12.27 at 15h 48m 57s.xml">
324
+      <configuration name="MyArrayListTest.removeIndexInteger" configurationId="JUnit" />
325
+    </history-entry>
326
+  </component>
327
+  <component name="TimeTrackingManager">
328
+    <option name="totallyTimeSpent" value="21732000" />
329
+  </component>
330
+  <component name="ToolWindowManager">
331
+    <frame x="0" y="23" width="1280" height="665" extended-state="6" />
332
+    <editor active="true" />
333
+    <layout>
334
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1914378" />
335
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
336
+      <window_info id="Image Layers" order="2" />
337
+      <window_info id="Designer" order="3" />
338
+      <window_info id="UI Designer" order="4" />
339
+      <window_info id="Capture Tool" order="5" />
340
+      <window_info id="Favorites" order="6" side_tool="true" />
341
+      <window_info anchor="bottom" id="Message" order="0" />
342
+      <window_info anchor="bottom" id="Find" order="1" />
343
+      <window_info anchor="bottom" id="Run" order="2" weight="0.4904014" />
344
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
345
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
346
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
347
+      <window_info anchor="bottom" id="TODO" order="6" />
348
+      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
349
+      <window_info anchor="bottom" id="Terminal" order="8" />
350
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
351
+      <window_info anchor="bottom" id="Version Control" order="10" show_stripe_button="false" />
352
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32942554" />
353
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
354
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
355
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
356
+      <window_info anchor="right" id="Palette" order="3" />
357
+      <window_info anchor="right" id="Capture Analysis" order="4" />
358
+      <window_info anchor="right" id="Theme Preview" order="5" />
359
+      <window_info anchor="right" id="Palette&#9;" order="6" />
360
+      <window_info anchor="right" id="Database" order="7" />
361
+      <window_info anchor="right" id="Maven Projects" order="8" />
362
+    </layout>
363
+  </component>
364
+  <component name="TypeScriptGeneratedFilesManager">
365
+    <option name="version" value="1" />
366
+  </component>
367
+  <component name="VcsContentAnnotationSettings">
368
+    <option name="myLimit" value="2678400000" />
369
+  </component>
370
+  <component name="editorHistoryManager">
371
+    <entry file="uml://JAVA/MyArrayList">
372
+      <provider selected="true" editor-type-id="UmlEditorProvider">
373
+        <state>
374
+          <ID>JAVA</ID>
375
+          <OriginalElement>MyArrayList</OriginalElement>
376
+          <nodes>
377
+            <node x="0.0" y="0.0">MyArrayList</node>
378
+          </nodes>
379
+          <notes />
380
+          <edges />
381
+          <settings layout="Hierarchic Group" zoom="1.0" x="-467.0" y="-149.0" />
382
+          <SelectedNodes>
383
+            <node>MyArrayList</node>
384
+          </SelectedNodes>
385
+          <Categories>
386
+            <Category>Fields</Category>
387
+            <Category>Constructors</Category>
388
+            <Category>Methods</Category>
389
+            <Category>Properties</Category>
390
+            <Category>Inner Classes</Category>
391
+          </Categories>
392
+          <SCOPE>All</SCOPE>
393
+          <VISIBILITY>private</VISIBILITY>
394
+        </state>
395
+      </provider>
396
+    </entry>
397
+    <entry file="file://$PROJECT_DIR$/pom.xml">
398
+      <provider selected="true" editor-type-id="text-editor">
399
+        <state relative-caret-position="225">
400
+          <caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
401
+        </state>
402
+      </provider>
403
+    </entry>
404
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/util/ArrayList.java">
405
+      <provider selected="true" editor-type-id="text-editor">
406
+        <state relative-caret-position="532">
407
+          <caret line="106" column="13" selection-start-line="106" selection-start-column="13" selection-end-line="106" selection-end-column="13" />
408
+        </state>
409
+      </provider>
410
+    </entry>
411
+    <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch.java">
412
+      <provider selected="true" editor-type-id="text-editor" />
413
+    </entry>
414
+    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home/src.zip!/java/lang/System.java">
415
+      <provider selected="true" editor-type-id="text-editor">
416
+        <state relative-caret-position="15">
417
+          <caret line="58" column="19" selection-start-line="58" selection-start-column="19" selection-end-line="58" selection-end-column="19" />
418
+        </state>
419
+      </provider>
420
+    </entry>
421
+    <entry file="file://$PROJECT_DIR$/src/test/java/MyArrayListTest.java">
422
+      <provider selected="true" editor-type-id="text-editor">
423
+        <state relative-caret-position="1815">
424
+          <caret line="121" column="8" selection-start-line="121" selection-start-column="8" selection-end-line="121" selection-end-column="8" />
425
+          <folding>
426
+            <element signature="imports" expanded="true" />
427
+          </folding>
428
+        </state>
429
+      </provider>
430
+    </entry>
431
+    <entry file="file://$PROJECT_DIR$/src/main/java/MyArrayList.java">
432
+      <provider selected="true" editor-type-id="text-editor">
433
+        <state relative-caret-position="283">
434
+          <caret line="38" column="48" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
435
+          <folding>
436
+            <element signature="e#125#126#0" expanded="true" />
437
+            <element signature="e#159#160#0" expanded="true" />
438
+          </folding>
439
+        </state>
440
+      </provider>
441
+    </entry>
442
+  </component>
443
+</project>

+ 16
- 0
generics.iml Ver fichero

@@ -0,0 +1,16 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
4
+    <output url="file://$MODULE_DIR$/target/classes" />
5
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
6
+    <content url="file://$MODULE_DIR$">
7
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
8
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9
+      <excludeFolder url="file://$MODULE_DIR$/target" />
10
+    </content>
11
+    <orderEntry type="inheritedJdk" />
12
+    <orderEntry type="sourceFolder" forTests="false" />
13
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
14
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
15
+  </component>
16
+</module>

+ 2
- 2
pom.xml Ver fichero

@@ -13,8 +13,8 @@
13 13
                 <groupId>org.apache.maven.plugins</groupId>
14 14
                 <artifactId>maven-compiler-plugin</artifactId>
15 15
                 <configuration>
16
-                    <source>1.7</source>
17
-                    <target>1.7</target>
16
+                    <source>1.8</source>
17
+                    <target>1.8</target>
18 18
                 </configuration>
19 19
             </plugin>
20 20
         </plugins>

+ 72
- 0
src/main/java/MyArrayList.java Ver fichero

@@ -0,0 +1,72 @@
1
+
2
+public class MyArrayList<T> {
3
+
4
+    private T[] array;
5
+
6
+    public MyArrayList() {
7
+
8
+    }
9
+
10
+    public MyArrayList(T[] array) {
11
+        this.array = array;
12
+    }
13
+
14
+    public MyArrayList(int i) {
15
+
16
+    }
17
+
18
+    public T[] add(T t) {
19
+
20
+        Object[] arr = new Object[array.length + 1];
21
+        System.arraycopy(array, 0, arr, 0, array.length);
22
+        arr[arr.length - 1] = t;
23
+
24
+        array = (T[]) arr;
25
+
26
+        return array;
27
+    }
28
+
29
+    public T get(int i) {
30
+
31
+        return array[i];
32
+    }
33
+
34
+    public T[] removeIndex(Integer t) {
35
+        Object[] tempArray = new Object[array.length - 1];
36
+
37
+        for (int i = 0; i < array.length; i++) {
38
+
39
+            for (int j = 0; j < tempArray.length; j++) {
40
+
41
+                if (array[i] != array[t]) {
42
+
43
+                    tempArray[j] = array[i];
44
+                }
45
+            }
46
+        }
47
+        return (T[]) tempArray;
48
+    }
49
+
50
+    public void removeTarget(T t) {
51
+
52
+    }
53
+
54
+    public void set() {
55
+
56
+    }
57
+
58
+    public void clear() {
59
+
60
+    }
61
+
62
+    public void isEmpty() {
63
+
64
+    }
65
+
66
+    public boolean contains() {
67
+
68
+        return true;
69
+    }
70
+
71
+
72
+}

+ 153
- 0
src/test/java/MyArrayListTest.java Ver fichero

@@ -0,0 +1,153 @@
1
+import org.junit.Assert;
2
+import org.junit.Before;
3
+import org.junit.Test;
4
+
5
+import static org.junit.Assert.assertArrayEquals;
6
+import static org.junit.Assert.assertEquals;
7
+
8
+public class MyArrayListTest<T> {
9
+
10
+
11
+    @Test
12
+    public void addTestInteger() {
13
+        //Given
14
+        Integer[] testArray = new Integer[]{1, 2};
15
+        Integer i = 6;
16
+        Integer[] expected = new Integer[]{1, 2, i};
17
+
18
+        //When
19
+        MyArrayList myArrayList = new MyArrayList(testArray);
20
+        Object[] actual = myArrayList.add(i);
21
+
22
+        //Then
23
+        Assert.assertArrayEquals(expected, actual);
24
+
25
+    }
26
+
27
+
28
+
29
+    @Test
30
+    public void addTestString() {
31
+
32
+        //Given
33
+
34
+        //When
35
+
36
+        //Then
37
+
38
+    }
39
+
40
+
41
+    @Test
42
+    public void addTestChar() {
43
+
44
+        //Given
45
+
46
+        //When
47
+
48
+        //Then
49
+
50
+    }
51
+
52
+    @Test
53
+    public void getIntegerTest(){
54
+        Integer index = 2;
55
+
56
+        Integer[] testArray = new Integer[]{32, 45, 8, 9, 16};
57
+
58
+        Integer expected = 8;
59
+        MyArrayList myArrayList = new MyArrayList(testArray);
60
+
61
+      assertEquals(expected, myArrayList.get(index));
62
+
63
+    }
64
+
65
+    @Test
66
+    public void getStringTest(){
67
+
68
+    }
69
+
70
+    @Test
71
+    public void getCharTest(){
72
+
73
+    }
74
+
75
+    @Test
76
+    public void removeTestInteger() {
77
+        Integer remove = 45;
78
+        Integer[] testArray = new Integer[]{32, remove, 8, 9, remove, 3, 16, remove};
79
+
80
+        Integer[] expected = new Integer[]{32, 8, 9, 3, 16};
81
+        MyArrayList myArrayList = new MyArrayList(testArray);
82
+        myArrayList.removeTarget(remove);
83
+
84
+        assertEquals(expected, myArrayList);
85
+
86
+
87
+    }
88
+
89
+    @Test
90
+    public void removeTestString() {
91
+
92
+        //Given
93
+
94
+        //When
95
+
96
+        //Then
97
+
98
+    }
99
+
100
+    @Test
101
+    public void removeTestChar() {
102
+
103
+        //Given
104
+
105
+        //When
106
+
107
+        //Then
108
+
109
+    }
110
+
111
+    @Test
112
+    public void removeIndexInteger(){
113
+        //Given
114
+        Integer[] testArray = new Integer[]{4, 8, 12, 16, 18};
115
+        Integer index = 3;
116
+
117
+        MyArrayList myArrayList = new MyArrayList(testArray);
118
+        Integer[] expected = new Integer[]{4, 8, 12, 18};
119
+        //When
120
+        Object[] actual = myArrayList.removeIndex(index);
121
+        //Then
122
+        assertArrayEquals(expected, actual);
123
+    }
124
+
125
+    @Test
126
+    public void removeIndexString(){}
127
+
128
+    @Test
129
+    public void removeIndexChar(){}
130
+
131
+    @Test
132
+    public void setTest() {
133
+
134
+        //Given
135
+
136
+        //When
137
+
138
+        //Then
139
+    }
140
+
141
+    @Test
142
+    public void containsTest() {
143
+
144
+        //Given
145
+
146
+        //When
147
+
148
+        //Then
149
+    }
150
+
151
+
152
+
153
+}