Nathan Hall 5 年之前
父節點
當前提交
b27fde2fc1

+ 88
- 106
src/.idea/workspace.xml 查看文件

@@ -2,75 +2,10 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="c08e742d-ec86-4dda-b948-e67c704654a9" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_3.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__ch_qos_logback_logback_core_1_2_3.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_classmate_1_4_0.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_0.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_7.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_7.xml" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jdk8_2_9_7.xml" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_jsr310_2_9_7.xml" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_parameter_names_2_9_7.xml" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_jayway_jsonpath_json_path_2_4_0.xml" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_1_9_5.xml" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_bytebuddy_byte_buddy_agent_1_9_5.xml" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_accessors_smart_1_2.xml" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__net_minidev_json_smart_2_3.xml" afterDir="false" />
25
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_11_1.xml" afterDir="false" />
26
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_logging_log4j_log4j_to_slf4j_2_11_1.xml" afterDir="false" />
27
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_core_9_0_13.xml" afterDir="false" />
28
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_el_9_0_13.xml" afterDir="false" />
29
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_apache_tomcat_embed_tomcat_embed_websocket_9_0_13.xml" afterDir="false" />
30
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_assertj_assertj_core_3_11_1.xml" afterDir="false" />
31
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
32
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml" afterDir="false" />
33
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hibernate_validator_hibernate_validator_6_0_13_Final.xml" afterDir="false" />
34
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_jboss_logging_jboss_logging_3_3_2_Final.xml" afterDir="false" />
35
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_mockito_mockito_core_2_23_4.xml" afterDir="false" />
36
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_objenesis_objenesis_2_6.xml" afterDir="false" />
37
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_ow2_asm_asm_5_0_4.xml" afterDir="false" />
38
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_skyscreamer_jsonassert_1_5_0.xml" afterDir="false" />
39
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml" afterDir="false" />
40
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml" afterDir="false" />
41
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_2_1_1_RELEASE.xml" afterDir="false" />
42
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_2_1_1_RELEASE.xml" afterDir="false" />
43
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_2_1_1_RELEASE.xml" afterDir="false" />
44
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_2_1_1_RELEASE.xml" afterDir="false" />
45
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_json_2_1_1_RELEASE.xml" afterDir="false" />
46
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_2_1_1_RELEASE.xml" afterDir="false" />
47
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_2_1_1_RELEASE.xml" afterDir="false" />
48
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_tomcat_2_1_1_RELEASE.xml" afterDir="false" />
49
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_starter_web_2_1_1_RELEASE.xml" afterDir="false" />
50
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_2_1_1_RELEASE.xml" afterDir="false" />
51
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_2_1_1_RELEASE.xml" afterDir="false" />
52
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_aop_5_1_3_RELEASE.xml" afterDir="false" />
53
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_beans_5_1_3_RELEASE.xml" afterDir="false" />
54
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_context_5_1_3_RELEASE.xml" afterDir="false" />
55
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_core_5_1_3_RELEASE.xml" afterDir="false" />
56
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_expression_5_1_3_RELEASE.xml" afterDir="false" />
57
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_jcl_5_1_3_RELEASE.xml" afterDir="false" />
58
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_test_5_1_3_RELEASE.xml" afterDir="false" />
59
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_web_5_1_3_RELEASE.xml" afterDir="false" />
60
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_springframework_spring_webmvc_5_1_3_RELEASE.xml" afterDir="false" />
61
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_xmlunit_xmlunit_core_2_6_2.xml" afterDir="false" />
62
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_yaml_snakeyaml_1_23.xml" afterDir="false" />
63
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
64
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
65
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
66
-      <change afterPath="$PROJECT_DIR$/beanjawn.iml" afterDir="false" />
67
-      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Instructor.java" afterDir="false" />
68
-      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Learner.java" afterDir="false" />
69
-      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/People.java" afterDir="false" />
70
-      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Person.java" afterDir="false" />
71
-      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Student.java" afterDir="false" />
72
-      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Teacher.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Students.java" afterDir="false" />
73 6
       <change beforePath="$PROJECT_DIR$/../README.md" beforeDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/People.java" beforeDir="false" afterPath="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/People.java" afterDir="false" />
74 9
     </list>
75 10
     <ignored path="$PROJECT_DIR$/target/" />
76 11
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -89,12 +24,12 @@
89 24
       </usages-collector>
90 25
       <usages-collector id="statistics.file.types.open">
91 26
         <counts>
92
-          <entry key="JAVA" value="6" />
27
+          <entry key="JAVA" value="7" />
93 28
         </counts>
94 29
       </usages-collector>
95 30
       <usages-collector id="statistics.file.types.edit">
96 31
         <counts>
97
-          <entry key="JAVA" value="535" />
32
+          <entry key="JAVA" value="1332" />
98 33
         </counts>
99 34
       </usages-collector>
100 35
     </session>
@@ -104,7 +39,7 @@
104 39
       <file pinned="false" current-in-tab="false">
105 40
         <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Person.java">
106 41
           <provider selected="true" editor-type-id="text-editor">
107
-            <state relative-caret-position="165">
42
+            <state relative-caret-position="164">
108 43
               <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
109 44
               <folding>
110 45
                 <element signature="e#247#248#0" expanded="true" />
@@ -129,7 +64,7 @@
129 64
       <file pinned="false" current-in-tab="false">
130 65
         <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Student.java">
131 66
           <provider selected="true" editor-type-id="text-editor">
132
-            <state relative-caret-position="240">
67
+            <state relative-caret-position="236">
133 68
               <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
134 69
               <folding>
135 70
                 <element signature="e#140#141#0" expanded="true" />
@@ -165,8 +100,32 @@
165 100
       <file pinned="false" current-in-tab="true">
166 101
         <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/People.java">
167 102
           <provider selected="true" editor-type-id="text-editor">
168
-            <state relative-caret-position="30">
169
-              <caret line="2" column="68" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
103
+            <state relative-caret-position="279">
104
+              <caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
105
+              <folding>
106
+                <element signature="imports" expanded="true" />
107
+                <element signature="e#318#319#0" expanded="true" />
108
+                <element signature="e#369#370#0" expanded="true" />
109
+                <element signature="e#421#422#0" expanded="true" />
110
+                <element signature="e#461#462#0" expanded="true" />
111
+                <element signature="e#499#500#0" expanded="true" />
112
+                <element signature="e#533#534#0" expanded="true" />
113
+                <element signature="e#574#575#0" expanded="true" />
114
+                <element signature="e#611#612#0" expanded="true" />
115
+                <element signature="e#640#641#0" expanded="true" />
116
+                <element signature="e#680#681#0" expanded="true" />
117
+                <element signature="e#707#708#0" expanded="true" />
118
+                <element signature="e#741#742#0" expanded="true" />
119
+              </folding>
120
+            </state>
121
+          </provider>
122
+        </entry>
123
+      </file>
124
+      <file pinned="false" current-in-tab="false">
125
+        <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Students.java">
126
+          <provider selected="true" editor-type-id="text-editor">
127
+            <state relative-caret-position="45">
128
+              <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
170 129
             </state>
171 130
           </provider>
172 131
         </entry>
@@ -192,6 +151,7 @@
192 151
         <option value="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Student.java" />
193 152
         <option value="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Teacher.java" />
194 153
         <option value="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Instructor.java" />
154
+        <option value="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Students.java" />
195 155
         <option value="$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/People.java" />
196 156
       </list>
197 157
     </option>
@@ -203,10 +163,10 @@
203 163
     <sorting>DEFINITION_ORDER</sorting>
204 164
   </component>
205 165
   <component name="ProjectFrameBounds">
206
-    <option name="x" value="-307" />
207
-    <option name="y" value="-977" />
166
+    <option name="x" value="-292" />
167
+    <option name="y" value="-940" />
208 168
     <option name="width" value="1181" />
209
-    <option name="height" value="749" />
169
+    <option name="height" value="740" />
210 170
   </component>
211 171
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
212 172
   <component name="ProjectView">
@@ -261,7 +221,7 @@
261 221
   <component name="PropertiesComponent">
262 222
     <property name="WebServerToolWindowFactoryState" value="false" />
263 223
     <property name="aspect.path.notification.shown" value="true" />
264
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544816540998" />
224
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544833396310" />
265 225
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
266 226
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
267 227
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -288,15 +248,15 @@
288 248
       <option name="number" value="Default" />
289 249
       <option name="presentableId" value="Default" />
290 250
       <updated>1544810070163</updated>
291
-      <workItem from="1544810074468" duration="3699000" />
251
+      <workItem from="1544810074468" duration="10417000" />
292 252
     </task>
293 253
     <servers />
294 254
   </component>
295 255
   <component name="TimeTrackingManager">
296
-    <option name="totallyTimeSpent" value="3699000" />
256
+    <option name="totallyTimeSpent" value="10417000" />
297 257
   </component>
298 258
   <component name="ToolWindowManager">
299
-    <frame x="-307" y="-977" width="1181" height="749" extended-state="0" />
259
+    <frame x="-292" y="-940" width="1181" height="740" extended-state="0" />
300 260
     <editor active="true" />
301 261
     <layout>
302 262
       <window_info id="Designer" />
@@ -305,16 +265,16 @@
305 265
       <window_info id="Favorites" side_tool="true" />
306 266
       <window_info id="Capture Tool" />
307 267
       <window_info id="Web" side_tool="true" />
308
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2712906" />
268
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2712906" />
309 269
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
310 270
       <window_info anchor="bottom" id="Spring" />
311
-      <window_info anchor="bottom" id="Terminal" />
271
+      <window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.3344" />
312 272
       <window_info anchor="bottom" id="Event Log" side_tool="true" />
313 273
       <window_info anchor="bottom" id="Java Enterprise" />
314 274
       <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
315 275
       <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
316 276
       <window_info anchor="bottom" id="Message" order="0" />
317
-      <window_info anchor="bottom" id="Find" order="1" visible="true" weight="0.38643533" />
277
+      <window_info anchor="bottom" id="Find" order="1" weight="0.38643533" />
318 278
       <window_info anchor="bottom" id="Run" order="2" />
319 279
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
320 280
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
@@ -339,16 +299,14 @@
339 299
     <option name="myLimit" value="2678400000" />
340 300
   </component>
341 301
   <component name="editorHistoryManager">
342
-    <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Person.java">
302
+    <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Student.java">
343 303
       <provider selected="true" editor-type-id="text-editor">
344
-        <state relative-caret-position="165">
345
-          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
304
+        <state relative-caret-position="236">
305
+          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
346 306
           <folding>
347
-            <element signature="e#247#248#0" expanded="true" />
348
-            <element signature="e#278#279#0" expanded="true" />
349
-            <element signature="e#305#306#0" expanded="true" />
350
-            <element signature="e#345#346#0" expanded="true" />
351
-            <element signature="e#377#378#0" expanded="true" />
307
+            <element signature="e#140#141#0" expanded="true" />
308
+            <element signature="e#171#172#0" expanded="true" />
309
+            <element signature="e#392#393#0" expanded="true" />
352 310
           </folding>
353 311
         </state>
354 312
       </provider>
@@ -360,18 +318,6 @@
360 318
         </state>
361 319
       </provider>
362 320
     </entry>
363
-    <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Student.java">
364
-      <provider selected="true" editor-type-id="text-editor">
365
-        <state relative-caret-position="240">
366
-          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
367
-          <folding>
368
-            <element signature="e#140#141#0" expanded="true" />
369
-            <element signature="e#171#172#0" expanded="true" />
370
-            <element signature="e#392#393#0" expanded="true" />
371
-          </folding>
372
-        </state>
373
-      </provider>
374
-    </entry>
375 321
     <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Teacher.java">
376 322
       <provider selected="true" editor-type-id="text-editor">
377 323
         <state relative-caret-position="120">
@@ -390,10 +336,46 @@
390 336
         </state>
391 337
       </provider>
392 338
     </entry>
339
+    <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Person.java">
340
+      <provider selected="true" editor-type-id="text-editor">
341
+        <state relative-caret-position="164">
342
+          <caret line="11" column="25" selection-start-line="11" selection-start-column="25" selection-end-line="11" selection-end-column="25" />
343
+          <folding>
344
+            <element signature="e#247#248#0" expanded="true" />
345
+            <element signature="e#278#279#0" expanded="true" />
346
+            <element signature="e#305#306#0" expanded="true" />
347
+            <element signature="e#345#346#0" expanded="true" />
348
+            <element signature="e#377#378#0" expanded="true" />
349
+          </folding>
350
+        </state>
351
+      </provider>
352
+    </entry>
353
+    <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/Students.java">
354
+      <provider selected="true" editor-type-id="text-editor">
355
+        <state relative-caret-position="45">
356
+          <caret line="3" lean-forward="true" selection-start-line="3" selection-end-line="3" />
357
+        </state>
358
+      </provider>
359
+    </entry>
393 360
     <entry file="file://$PROJECT_DIR$/main/java/com/zipcode/wilmington/beanjawn/People.java">
394 361
       <provider selected="true" editor-type-id="text-editor">
395
-        <state relative-caret-position="30">
396
-          <caret line="2" column="68" selection-start-line="2" selection-start-column="68" selection-end-line="2" selection-end-column="68" />
362
+        <state relative-caret-position="279">
363
+          <caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
364
+          <folding>
365
+            <element signature="imports" expanded="true" />
366
+            <element signature="e#318#319#0" expanded="true" />
367
+            <element signature="e#369#370#0" expanded="true" />
368
+            <element signature="e#421#422#0" expanded="true" />
369
+            <element signature="e#461#462#0" expanded="true" />
370
+            <element signature="e#499#500#0" expanded="true" />
371
+            <element signature="e#533#534#0" expanded="true" />
372
+            <element signature="e#574#575#0" expanded="true" />
373
+            <element signature="e#611#612#0" expanded="true" />
374
+            <element signature="e#640#641#0" expanded="true" />
375
+            <element signature="e#680#681#0" expanded="true" />
376
+            <element signature="e#707#708#0" expanded="true" />
377
+            <element signature="e#741#742#0" expanded="true" />
378
+          </folding>
397 379
         </state>
398 380
       </provider>
399 381
     </entry>

+ 52
- 1
src/main/java/com/zipcode/wilmington/beanjawn/People.java 查看文件

@@ -1,7 +1,58 @@
1 1
 package com.zipcode.wilmington.beanjawn;
2 2
 
3
-public abstract class People<PersonType> implements Iterable<PersonType>{
3
+import java.util.ArrayList;
4
+import java.util.Iterator;
5
+import java.util.List;
6
+import java.util.stream.StreamSupport;
4 7
 
8
+public abstract class People<PersonType extends Person> implements Iterable<PersonType> {
9
+
10
+    private ArrayList<PersonType> personList;
11
+
12
+    public People() {
13
+        this.personList = new ArrayList<>();
14
+    }
15
+
16
+
17
+    public People(ArrayList<PersonType> ptList) {
18
+        this.personList = ptList;
19
+    }
20
+
21
+    public void add(PersonType pt) {
22
+        personList.add(pt);
23
+    }
24
+
25
+    public void remove(PersonType pt) {
26
+        personList.remove(pt);
27
+    }
28
+
29
+    public Integer size() {
30
+        return personList.size();
31
+    }
32
+
33
+    public void clear() {
34
+        personList.clear();
35
+    }
36
+
37
+    public void addAll(Iterable<PersonType> ptIterable) {
38
+        ptIterable.forEach(personList::add);
39
+
40
+
41
+    }
42
+
43
+    public PersonType findById(long id) {
44
+            for (PersonType pt : personList){
45
+                if (pt.getId() == id){
46
+                    return pt;
47
+                }
48
+            }
49
+        return null;
50
+
51
+    }
52
+
53
+    public ArrayList<PersonType> findAll(){
54
+        return this.personList;
55
+    }
5 56
 
6 57
 
7 58
 }

+ 5
- 0
src/main/java/com/zipcode/wilmington/beanjawn/Students.java 查看文件

@@ -0,0 +1,5 @@
1
+package com.zipcode.wilmington.beanjawn;
2
+
3
+public class Students extends People {
4
+
5
+}