Seth 6 jaren geleden
bovenliggende
commit
bd5f908c3c
2 gewijzigde bestanden met toevoegingen van 74 en 20 verwijderingen
  1. 50
    20
      .idea/workspace.xml
  2. 24
    0
      src/main/java/Console.java

+ 50
- 20
.idea/workspace.xml Bestand weergeven

@@ -2,11 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="b71a0d05-772d-4338-8f47-61b6a36d5d57" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/AccountServ.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/Console.java" afterDir="false" />
6 6
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/test/java/AccountServTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/AccountServTest.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/test/java/MockDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/MockDao.java" afterDir="false" />
10 7
     </list>
11 8
     <ignored path="$PROJECT_DIR$/target/" />
12 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -31,7 +28,7 @@
31 28
         <counts>
32 29
           <entry key="class" value="3" />
33 30
           <entry key="iml" value="2" />
34
-          <entry key="java" value="6" />
31
+          <entry key="java" value="7" />
35 32
           <entry key="md" value="1" />
36 33
           <entry key="xml" value="2" />
37 34
         </counts>
@@ -40,19 +37,19 @@
40 37
         <counts>
41 38
           <entry key="CLASS" value="3" />
42 39
           <entry key="IDEA_MODULE" value="2" />
43
-          <entry key="JAVA" value="6" />
40
+          <entry key="JAVA" value="7" />
44 41
           <entry key="Markdown" value="1" />
45 42
           <entry key="XML" value="2" />
46 43
         </counts>
47 44
       </usages-collector>
48 45
       <usages-collector id="statistics.file.extensions.edit">
49 46
         <counts>
50
-          <entry key="java" value="505" />
47
+          <entry key="java" value="817" />
51 48
         </counts>
52 49
       </usages-collector>
53 50
       <usages-collector id="statistics.file.types.edit">
54 51
         <counts>
55
-          <entry key="JAVA" value="505" />
52
+          <entry key="JAVA" value="817" />
56 53
         </counts>
57 54
       </usages-collector>
58 55
     </session>
@@ -107,17 +104,34 @@
107 104
           </provider>
108 105
         </entry>
109 106
       </file>
110
-      <file pinned="false" current-in-tab="true">
107
+      <file pinned="false" current-in-tab="false">
111 108
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountServ.java">
112 109
           <provider selected="true" editor-type-id="text-editor">
113
-            <state relative-caret-position="315">
114
-              <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
110
+            <state relative-caret-position="375">
111
+              <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
115 112
               <folding>
116 113
                 <element signature="imports" expanded="true" />
117 114
                 <element signature="e#175#176#0" expanded="true" />
118 115
                 <element signature="e#203#204#0" expanded="true" />
119
-                <element signature="e#414#415#0" expanded="true" />
120
-                <element signature="e#439#440#0" expanded="true" />
116
+              </folding>
117
+            </state>
118
+          </provider>
119
+        </entry>
120
+      </file>
121
+      <file pinned="false" current-in-tab="true">
122
+        <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
123
+          <provider selected="true" editor-type-id="text-editor">
124
+            <state relative-caret-position="330">
125
+              <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
126
+              <folding>
127
+                <element signature="e#135#136#0" expanded="true" />
128
+                <element signature="e#169#170#0" expanded="true" />
129
+                <element signature="e#213#214#0" expanded="true" />
130
+                <element signature="e#241#242#0" expanded="true" />
131
+                <element signature="e#273#274#0" expanded="true" />
132
+                <element signature="e#286#287#0" expanded="true" />
133
+                <element signature="e#331#332#0" expanded="true" />
134
+                <element signature="e#353#354#0" expanded="true" />
121 135
               </folding>
122 136
             </state>
123 137
           </provider>
@@ -162,6 +176,7 @@
162 176
         <option value="$PROJECT_DIR$/src/main/java/AccountApp.java" />
163 177
         <option value="$PROJECT_DIR$/src/test/java/MockDao.java" />
164 178
         <option value="$PROJECT_DIR$/src/main/java/AccountServ.java" />
179
+        <option value="$PROJECT_DIR$/src/main/java/Console.java" />
165 180
       </list>
166 181
     </option>
167 182
   </component>
@@ -231,7 +246,7 @@
231 246
   <component name="PropertiesComponent">
232 247
     <property name="WebServerToolWindowFactoryState" value="false" />
233 248
     <property name="aspect.path.notification.shown" value="true" />
234
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542483722576" />
249
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542484750730" />
235 250
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
236 251
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
237 252
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -279,12 +294,12 @@
279 294
       <workItem from="1542239571129" duration="6414000" />
280 295
       <workItem from="1542402275147" duration="2006000" />
281 296
       <workItem from="1542420139392" duration="4000" />
282
-      <workItem from="1542475891339" duration="2670000" />
297
+      <workItem from="1542475891339" duration="3289000" />
283 298
     </task>
284 299
     <servers />
285 300
   </component>
286 301
   <component name="TimeTrackingManager">
287
-    <option name="totallyTimeSpent" value="11094000" />
302
+    <option name="totallyTimeSpent" value="11713000" />
288 303
   </component>
289 304
   <component name="ToolWindowManager">
290 305
     <frame x="0" y="23" width="1440" height="807" extended-state="0" />
@@ -401,14 +416,29 @@
401 416
     </entry>
402 417
     <entry file="file://$PROJECT_DIR$/src/main/java/AccountServ.java">
403 418
       <provider selected="true" editor-type-id="text-editor">
404
-        <state relative-caret-position="315">
405
-          <caret line="21" column="25" selection-start-line="21" selection-start-column="25" selection-end-line="21" selection-end-column="25" />
419
+        <state relative-caret-position="375">
420
+          <caret line="25" column="35" selection-start-line="25" selection-start-column="35" selection-end-line="25" selection-end-column="35" />
406 421
           <folding>
407 422
             <element signature="imports" expanded="true" />
408 423
             <element signature="e#175#176#0" expanded="true" />
409 424
             <element signature="e#203#204#0" expanded="true" />
410
-            <element signature="e#414#415#0" expanded="true" />
411
-            <element signature="e#439#440#0" expanded="true" />
425
+          </folding>
426
+        </state>
427
+      </provider>
428
+    </entry>
429
+    <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
430
+      <provider selected="true" editor-type-id="text-editor">
431
+        <state relative-caret-position="330">
432
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
433
+          <folding>
434
+            <element signature="e#135#136#0" expanded="true" />
435
+            <element signature="e#169#170#0" expanded="true" />
436
+            <element signature="e#213#214#0" expanded="true" />
437
+            <element signature="e#241#242#0" expanded="true" />
438
+            <element signature="e#273#274#0" expanded="true" />
439
+            <element signature="e#286#287#0" expanded="true" />
440
+            <element signature="e#331#332#0" expanded="true" />
441
+            <element signature="e#353#354#0" expanded="true" />
412 442
           </folding>
413 443
         </state>
414 444
       </provider>

+ 24
- 0
src/main/java/Console.java Bestand weergeven

@@ -0,0 +1,24 @@
1
+import java.util.Scanner;
2
+
3
+public class Console {
4
+
5
+private Scanner scanner = new Scanner(System.in);
6
+
7
+public void print(String string) {
8
+    System.out.println(string);
9
+}
10
+
11
+public void printSameLine(String string) {
12
+    System.out.print(string);
13
+}
14
+
15
+public String strInput() {
16
+    return scanner.nextLine();
17
+}
18
+
19
+public int intInput() {
20
+    return scanner.nextInt();
21
+}
22
+
23
+
24
+}