Whitney Martinez 6 лет назад
Родитель
Сommit
41fbac138e
5 измененных файлов: 44 добавлений и 73 удалений
  1. 39
    68
      .idea/workspace.xml
  2. 2
    2
      src/main/java/AccountApp.java
  3. 3
    3
      src/main/java/Console.java
  4. Двоичные данные
      target/classes/AccountApp.class
  5. Двоичные данные
      target/classes/Console.class

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

@@ -2,13 +2,8 @@
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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 5
       <change beforePath="$PROJECT_DIR$/src/main/java/AccountApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountApp.java" afterDir="false" />
7 6
       <change beforePath="$PROJECT_DIR$/src/main/java/Console.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Console.java" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/target/classes/Account.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/Account.class" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/target/classes/AccountApp.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/AccountApp.class" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/target/classes/Console.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/Console.class" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/target/test-classes/AccountServiceTest.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/AccountServiceTest.class" afterDir="false" />
12 7
     </list>
13 8
     <ignored path="$PROJECT_DIR$/out/" />
14 9
     <ignored path="$PROJECT_DIR$/target/" />
@@ -82,13 +77,13 @@
82 77
       </usages-collector>
83 78
       <usages-collector id="statistics.file.extensions.edit">
84 79
         <counts>
85
-          <entry key="java" value="4294" />
80
+          <entry key="java" value="4336" />
86 81
           <entry key="xml" value="7" />
87 82
         </counts>
88 83
       </usages-collector>
89 84
       <usages-collector id="statistics.file.types.edit">
90 85
         <counts>
91
-          <entry key="JAVA" value="4294" />
86
+          <entry key="JAVA" value="4336" />
92 87
           <entry key="XML" value="7" />
93 88
         </counts>
94 89
       </usages-collector>
@@ -99,7 +94,7 @@
99 94
       <file pinned="false" current-in-tab="false">
100 95
         <entry file="file://$PROJECT_DIR$/pom.xml">
101 96
           <provider selected="true" editor-type-id="text-editor">
102
-            <state relative-caret-position="285">
97
+            <state relative-caret-position="153">
103 98
               <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
104 99
             </state>
105 100
           </provider>
@@ -108,8 +103,8 @@
108 103
       <file pinned="false" current-in-tab="false">
109 104
         <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
110 105
           <provider selected="true" editor-type-id="text-editor">
111
-            <state relative-caret-position="750">
112
-              <caret line="66" column="5" selection-start-line="66" selection-start-column="5" selection-end-line="66" selection-end-column="5" />
106
+            <state relative-caret-position="256">
107
+              <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
113 108
               <folding>
114 109
                 <element signature="imports" expanded="true" />
115 110
               </folding>
@@ -120,20 +115,8 @@
120 115
       <file pinned="false" current-in-tab="false">
121 116
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
122 117
           <provider selected="true" editor-type-id="text-editor">
123
-            <state relative-caret-position="840">
124
-              <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
125
-              <folding>
126
-                <element signature="imports" expanded="true" />
127
-              </folding>
128
-            </state>
129
-          </provider>
130
-        </entry>
131
-      </file>
132
-      <file pinned="false" current-in-tab="false">
133
-        <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
134
-          <provider selected="true" editor-type-id="text-editor">
135
-            <state relative-caret-position="1196">
136
-              <caret line="111" column="18" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" />
118
+            <state relative-caret-position="192">
119
+              <caret line="52" selection-start-line="52" selection-end-line="52" />
137 120
               <folding>
138 121
                 <element signature="imports" expanded="true" />
139 122
               </folding>
@@ -142,22 +125,10 @@
142 125
         </entry>
143 126
       </file>
144 127
       <file pinned="false" current-in-tab="true">
145
-        <entry file="file://$PROJECT_DIR$/src/test/java/AccountServiceTest.java">
146
-          <provider selected="true" editor-type-id="text-editor">
147
-            <state relative-caret-position="204">
148
-              <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
149
-              <folding>
150
-                <element signature="imports" expanded="true" />
151
-              </folding>
152
-            </state>
153
-          </provider>
154
-        </entry>
155
-      </file>
156
-      <file pinned="false" current-in-tab="false">
157 128
         <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
158 129
           <provider selected="true" editor-type-id="text-editor">
159
-            <state relative-caret-position="200">
160
-              <caret line="35" selection-start-line="35" selection-end-line="35" />
130
+            <state relative-caret-position="18">
131
+              <caret line="28" column="53" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="53" />
161 132
               <folding>
162 133
                 <element signature="e#842#843#0" expanded="true" />
163 134
                 <element signature="e#873#874#0" expanded="true" />
@@ -169,8 +140,8 @@
169 140
       <file pinned="false" current-in-tab="false">
170 141
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountService.java">
171 142
           <provider selected="true" editor-type-id="text-editor">
172
-            <state relative-caret-position="218">
173
-              <caret line="19" column="74" lean-forward="true" selection-start-line="19" selection-start-column="74" selection-end-line="19" selection-end-column="74" />
143
+            <state relative-caret-position="128">
144
+              <caret line="19" column="54" selection-start-line="19" selection-start-column="54" selection-end-line="19" selection-end-column="54" />
174 145
               <folding>
175 146
                 <element signature="imports" expanded="true" />
176 147
               </folding>
@@ -367,7 +338,7 @@
367 338
       <workItem from="1542638526297" duration="2309000" />
368 339
       <workItem from="1542659351017" duration="1153000" />
369 340
       <workItem from="1542726614951" duration="1534000" />
370
-      <workItem from="1542736848940" duration="8243000" />
341
+      <workItem from="1542736848940" duration="9033000" />
371 342
     </task>
372 343
     <servers />
373 344
   </component>
@@ -386,13 +357,13 @@
386 357
     </history-entry>
387 358
   </component>
388 359
   <component name="TimeTrackingManager">
389
-    <option name="totallyTimeSpent" value="30240000" />
360
+    <option name="totallyTimeSpent" value="31030000" />
390 361
   </component>
391 362
   <component name="ToolWindowManager">
392
-    <frame x="40" y="74" width="1218" height="613" extended-state="1" />
363
+    <frame x="40" y="74" width="1218" height="613" extended-state="0" />
393 364
     <editor active="true" />
394 365
     <layout>
395
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.23639455" />
366
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.23639455" />
396 367
       <window_info id="Structure" order="1" side_tool="true" weight="0.20706107" />
397 368
       <window_info id="Image Layers" order="2" />
398 369
       <window_info id="Designer" order="3" />
@@ -401,7 +372,7 @@
401 372
       <window_info id="Favorites" order="6" side_tool="true" />
402 373
       <window_info anchor="bottom" id="Message" order="0" />
403 374
       <window_info anchor="bottom" id="Find" order="1" />
404
-      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.2284069" />
375
+      <window_info anchor="bottom" id="Run" order="2" weight="0.30518234" />
405 376
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
406 377
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
407 378
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -410,7 +381,7 @@
410 381
       <window_info anchor="bottom" id="Database Changes" order="8" />
411 382
       <window_info anchor="bottom" id="Terminal" order="9" />
412 383
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
413
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32901135" />
384
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32821497" />
414 385
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
415 386
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
416 387
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -632,68 +603,68 @@
632 603
     </entry>
633 604
     <entry file="file://$PROJECT_DIR$/pom.xml">
634 605
       <provider selected="true" editor-type-id="text-editor">
635
-        <state relative-caret-position="285">
606
+        <state relative-caret-position="153">
636 607
           <caret line="19" column="18" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
637 608
         </state>
638 609
       </provider>
639 610
     </entry>
640
-    <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
611
+    <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
641 612
       <provider selected="true" editor-type-id="text-editor">
642
-        <state relative-caret-position="750">
643
-          <caret line="66" column="5" selection-start-line="66" selection-start-column="5" selection-end-line="66" selection-end-column="5" />
613
+        <state relative-caret-position="1196">
614
+          <caret line="111" column="18" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" />
644 615
           <folding>
645 616
             <element signature="imports" expanded="true" />
646 617
           </folding>
647 618
         </state>
648 619
       </provider>
649 620
     </entry>
650
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountService.java">
621
+    <entry file="file://$PROJECT_DIR$/src/test/java/AccountServiceTest.java">
651 622
       <provider selected="true" editor-type-id="text-editor">
652
-        <state relative-caret-position="218">
653
-          <caret line="19" column="74" lean-forward="true" selection-start-line="19" selection-start-column="74" selection-end-line="19" selection-end-column="74" />
623
+        <state relative-caret-position="205">
624
+          <caret line="54" column="5" lean-forward="true" selection-start-line="54" selection-start-column="5" selection-end-line="54" selection-end-column="5" />
654 625
           <folding>
655 626
             <element signature="imports" expanded="true" />
656 627
           </folding>
657 628
         </state>
658 629
       </provider>
659 630
     </entry>
660
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
631
+    <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
661 632
       <provider selected="true" editor-type-id="text-editor">
662
-        <state relative-caret-position="840">
663
-          <caret line="56" lean-forward="true" selection-start-line="56" selection-end-line="56" />
633
+        <state relative-caret-position="256">
634
+          <caret line="47" lean-forward="true" selection-start-line="47" selection-end-line="47" />
664 635
           <folding>
665 636
             <element signature="imports" expanded="true" />
666 637
           </folding>
667 638
         </state>
668 639
       </provider>
669 640
     </entry>
670
-    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
641
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
671 642
       <provider selected="true" editor-type-id="text-editor">
672
-        <state relative-caret-position="200">
673
-          <caret line="35" selection-start-line="35" selection-end-line="35" />
643
+        <state relative-caret-position="192">
644
+          <caret line="52" selection-start-line="52" selection-end-line="52" />
674 645
           <folding>
675
-            <element signature="e#842#843#0" expanded="true" />
676
-            <element signature="e#873#874#0" expanded="true" />
646
+            <element signature="imports" expanded="true" />
677 647
           </folding>
678 648
         </state>
679 649
       </provider>
680 650
     </entry>
681
-    <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
651
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountService.java">
682 652
       <provider selected="true" editor-type-id="text-editor">
683
-        <state relative-caret-position="1196">
684
-          <caret line="111" column="18" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" />
653
+        <state relative-caret-position="128">
654
+          <caret line="19" column="54" selection-start-line="19" selection-start-column="54" selection-end-line="19" selection-end-column="54" />
685 655
           <folding>
686 656
             <element signature="imports" expanded="true" />
687 657
           </folding>
688 658
         </state>
689 659
       </provider>
690 660
     </entry>
691
-    <entry file="file://$PROJECT_DIR$/src/test/java/AccountServiceTest.java">
661
+    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
692 662
       <provider selected="true" editor-type-id="text-editor">
693
-        <state relative-caret-position="204">
694
-          <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
663
+        <state relative-caret-position="18">
664
+          <caret line="28" column="53" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="28" selection-end-column="53" />
695 665
           <folding>
696
-            <element signature="imports" expanded="true" />
666
+            <element signature="e#842#843#0" expanded="true" />
667
+            <element signature="e#873#874#0" expanded="true" />
697 668
           </folding>
698 669
         </state>
699 670
       </provider>

+ 2
- 2
src/main/java/AccountApp.java Просмотреть файл

@@ -30,7 +30,7 @@ public class AccountApp {
30 30
             setupDao(connectionSource);
31 31
             processData();
32 32
         } finally {
33
-            c.print("Laters!");
33
+            c.goodByeAll();
34 34
             if (connectionSource !=null){
35 35
                 connectionSource.close();
36 36
             }
@@ -50,7 +50,7 @@ public class AccountApp {
50 50
         while (continueMenu){
51 51
             c.printMenu();
52 52
             c.printingOutAStringInput("Select by the number: ");
53
-            c.line();
53
+
54 54
            switch (c.nextInt()){
55 55
 
56 56
             case 1:

+ 3
- 3
src/main/java/Console.java Просмотреть файл

@@ -27,8 +27,8 @@ public class Console {
27 27
 
28 28
     public void headingHeader(){
29 29
         System.out.println("Displaying Accounts:\n");
30
-        System.out.println(String.format("*%10s* *%15s* *%15s*", "ID","Name","Pass"));
31
-        System.out.println("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
30
+        System.out.println(String.format("✿%10s✿ ✿%15s✿ ✿%15s✿", "ID","Name","Pass"));
31
+        System.out.println("★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★★");
32 32
 
33 33
     }
34 34
 
@@ -45,7 +45,7 @@ public class Console {
45 45
 
46 46
     public void goodByeAll(){
47 47
 
48
-        System.out.println("U+2605U+2605U+2605U+2605U+2605U+2605U+2605");
48
+        System.out.println("✿✿✿✿✿✿ Goodbye all! ✿✿✿✿✿✿");
49 49
     }
50 50
 
51 51
     public int printAndNextInt(String s){

Двоичные данные
target/classes/AccountApp.class Просмотреть файл


Двоичные данные
target/classes/Console.class Просмотреть файл