Ver código fonte

updating it and possibly adding more tests later

Whitney Martinez 6 anos atrás
pai
commit
16765706f0

+ 164
- 401
.idea/workspace.xml Ver arquivo

@@ -2,15 +2,12 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="fef9ff3b-ca8c-4f4d-811e-e01ed8ef169a" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/dataSources.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/src/main/java/Account.java" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/src/main/java/AccountApp.java" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/src/main/java/AccountService.java" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/src/main/java/Console.java" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/src/test/java/AccountServiceTest.java" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/src/test/java/MockDao.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/main/java/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Account.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/src/main/java/AccountApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountApp.java" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/src/main/java/AccountService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountService.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/main/java/Console.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Console.java" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/src/test/java/AccountServiceTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/AccountServiceTest.java" afterDir="false" />
14 11
     </list>
15 12
     <ignored path="$PROJECT_DIR$/out/" />
16 13
     <ignored path="$PROJECT_DIR$/target/" />
@@ -54,8 +51,11 @@
54 51
     <session id="-2012361872">
55 52
       <usages-collector id="statistics.lifecycle.project">
56 53
         <counts>
54
+          <entry key="project.closed" value="2" />
55
+          <entry key="project.open.time.3" value="1" />
56
+          <entry key="project.open.time.5" value="1" />
57 57
           <entry key="project.open.time.9" value="1" />
58
-          <entry key="project.opened" value="1" />
58
+          <entry key="project.opened" value="3" />
59 59
         </counts>
60 60
       </usages-collector>
61 61
       <usages-collector id="statistics.file.extensions.open">
@@ -64,7 +64,7 @@
64 64
           <entry key="JAVA/Account" value="1" />
65 65
           <entry key="JavaScript-modules-diagram//Users/whitneymartinez/Labs/Week5/ZCW-ORM-SimpleAccount/src/main/java" value="1" />
66 66
           <entry key="class" value="2" />
67
-          <entry key="java" value="8" />
67
+          <entry key="java" value="9" />
68 68
           <entry key="sql" value="1" />
69 69
           <entry key="xml" value="1" />
70 70
         </counts>
@@ -72,7 +72,7 @@
72 72
       <usages-collector id="statistics.file.types.open">
73 73
         <counts>
74 74
           <entry key="CLASS" value="2" />
75
-          <entry key="JAVA" value="8" />
75
+          <entry key="JAVA" value="9" />
76 76
           <entry key="Scratch" value="1" />
77 77
           <entry key="UML" value="4" />
78 78
           <entry key="XML" value="1" />
@@ -80,224 +80,43 @@
80 80
       </usages-collector>
81 81
       <usages-collector id="statistics.file.extensions.edit">
82 82
         <counts>
83
-          <entry key="java" value="3932" />
83
+          <entry key="java" value="4080" />
84 84
           <entry key="xml" value="7" />
85 85
         </counts>
86 86
       </usages-collector>
87 87
       <usages-collector id="statistics.file.types.edit">
88 88
         <counts>
89
-          <entry key="JAVA" value="3932" />
89
+          <entry key="JAVA" value="4080" />
90 90
           <entry key="XML" value="7" />
91 91
         </counts>
92 92
       </usages-collector>
93 93
     </session>
94 94
   </component>
95 95
   <component name="FileEditorManager">
96
-    <leaf>
97
-      <file pinned="false" current-in-tab="false">
98
-        <entry file="file://$PROJECT_DIR$/pom.xml">
99
-          <provider selected="true" editor-type-id="text-editor">
100
-            <state relative-caret-position="270">
101
-              <caret line="30" column="65" selection-start-line="30" selection-start-column="65" selection-end-line="30" selection-end-column="65" />
102
-            </state>
103
-          </provider>
104
-        </entry>
105
-      </file>
96
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
106 97
       <file pinned="false" current-in-tab="false">
107 98
         <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
108 99
           <provider selected="true" editor-type-id="text-editor">
109
-            <state relative-caret-position="525">
110
-              <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
100
+            <state relative-caret-position="420">
101
+              <caret line="28" column="25" lean-forward="true" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="25" />
111 102
               <folding>
112 103
                 <element signature="imports" expanded="true" />
113 104
                 <element signature="e#668#669#0" expanded="true" />
114 105
                 <element signature="e#700#701#0" expanded="true" />
115 106
                 <element signature="e#844#845#0" expanded="true" />
116 107
                 <element signature="e#869#870#0" expanded="true" />
108
+                <element signature="e#902#903#0" expanded="true" />
117 109
                 <element signature="e#930#931#0" expanded="true" />
118
-                <element signature="e#900#901#0" expanded="true" />
119
-                <element signature="e#927#928#0" expanded="true" />
120
-                <element signature="e#967#968#0" expanded="true" />
121
-                <element signature="e#999#1000#0" expanded="true" />
122
-                <element signature="e#1034#1035#0" expanded="true" />
123
-                <element signature="e#1065#1066#0" expanded="true" />
124
-                <element signature="e#1113#1114#0" expanded="true" />
125
-                <element signature="e#1153#1154#0" expanded="true" />
126
-                <element signature="e#1196#1197#0" expanded="true" />
127
-                <element signature="e#1234#1235#0" expanded="true" />
128 110
               </folding>
129 111
             </state>
130 112
           </provider>
131 113
         </entry>
132 114
       </file>
133
-      <file pinned="false" current-in-tab="true">
134
-        <entry file="uml://JAVA/">
135
-          <provider selected="true" editor-type-id="UmlEditorProvider">
136
-            <state>
137
-              <ID>JAVA</ID>
138
-              <OriginalElement />
139
-              <nodes>
140
-                <node x="322.0" y="657.2994791666666">com</node>
141
-                <node x="290.6682692307692" y="0.0">Account</node>
142
-                <node x="617.0" y="509.29947916666663">netscape</node>
143
-                <node x="450.76826923076925" y="186.0">MockDao</node>
144
-                <node x="581.0" y="380.0">toolbarButtonGraphics</node>
145
-                <node x="636.0" y="657.2994791666666">sun</node>
146
-                <node x="686.0" y="583.2994791666666">apple</node>
147
-                <node x="0.0" y="509.29947916666663">groovyjarjarasm</node>
148
-                <node x="480.0" y="657.2994791666666">java</node>
149
-                <node x="0.0" y="657.2994791666666">javax</node>
150
-                <node x="0.0" y="11.0">Console</node>
151
-                <node x="518.0" y="583.2994791666666">javafx</node>
152
-                <node x="163.0" y="657.2994791666666">junit</node>
153
-                <node x="349.0" y="583.2994791666666">oracle</node>
154
-                <node x="0.0" y="731.2994791666666">org</node>
155
-                <node x="424.0" y="509.29947916666663">resources</node>
156
-                <node x="175.0" y="583.2994791666666">google</node>
157
-                <node x="230.0" y="509.29947916666663">META-INF</node>
158
-                <node x="153.0" y="731.2994791666666">jdk</node>
159
-                <node x="440.0" y="306.0">AccountServiceTest</node>
160
-                <node x="0.0" y="583.2994791666666">groovy</node>
161
-                <node x="303.0" y="392.8828125">groovyjarjarcommonscli</node>
162
-                <node x="75.50000000000006" y="306.0">AccountApp</node>
163
-                <node x="40.0" y="395.2994791666667">groovyjarjarantlr</node>
164
-                <node x="109.76826923076925" y="175.0">AccountService</node>
165
-              </nodes>
166
-              <notes />
167
-              <edges>
168
-                <edge source="AccountServiceTest" target="MockDao">
169
-                  <point x="-14.25" y="-14.5" />
170
-                  <point x="511.25" y="286.0" />
171
-                  <point x="503.26826923076925" y="286.0" />
172
-                  <point x="0.0" y="14.5" />
173
-                </edge>
174
-                <edge source="AccountApp" target="Console">
175
-                  <point x="-31.250000000000057" y="-14.5" />
176
-                  <point x="106.75" y="276.0" />
177
-                  <point x="68.25" y="276.0" />
178
-                  <point x="-22.75" y="36.5" />
179
-                </edge>
180
-                <edge source="AccountApp" target="AccountService">
181
-                  <point x="52.08333333333326" y="-14.5" />
182
-                  <point x="190.08333333333331" y="286.0" />
183
-                  <point x="230.14326923076925" y="286.0" />
184
-                  <point x="-40.125" y="25.5" />
185
-                </edge>
186
-                <edge source="AccountApp" target="Account">
187
-                  <point x="10.416666666666629" y="-14.5" />
188
-                  <point x="148.41666666666669" y="256.0" />
189
-                  <point x="99.26826923076925" y="256.0" />
190
-                  <point x="99.26826923076925" y="135.0" />
191
-                  <point x="326.6682692307692" y="135.0" />
192
-                  <point x="-72.0" y="47.5" />
193
-                </edge>
194
-                <edge source="groovyjarjarantlr" target="groovyjarjarantlr">
195
-                  <point x="-62.666666666666664" y="14.5" />
196
-                  <point x="71.33333333333334" y="444.2994791666667" />
197
-                  <point x="20.0" y="444.2994791666667" />
198
-                  <point x="20.0" y="419.46614583333337" />
199
-                  <point x="-94.0" y="9.666666666666666" />
200
-                </edge>
201
-                <edge source="groovyjarjarcommonscli" target="groovyjarjarcommonscli">
202
-                  <point x="58.25" y="14.5" />
203
-                  <point x="477.75" y="451.8828125" />
204
-                  <point x="273.0" y="451.8828125" />
205
-                  <point x="273.0" y="400.1328125" />
206
-                  <point x="-116.5" y="-7.25" />
207
-                </edge>
208
-                <edge source="AccountService" target="Account">
209
-                  <point x="64.20000000000005" y="-25.5" />
210
-                  <point x="334.4682692307693" y="155.0" />
211
-                  <point x="374.6682692307692" y="155.0" />
212
-                  <point x="-24.0" y="47.5" />
213
-                </edge>
214
-                <edge source="AccountServiceTest" target="AccountService">
215
-                  <point x="-71.25" y="-14.5" />
216
-                  <point x="454.25" y="286.0" />
217
-                  <point x="310.39326923076925" y="286.0" />
218
-                  <point x="40.125" y="25.5" />
219
-                </edge>
220
-                <edge source="MockDao" target="Account">
221
-                  <point x="0.0" y="-14.5" />
222
-                  <point x="503.26826923076925" y="155.0" />
223
-                  <point x="422.6682692307692" y="155.0" />
224
-                  <point x="24.0" y="47.5" />
225
-                </edge>
226
-                <edge source="AccountService" target="Console">
227
-                  <point x="-64.19999999999993" y="-25.5" />
228
-                  <point x="206.06826923076932" y="115.0" />
229
-                  <point x="159.25" y="115.0" />
230
-                  <point x="68.25" y="36.5" />
231
-                </edge>
232
-                <edge source="AccountServiceTest" target="Account">
233
-                  <point x="42.75" y="-14.5" />
234
-                  <point x="568.25" y="286.0" />
235
-                  <point x="577.2682692307692" y="286.0" />
236
-                  <point x="577.2682692307692" y="135.0" />
237
-                  <point x="470.6682692307692" y="135.0" />
238
-                  <point x="72.0" y="47.5" />
239
-                </edge>
240
-              </edges>
241
-              <settings layout="Hierarchic Group" zoom="0.9045824632109519" x="332.0961470659471" y="175.64505711921316" />
242
-              <SelectedNodes />
243
-              <Categories>
244
-                <Category>Constructors</Category>
245
-              </Categories>
246
-              <SCOPE>All</SCOPE>
247
-              <VISIBILITY>private</VISIBILITY>
248
-            </state>
249
-          </provider>
250
-        </entry>
251
-      </file>
252 115
       <file pinned="false" current-in-tab="false">
253
-        <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
254
-          <provider selected="true" editor-type-id="text-editor">
255
-            <state relative-caret-position="143">
256
-              <caret line="111" column="18" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" />
257
-              <folding>
258
-                <element signature="imports" expanded="true" />
259
-                <element signature="e#1773#1774#0" expanded="true" />
260
-                <element signature="e#1800#1801#0" expanded="true" />
261
-                <element signature="e#1876#1877#0" expanded="true" />
262
-                <element signature="e#1903#1904#0" expanded="true" />
263
-                <element signature="e#1979#1980#0" expanded="true" />
264
-                <element signature="e#2006#2007#0" expanded="true" />
265
-                <element signature="e#3669#3670#0" expanded="true" />
266
-                <element signature="e#3696#3697#0" expanded="true" />
267
-                <element signature="e#3767#3768#0" expanded="true" />
268
-                <element signature="e#3794#3795#0" expanded="true" />
269
-                <element signature="e#4182#4183#0" expanded="true" />
270
-                <element signature="e#4209#4210#0" expanded="true" />
271
-                <element signature="e#4328#4329#0" expanded="true" />
272
-                <element signature="e#4355#4356#0" expanded="true" />
273
-                <element signature="e#5942#5943#0" expanded="true" />
274
-                <element signature="e#5969#5970#0" expanded="true" />
275
-                <element signature="e#6263#6264#0" expanded="true" />
276
-                <element signature="e#6290#6291#0" expanded="true" />
277
-                <element signature="e#6366#6367#0" expanded="true" />
278
-                <element signature="e#6393#6394#0" expanded="true" />
279
-                <element signature="e#6443#6444#0" expanded="true" />
280
-                <element signature="e#6471#6472#0" expanded="true" />
281
-                <element signature="e#7278#7279#0" expanded="true" />
282
-                <element signature="e#7305#7306#0" expanded="true" />
283
-                <element signature="e#7691#7692#0" expanded="true" />
284
-                <element signature="e#7718#7719#0" expanded="true" />
285
-                <element signature="e#8606#8607#0" expanded="true" />
286
-                <element signature="e#8633#8634#0" expanded="true" />
287
-                <element signature="e#8944#8945#0" expanded="true" />
288
-                <element signature="e#8971#8972#0" expanded="true" />
289
-                <element signature="e#9102#9103#0" expanded="true" />
290
-                <element signature="e#9129#9130#0" expanded="true" />
291
-              </folding>
292
-            </state>
293
-          </provider>
294
-        </entry>
295
-      </file>
296
-      <file pinned="false" current-in-tab="false">
297
-        <entry file="file://$PROJECT_DIR$/src/test/java/AccountServiceTest.java">
116
+        <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
298 117
           <provider selected="true" editor-type-id="text-editor">
299
-            <state relative-caret-position="175">
300
-              <caret line="48" selection-start-line="48" selection-end-line="48" />
118
+            <state relative-caret-position="601">
119
+              <caret line="46" column="39" selection-start-line="46" selection-start-column="39" selection-end-line="46" selection-end-column="39" />
301 120
               <folding>
302 121
                 <element signature="imports" expanded="true" />
303 122
               </folding>
@@ -305,14 +124,11 @@
305 124
           </provider>
306 125
         </entry>
307 126
       </file>
308
-      <file pinned="false" current-in-tab="false">
309
-        <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
127
+      <file pinned="false" current-in-tab="true">
128
+        <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
310 129
           <provider selected="true" editor-type-id="text-editor">
311
-            <state relative-caret-position="30">
312
-              <caret line="43" column="69" selection-start-line="43" selection-start-column="69" selection-end-line="43" selection-end-column="69" />
313
-              <folding>
314
-                <element signature="imports" expanded="true" />
315
-              </folding>
130
+            <state relative-caret-position="346">
131
+              <caret line="38" column="5" lean-forward="true" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
316 132
             </state>
317 133
           </provider>
318 134
         </entry>
@@ -320,8 +136,8 @@
320 136
       <file pinned="false" current-in-tab="false">
321 137
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountService.java">
322 138
           <provider selected="true" editor-type-id="text-editor">
323
-            <state relative-caret-position="420">
324
-              <caret line="122" column="41" selection-start-line="122" selection-start-column="41" selection-end-line="122" selection-end-column="41" />
139
+            <state relative-caret-position="465">
140
+              <caret line="125" selection-start-line="125" selection-end-line="125" />
325 141
               <folding>
326 142
                 <element signature="imports" expanded="true" />
327 143
               </folding>
@@ -329,19 +145,6 @@
329 145
           </provider>
330 146
         </entry>
331 147
       </file>
332
-      <file pinned="false" current-in-tab="false">
333
-        <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
334
-          <provider selected="true" editor-type-id="text-editor">
335
-            <state relative-caret-position="215">
336
-              <caret line="27" column="89" selection-start-line="27" selection-start-column="89" selection-end-line="27" selection-end-column="89" />
337
-              <folding>
338
-                <element signature="e#146#147#0" expanded="true" />
339
-                <element signature="e#188#189#0" expanded="true" />
340
-              </folding>
341
-            </state>
342
-          </provider>
343
-        </entry>
344
-      </file>
345 148
     </leaf>
346 149
   </component>
347 150
   <component name="FileTemplateManagerImpl">
@@ -357,6 +160,8 @@
357 160
       <find>crea</find>
358 161
       <find>update</find>
359 162
       <find>delete</find>
163
+      <find>console</find>
164
+      <find>c.</find>
360 165
     </findStrings>
361 166
   </component>
362 167
   <component name="Git.Settings">
@@ -366,12 +171,12 @@
366 171
     <option name="CHANGED_PATHS">
367 172
       <list>
368 173
         <option value="$PROJECT_DIR$/pom.xml" />
369
-        <option value="$PROJECT_DIR$/src/main/java/Console.java" />
174
+        <option value="$PROJECT_DIR$/src/test/java/MockDao.java" />
175
+        <option value="$PROJECT_DIR$/src/test/java/AccountServiceTest.java" />
176
+        <option value="$PROJECT_DIR$/src/main/java/Account.java" />
370 177
         <option value="$PROJECT_DIR$/src/main/java/AccountService.java" />
371 178
         <option value="$PROJECT_DIR$/src/main/java/AccountApp.java" />
372
-        <option value="$PROJECT_DIR$/src/main/java/Account.java" />
373
-        <option value="$PROJECT_DIR$/src/test/java/AccountServiceTest.java" />
374
-        <option value="$PROJECT_DIR$/src/test/java/MockDao.java" />
179
+        <option value="$PROJECT_DIR$/src/main/java/Console.java" />
375 180
       </list>
376 181
     </option>
377 182
   </component>
@@ -388,9 +193,9 @@
388 193
       </MavenImportingSettings>
389 194
     </option>
390 195
   </component>
391
-  <component name="ProjectFrameBounds">
392
-    <option name="x" value="294" />
393
-    <option name="y" value="91" />
196
+  <component name="ProjectFrameBounds" extendedState="1">
197
+    <option name="x" value="190" />
198
+    <option name="y" value="75" />
394 199
     <option name="width" value="890" />
395 200
     <option name="height" value="709" />
396 201
   </component>
@@ -449,7 +254,7 @@
449 254
     <property name="DatabaseDriversLRU" value="mysql" />
450 255
     <property name="WebServerToolWindowFactoryState" value="false" />
451 256
     <property name="aspect.path.notification.shown" value="true" />
452
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542503796859" />
257
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542644872929" />
453 258
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
454 259
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
455 260
   </component>
@@ -465,7 +270,7 @@
465 270
       </list>
466 271
     </option>
467 272
   </component>
468
-  <component name="RunManager" selected="JUnit.AccountServiceTest.testIdupdate">
273
+  <component name="RunManager" selected="Application.AccountApp">
469 274
     <configuration name="AccountApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
470 275
       <option name="MAIN_CLASS_NAME" value="AccountApp" />
471 276
       <module name="ZCW-ORM-SimpleAccount" />
@@ -498,9 +303,9 @@
498 303
     </list>
499 304
     <recent_temporary>
500 305
       <list>
306
+        <item itemvalue="Application.AccountApp" />
501 307
         <item itemvalue="JUnit.AccountServiceTest.testIdupdate" />
502 308
         <item itemvalue="JUnit.AccountServiceTest" />
503
-        <item itemvalue="Application.AccountApp" />
504 309
       </list>
505 310
     </recent_temporary>
506 311
   </component>
@@ -514,7 +319,9 @@
514 319
       <option name="number" value="Default" />
515 320
       <option name="presentableId" value="Default" />
516 321
       <updated>1542472590688</updated>
517
-      <workItem from="1542472595444" duration="16961000" />
322
+      <workItem from="1542472595444" duration="17001000" />
323
+      <workItem from="1542638526297" duration="2309000" />
324
+      <workItem from="1542659351017" duration="1134000" />
518 325
     </task>
519 326
     <servers />
520 327
   </component>
@@ -533,70 +340,70 @@
533 340
     </history-entry>
534 341
   </component>
535 342
   <component name="TimeTrackingManager">
536
-    <option name="totallyTimeSpent" value="16961000" />
343
+    <option name="totallyTimeSpent" value="20444000" />
537 344
   </component>
538 345
   <component name="ToolWindowManager">
539
-    <frame x="294" y="91" width="890" height="709" extended-state="0" />
346
+    <frame x="190" y="75" width="890" height="709" extended-state="1" />
540 347
     <editor active="true" />
541 348
     <layout>
542
-      <window_info id="Image Layers" />
543
-      <window_info id="Designer" />
544
-      <window_info id="UI Designer" />
545
-      <window_info id="Capture Tool" />
546
-      <window_info id="Favorites" side_tool="true" />
547
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24882075" />
548
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
549
-      <window_info anchor="bottom" id="Messages" weight="0.32901135" />
550
-      <window_info anchor="bottom" id="Database Changes" />
551
-      <window_info anchor="bottom" id="Version Control" />
552
-      <window_info anchor="bottom" id="Terminal" />
553
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
349
+      <window_info content_ui="combo" id="Project" order="0" weight="0.2606132" />
350
+      <window_info active="true" id="Structure" order="1" side_tool="true" visible="true" weight="0.25" />
351
+      <window_info id="Image Layers" order="2" />
352
+      <window_info id="Designer" order="3" />
353
+      <window_info id="UI Designer" order="4" />
354
+      <window_info id="Capture Tool" order="5" />
355
+      <window_info id="Favorites" order="6" side_tool="true" />
554 356
       <window_info anchor="bottom" id="Message" order="0" />
555 357
       <window_info anchor="bottom" id="Find" order="1" />
556
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.32901135" />
358
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32901135" />
557 359
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
558 360
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
559 361
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
560 362
       <window_info anchor="bottom" id="TODO" order="6" />
561
-      <window_info anchor="right" id="Palette" />
562
-      <window_info anchor="right" id="Theme Preview" />
563
-      <window_info anchor="right" id="Capture Analysis" />
564
-      <window_info anchor="right" id="Palette&#9;" />
565
-      <window_info anchor="right" id="Database" weight="0.25425246" />
566
-      <window_info anchor="right" id="Maven Projects" />
363
+      <window_info anchor="bottom" id="Version Control" order="7" />
364
+      <window_info anchor="bottom" id="Database Changes" order="8" />
365
+      <window_info anchor="bottom" id="Terminal" order="9" />
366
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
367
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32901135" />
567 368
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
568 369
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
569 370
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
371
+      <window_info anchor="right" id="Palette" order="3" />
372
+      <window_info anchor="right" id="Capture Analysis" order="4" />
373
+      <window_info anchor="right" id="Database" order="5" weight="0.25425246" />
374
+      <window_info anchor="right" id="Theme Preview" order="6" />
375
+      <window_info anchor="right" id="Palette&#9;" order="7" />
376
+      <window_info anchor="right" id="Maven Projects" order="8" />
570 377
     </layout>
571 378
     <layout-to-restore>
572
-      <window_info id="Image Layers" order="0" />
573
-      <window_info id="Designer" order="1" />
574
-      <window_info id="UI Designer" order="2" />
575
-      <window_info id="Capture Tool" order="3" />
576
-      <window_info id="Favorites" order="4" side_tool="true" />
577
-      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.24977618" />
578
-      <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
579
-      <window_info anchor="bottom" id="Version Control" order="0" />
580
-      <window_info anchor="bottom" id="Terminal" order="1" />
581
-      <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
582
-      <window_info anchor="bottom" id="Database Changes" order="3" />
583
-      <window_info anchor="bottom" id="Messages" order="4" weight="0.32901135" />
584
-      <window_info anchor="bottom" id="Message" order="5" />
585
-      <window_info anchor="bottom" id="Find" order="6" />
586
-      <window_info anchor="bottom" id="Run" order="7" visible="true" weight="0.32901135" />
587
-      <window_info anchor="bottom" id="Debug" order="8" weight="0.4" />
588
-      <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
589
-      <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
590
-      <window_info anchor="bottom" id="TODO" order="11" />
591
-      <window_info anchor="right" id="Palette" order="0" />
592
-      <window_info anchor="right" id="Capture Analysis" order="1" />
593
-      <window_info anchor="right" id="Database" order="2" weight="0.25425246" />
594
-      <window_info anchor="right" id="Theme Preview" order="3" />
595
-      <window_info anchor="right" id="Palette&#9;" order="4" />
596
-      <window_info anchor="right" id="Maven Projects" order="5" />
597
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="6" type="SLIDING" weight="0.4" />
598
-      <window_info anchor="right" id="Ant Build" order="7" weight="0.25" />
599
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="8" weight="0.25" />
379
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2606132" />
380
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
381
+      <window_info id="Image Layers" order="2" />
382
+      <window_info id="Designer" order="3" />
383
+      <window_info id="UI Designer" order="4" />
384
+      <window_info id="Capture Tool" order="5" />
385
+      <window_info id="Favorites" order="6" side_tool="true" />
386
+      <window_info anchor="bottom" id="Message" order="0" />
387
+      <window_info anchor="bottom" id="Find" order="1" />
388
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32901135" />
389
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
390
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
391
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
392
+      <window_info anchor="bottom" id="TODO" order="6" />
393
+      <window_info anchor="bottom" id="Version Control" order="7" />
394
+      <window_info anchor="bottom" id="Database Changes" order="8" />
395
+      <window_info anchor="bottom" id="Terminal" order="9" />
396
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
397
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32901135" />
398
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
399
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
400
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
401
+      <window_info anchor="right" id="Palette" order="3" />
402
+      <window_info anchor="right" id="Capture Analysis" order="4" />
403
+      <window_info anchor="right" id="Database" order="5" weight="0.25425246" />
404
+      <window_info anchor="right" id="Theme Preview" order="6" />
405
+      <window_info anchor="right" id="Palette&#9;" order="7" />
406
+      <window_info anchor="right" id="Maven Projects" order="8" />
600 407
     </layout-to-restore>
601 408
   </component>
602 409
   <component name="TypeScriptGeneratedFilesManager">
@@ -614,24 +421,6 @@
614 421
         <state relative-caret-position="-652" />
615 422
       </provider>
616 423
     </entry>
617
-    <entry file="file://$PROJECT_DIR$/pom.xml">
618
-      <provider selected="true" editor-type-id="text-editor">
619
-        <state relative-caret-position="270">
620
-          <caret line="30" column="65" selection-start-line="30" selection-start-column="65" selection-end-line="30" selection-end-column="65" />
621
-        </state>
622
-      </provider>
623
-    </entry>
624
-    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
625
-      <provider selected="true" editor-type-id="text-editor">
626
-        <state relative-caret-position="215">
627
-          <caret line="27" column="89" selection-start-line="27" selection-start-column="89" selection-end-line="27" selection-end-column="89" />
628
-          <folding>
629
-            <element signature="e#146#147#0" expanded="true" />
630
-            <element signature="e#188#189#0" expanded="true" />
631
-          </folding>
632
-        </state>
633
-      </provider>
634
-    </entry>
635 424
     <entry file="jar://$MAVEN_REPOSITORY$/com/j256/ormlite/ormlite-core/5.1/ormlite-core-5.1.jar!/com/j256/ormlite/dao/Dao.class">
636 425
       <provider selected="true" editor-type-id="text-editor">
637 426
         <state relative-caret-position="611">
@@ -639,78 +428,6 @@
639 428
         </state>
640 429
       </provider>
641 430
     </entry>
642
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountService.java">
643
-      <provider selected="true" editor-type-id="text-editor">
644
-        <state relative-caret-position="420">
645
-          <caret line="122" column="41" selection-start-line="122" selection-start-column="41" selection-end-line="122" selection-end-column="41" />
646
-          <folding>
647
-            <element signature="imports" expanded="true" />
648
-          </folding>
649
-        </state>
650
-      </provider>
651
-    </entry>
652
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
653
-      <provider selected="true" editor-type-id="text-editor">
654
-        <state relative-caret-position="30">
655
-          <caret line="43" column="69" selection-start-line="43" selection-start-column="69" selection-end-line="43" selection-end-column="69" />
656
-          <folding>
657
-            <element signature="imports" expanded="true" />
658
-          </folding>
659
-        </state>
660
-      </provider>
661
-    </entry>
662
-    <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
663
-      <provider selected="true" editor-type-id="text-editor">
664
-        <state relative-caret-position="143">
665
-          <caret line="111" column="18" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" />
666
-          <folding>
667
-            <element signature="imports" expanded="true" />
668
-            <element signature="e#1773#1774#0" expanded="true" />
669
-            <element signature="e#1800#1801#0" expanded="true" />
670
-            <element signature="e#1876#1877#0" expanded="true" />
671
-            <element signature="e#1903#1904#0" expanded="true" />
672
-            <element signature="e#1979#1980#0" expanded="true" />
673
-            <element signature="e#2006#2007#0" expanded="true" />
674
-            <element signature="e#3669#3670#0" expanded="true" />
675
-            <element signature="e#3696#3697#0" expanded="true" />
676
-            <element signature="e#3767#3768#0" expanded="true" />
677
-            <element signature="e#3794#3795#0" expanded="true" />
678
-            <element signature="e#4182#4183#0" expanded="true" />
679
-            <element signature="e#4209#4210#0" expanded="true" />
680
-            <element signature="e#4328#4329#0" expanded="true" />
681
-            <element signature="e#4355#4356#0" expanded="true" />
682
-            <element signature="e#5942#5943#0" expanded="true" />
683
-            <element signature="e#5969#5970#0" expanded="true" />
684
-            <element signature="e#6263#6264#0" expanded="true" />
685
-            <element signature="e#6290#6291#0" expanded="true" />
686
-            <element signature="e#6366#6367#0" expanded="true" />
687
-            <element signature="e#6393#6394#0" expanded="true" />
688
-            <element signature="e#6443#6444#0" expanded="true" />
689
-            <element signature="e#6471#6472#0" expanded="true" />
690
-            <element signature="e#7278#7279#0" expanded="true" />
691
-            <element signature="e#7305#7306#0" expanded="true" />
692
-            <element signature="e#7691#7692#0" expanded="true" />
693
-            <element signature="e#7718#7719#0" expanded="true" />
694
-            <element signature="e#8606#8607#0" expanded="true" />
695
-            <element signature="e#8633#8634#0" expanded="true" />
696
-            <element signature="e#8944#8945#0" expanded="true" />
697
-            <element signature="e#8971#8972#0" expanded="true" />
698
-            <element signature="e#9102#9103#0" expanded="true" />
699
-            <element signature="e#9129#9130#0" expanded="true" />
700
-          </folding>
701
-        </state>
702
-      </provider>
703
-    </entry>
704
-    <entry file="file://$PROJECT_DIR$/src/test/java/AccountServiceTest.java">
705
-      <provider selected="true" editor-type-id="text-editor">
706
-        <state relative-caret-position="175">
707
-          <caret line="48" selection-start-line="48" selection-end-line="48" />
708
-          <folding>
709
-            <element signature="imports" expanded="true" />
710
-          </folding>
711
-        </state>
712
-      </provider>
713
-    </entry>
714 431
     <entry file="uml://JavaScript-modules-diagram//Users/whitneymartinez/Labs/Week5/ZCW-ORM-SimpleAccount/src/main/java">
715 432
       <provider selected="true" editor-type-id="UmlEditorProvider">
716 433
         <state>
@@ -719,11 +436,12 @@
719 436
           <nodes />
720 437
           <notes />
721 438
           <edges />
722
-          <settings layout="Hierarchic Group" zoom="0.7912109139200773" x="389.5475311279297" y="182.3952178955078" />
439
+          <settings layout="Hierarchic Group" zoom="0.7912109139200773" x="390.0" y="182.0" />
723 440
           <SelectedNodes />
724 441
           <Categories>
725 442
             <Category>All</Category>
726 443
           </Categories>
444
+          <SCOPE>All</SCOPE>
727 445
           <VISIBILITY>Overview</VISIBILITY>
728 446
         </state>
729 447
       </provider>
@@ -749,31 +467,6 @@
749 467
         </state>
750 468
       </provider>
751 469
     </entry>
752
-    <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
753
-      <provider selected="true" editor-type-id="text-editor">
754
-        <state relative-caret-position="525">
755
-          <caret line="35" column="31" selection-start-line="35" selection-start-column="31" selection-end-line="35" selection-end-column="31" />
756
-          <folding>
757
-            <element signature="imports" expanded="true" />
758
-            <element signature="e#668#669#0" expanded="true" />
759
-            <element signature="e#700#701#0" expanded="true" />
760
-            <element signature="e#844#845#0" expanded="true" />
761
-            <element signature="e#869#870#0" expanded="true" />
762
-            <element signature="e#930#931#0" expanded="true" />
763
-            <element signature="e#900#901#0" expanded="true" />
764
-            <element signature="e#927#928#0" expanded="true" />
765
-            <element signature="e#967#968#0" expanded="true" />
766
-            <element signature="e#999#1000#0" expanded="true" />
767
-            <element signature="e#1034#1035#0" expanded="true" />
768
-            <element signature="e#1065#1066#0" expanded="true" />
769
-            <element signature="e#1113#1114#0" expanded="true" />
770
-            <element signature="e#1153#1154#0" expanded="true" />
771
-            <element signature="e#1196#1197#0" expanded="true" />
772
-            <element signature="e#1234#1235#0" expanded="true" />
773
-          </folding>
774
-        </state>
775
-      </provider>
776
-    </entry>
777 470
     <entry file="uml://JAVA/">
778 471
       <provider selected="true" editor-type-id="UmlEditorProvider">
779 472
         <state>
@@ -881,7 +574,7 @@
881 574
               <point x="72.0" y="47.5" />
882 575
             </edge>
883 576
           </edges>
884
-          <settings layout="Hierarchic Group" zoom="0.9045824632109519" x="332.0961470659471" y="175.64505711921316" />
577
+          <settings layout="Hierarchic Group" zoom="0.9045824632109519" x="332.0" y="288.0" />
885 578
           <SelectedNodes />
886 579
           <Categories>
887 580
             <Category>Constructors</Category>
@@ -891,6 +584,76 @@
891 584
         </state>
892 585
       </provider>
893 586
     </entry>
587
+    <entry file="file://$PROJECT_DIR$/pom.xml">
588
+      <provider selected="true" editor-type-id="text-editor">
589
+        <state relative-caret-position="270">
590
+          <caret line="30" column="65" selection-start-line="30" selection-start-column="65" selection-end-line="30" selection-end-column="65" />
591
+        </state>
592
+      </provider>
593
+    </entry>
594
+    <entry file="file://$PROJECT_DIR$/src/test/java/AccountServiceTest.java">
595
+      <provider selected="true" editor-type-id="text-editor">
596
+        <state relative-caret-position="705">
597
+          <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
598
+          <folding>
599
+            <element signature="imports" expanded="true" />
600
+          </folding>
601
+        </state>
602
+      </provider>
603
+    </entry>
604
+    <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
605
+      <provider selected="true" editor-type-id="text-editor">
606
+        <state relative-caret-position="659">
607
+          <caret line="111" column="18" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" />
608
+          <folding>
609
+            <element signature="imports" expanded="true" />
610
+          </folding>
611
+        </state>
612
+      </provider>
613
+    </entry>
614
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountService.java">
615
+      <provider selected="true" editor-type-id="text-editor">
616
+        <state relative-caret-position="465">
617
+          <caret line="125" selection-start-line="125" selection-end-line="125" />
618
+          <folding>
619
+            <element signature="imports" expanded="true" />
620
+          </folding>
621
+        </state>
622
+      </provider>
623
+    </entry>
624
+    <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
625
+      <provider selected="true" editor-type-id="text-editor">
626
+        <state relative-caret-position="420">
627
+          <caret line="28" column="25" lean-forward="true" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="25" />
628
+          <folding>
629
+            <element signature="imports" expanded="true" />
630
+            <element signature="e#668#669#0" expanded="true" />
631
+            <element signature="e#700#701#0" expanded="true" />
632
+            <element signature="e#844#845#0" expanded="true" />
633
+            <element signature="e#869#870#0" expanded="true" />
634
+            <element signature="e#902#903#0" expanded="true" />
635
+            <element signature="e#930#931#0" expanded="true" />
636
+          </folding>
637
+        </state>
638
+      </provider>
639
+    </entry>
640
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
641
+      <provider selected="true" editor-type-id="text-editor">
642
+        <state relative-caret-position="601">
643
+          <caret line="46" column="39" selection-start-line="46" selection-start-column="39" selection-end-line="46" selection-end-column="39" />
644
+          <folding>
645
+            <element signature="imports" expanded="true" />
646
+          </folding>
647
+        </state>
648
+      </provider>
649
+    </entry>
650
+    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
651
+      <provider selected="true" editor-type-id="text-editor">
652
+        <state relative-caret-position="346">
653
+          <caret line="38" column="5" lean-forward="true" selection-start-line="38" selection-start-column="5" selection-end-line="38" selection-end-column="5" />
654
+        </state>
655
+      </provider>
656
+    </entry>
894 657
   </component>
895 658
   <component name="masterDetails">
896 659
     <states>

+ 1
- 0
src/main/java/Account.java Ver arquivo

@@ -6,6 +6,7 @@ public class Account {
6 6
 
7 7
     public static final String NAME_FIELD_NAME = "name";
8 8
     public static final String PASSWORD_FIELD_NAME = "password";
9
+    public static final String ID = "id";
9 10
 
10 11
     @DatabaseField(columnName = "id", generatedId = true)
11 12
     private int id;

+ 2
- 1
src/main/java/AccountApp.java Ver arquivo

@@ -44,7 +44,7 @@ public class AccountApp {
44 44
         AccountService accountService = new AccountService(accountDao);
45 45
 
46 46
         boolean continueMenu = true;
47
-        System.out.println("Welcome to the Database Manager!\n");
47
+        System.out.println("This is the Database Manager!\n");
48 48
 
49 49
         while (continueMenu){
50 50
 
@@ -65,6 +65,7 @@ public class AccountApp {
65 65
 
66 66
                 accountService.deleteEverythingInTheMenu();
67 67
             }else{
68
+
68 69
                 continueMenu = false;
69 70
             }
70 71
 

+ 1
- 0
src/main/java/AccountService.java Ver arquivo

@@ -123,4 +123,5 @@ public class AccountService {
123 123
         int destroyIT = menuDestroying();
124 124
         deletingOneAcc(getById(destroyIT));
125 125
     }
126
+
126 127
 }

+ 10
- 2
src/main/java/Console.java Ver arquivo

@@ -2,12 +2,15 @@ import java.util.Scanner;
2 2
 
3 3
 public class Console {
4 4
 
5
-    Scanner in;
5
+   private Scanner in;
6 6
 
7 7
    public Console(Scanner in){
8
-        this.in = in;
8
+
9
+       this.in = in;
9 10
    }
11
+
10 12
     public Console(){
13
+
11 14
        in = new Scanner(System.in);
12 15
     }
13 16
 
@@ -35,6 +38,11 @@ public class Console {
35 38
 
36 39
     }
37 40
 
41
+    public void goodByeAll(){
42
+
43
+        System.out.println("U+2605U+2605U+2605U+2605U+2605U+2605U+2605");
44
+    }
45
+
38 46
     public int printAndNextInt(String s){
39 47
 
40 48
         System.out.println(s);

+ 0
- 1
src/test/java/AccountServiceTest.java Ver arquivo

@@ -46,7 +46,6 @@ public class AccountServiceTest {
46 46
     public void testIdupdate() throws Exception{
47 47
 
48 48
         int id = 234;
49
-
50 49
         acc.setId(id);
51 50
         int actual = dao.updateId(acc,id);
52 51