Jennifer Chao 6 anni fa
parent
commit
c0d941d63a
1 ha cambiato i file con 39 aggiunte e 35 eliminazioni
  1. 39
    35
      .idea/workspace.xml

+ 39
- 35
.idea/workspace.xml Vedi File

@@ -4,6 +4,7 @@
4 4
     <list default="true" id="76ef3434-85fd-4aed-92dd-942905803ede" name="Default Changelist" comment="">
5 5
       <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
6 6
       <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
7 8
       <change afterPath="$PROJECT_DIR$/src/main/java/AcctService.java" afterDir="false" />
8 9
       <change afterPath="$PROJECT_DIR$/src/main/java/Console.java" afterDir="false" />
9 10
       <change afterPath="$PROJECT_DIR$/src/test/java/AcctServiceTest.java" afterDir="false" />
@@ -12,6 +13,7 @@
12 13
       <change afterPath="$PROJECT_DIR$/target/classes/Console.class" afterDir="false" />
13 14
       <change afterPath="$PROJECT_DIR$/target/test-classes/AcctServiceTest.class" afterDir="false" />
14 15
       <change afterPath="$PROJECT_DIR$/target/test-classes/MockDao.class" afterDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
15 17
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
16 18
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
17 19
       <change beforePath="$PROJECT_DIR$/src/main/java/AccountApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountApp.java" afterDir="false" />
@@ -66,6 +68,14 @@
66 68
         </counts>
67 69
       </usages-collector>
68 70
     </session>
71
+    <session id="-997098231">
72
+      <usages-collector id="statistics.lifecycle.project">
73
+        <counts>
74
+          <entry key="project.open.time.1" value="1" />
75
+          <entry key="project.opened" value="1" />
76
+        </counts>
77
+      </usages-collector>
78
+    </session>
69 79
   </component>
70 80
   <component name="FileEditorManager">
71 81
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
@@ -81,7 +91,7 @@
81 91
       <file pinned="false" current-in-tab="false">
82 92
         <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
83 93
           <provider selected="true" editor-type-id="text-editor">
84
-            <state relative-caret-position="570">
94
+            <state relative-caret-position="465">
85 95
               <caret line="38" selection-start-line="38" selection-end-line="38" />
86 96
               <folding>
87 97
                 <element signature="imports" expanded="true" />
@@ -104,14 +114,11 @@
104 114
           </provider>
105 115
         </entry>
106 116
       </file>
107
-      <file pinned="false" current-in-tab="false">
117
+      <file pinned="false" current-in-tab="true">
108 118
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
109 119
           <provider selected="true" editor-type-id="text-editor">
110
-            <state relative-caret-position="48">
111
-              <caret line="10" selection-start-line="10" selection-end-line="10" />
112
-              <folding>
113
-                <element signature="imports" expanded="true" />
114
-              </folding>
120
+            <state relative-caret-position="1">
121
+              <caret line="5" column="27" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="27" />
115 122
             </state>
116 123
           </provider>
117 124
         </entry>
@@ -131,7 +138,7 @@
131 138
       <file pinned="false" current-in-tab="false">
132 139
         <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
133 140
           <provider selected="true" editor-type-id="text-editor">
134
-            <state relative-caret-position="350">
141
+            <state relative-caret-position="420">
135 142
               <caret line="42" column="38" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="38" />
136 143
               <folding>
137 144
                 <element signature="imports" expanded="true" />
@@ -142,11 +149,11 @@
142 149
           </provider>
143 150
         </entry>
144 151
       </file>
145
-      <file pinned="false" current-in-tab="true">
152
+      <file pinned="false" current-in-tab="false">
146 153
         <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
147 154
           <provider selected="true" editor-type-id="text-editor">
148 155
             <state relative-caret-position="615">
149
-              <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
156
+              <caret line="45" selection-start-line="45" selection-end-line="45" />
150 157
             </state>
151 158
           </provider>
152 159
         </entry>
@@ -154,7 +161,7 @@
154 161
       <file pinned="false" current-in-tab="false">
155 162
         <entry file="file://$PROJECT_DIR$/src/test/java/AcctServiceTest.java">
156 163
           <provider selected="true" editor-type-id="text-editor">
157
-            <state relative-caret-position="270">
164
+            <state relative-caret-position="195">
158 165
               <caret line="18" column="41" selection-start-line="18" selection-start-column="41" selection-end-line="18" selection-end-column="41" />
159 166
               <folding>
160 167
                 <element signature="imports" expanded="true" />
@@ -227,8 +234,6 @@
227 234
       <foldersAlwaysOnTop value="true" />
228 235
     </navigator>
229 236
     <panes>
230
-      <pane id="Scope" />
231
-      <pane id="PackagesPane" />
232 237
       <pane id="ProjectPane">
233 238
         <subPane>
234 239
           <expand>
@@ -264,12 +269,14 @@
264 269
           <select />
265 270
         </subPane>
266 271
       </pane>
272
+      <pane id="PackagesPane" />
273
+      <pane id="Scope" />
267 274
     </panes>
268 275
   </component>
269 276
   <component name="PropertiesComponent">
270 277
     <property name="WebServerToolWindowFactoryState" value="false" />
271 278
     <property name="aspect.path.notification.shown" value="true" />
272
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542594402583" />
279
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542594579748" />
273 280
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
274 281
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
275 282
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -379,6 +386,7 @@
379 386
       <workItem from="1542448654564" duration="172000" />
380 387
       <workItem from="1542584165793" duration="9543000" />
381 388
       <workItem from="1542594135985" duration="31000" />
389
+      <workItem from="1542594245822" duration="248000" />
382 390
     </task>
383 391
     <servers />
384 392
   </component>
@@ -409,13 +417,12 @@
409 417
     </history-entry>
410 418
   </component>
411 419
   <component name="TimeTrackingManager">
412
-    <option name="totallyTimeSpent" value="24843000" />
420
+    <option name="totallyTimeSpent" value="25091000" />
413 421
   </component>
414 422
   <component name="ToolWindowManager">
415 423
     <frame x="0" y="23" width="1280" height="712" extended-state="0" />
416
-    <editor active="true" />
417 424
     <layout>
418
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1825525" />
425
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18497577" />
419 426
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
420 427
       <window_info id="Image Layers" order="2" />
421 428
       <window_info id="Designer" order="3" />
@@ -424,16 +431,16 @@
424 431
       <window_info id="Favorites" order="6" side_tool="true" />
425 432
       <window_info anchor="bottom" id="Message" order="0" />
426 433
       <window_info anchor="bottom" id="Find" order="1" />
427
-      <window_info anchor="bottom" id="Run" order="2" weight="0.29452056" />
434
+      <window_info anchor="bottom" id="Run" order="2" weight="0.9758065" />
428 435
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
429 436
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
430 437
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
431 438
       <window_info anchor="bottom" id="TODO" order="6" />
432 439
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
433 440
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
434
-      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.13548388" />
441
+      <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.7306452" />
435 442
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
436
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32739726" />
443
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32580644" />
437 444
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
438 445
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
439 446
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -473,7 +480,7 @@
473 480
     </entry>
474 481
     <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
475 482
       <provider selected="true" editor-type-id="text-editor">
476
-        <state relative-caret-position="570">
483
+        <state relative-caret-position="465">
477 484
           <caret line="38" selection-start-line="38" selection-end-line="38" />
478 485
           <folding>
479 486
             <element signature="imports" expanded="true" />
@@ -495,16 +502,6 @@
495 502
         </state>
496 503
       </provider>
497 504
     </entry>
498
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
499
-      <provider selected="true" editor-type-id="text-editor">
500
-        <state relative-caret-position="48">
501
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
502
-          <folding>
503
-            <element signature="imports" expanded="true" />
504
-          </folding>
505
-        </state>
506
-      </provider>
507
-    </entry>
508 505
     <entry file="file://$PROJECT_DIR$/src/main/java/AcctService.java">
509 506
       <provider selected="true" editor-type-id="text-editor">
510 507
         <state relative-caret-position="45">
@@ -517,7 +514,7 @@
517 514
     </entry>
518 515
     <entry file="file://$PROJECT_DIR$/src/test/java/MockDao.java">
519 516
       <provider selected="true" editor-type-id="text-editor">
520
-        <state relative-caret-position="350">
517
+        <state relative-caret-position="420">
521 518
           <caret line="42" column="38" selection-start-line="42" selection-start-column="28" selection-end-line="42" selection-end-column="38" />
522 519
           <folding>
523 520
             <element signature="imports" expanded="true" />
@@ -529,7 +526,7 @@
529 526
     </entry>
530 527
     <entry file="file://$PROJECT_DIR$/src/test/java/AcctServiceTest.java">
531 528
       <provider selected="true" editor-type-id="text-editor">
532
-        <state relative-caret-position="270">
529
+        <state relative-caret-position="195">
533 530
           <caret line="18" column="41" selection-start-line="18" selection-start-column="41" selection-end-line="18" selection-end-column="41" />
534 531
           <folding>
535 532
             <element signature="imports" expanded="true" />
@@ -540,7 +537,14 @@
540 537
     <entry file="file://$PROJECT_DIR$/src/main/java/Console.java">
541 538
       <provider selected="true" editor-type-id="text-editor">
542 539
         <state relative-caret-position="615">
543
-          <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" />
540
+          <caret line="45" selection-start-line="45" selection-end-line="45" />
541
+        </state>
542
+      </provider>
543
+    </entry>
544
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
545
+      <provider selected="true" editor-type-id="text-editor">
546
+        <state relative-caret-position="1">
547
+          <caret line="5" column="27" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="27" />
544 548
         </state>
545 549
       </provider>
546 550
     </entry>
@@ -596,7 +600,7 @@
596 600
       </state>
597 601
       <state key="ModuleStructureConfigurable.UI">
598 602
         <settings>
599
-          <last-edited>ORM_Lab</last-edited>
603
+          <last-edited>lab</last-edited>
600 604
           <splitter-proportions>
601 605
             <option name="proportions">
602 606
               <list>