Lauren Green преди 6 години
родител
ревизия
513acc2300
променени са 2 файла, в които са добавени 54 реда и са изтрити 48 реда
  1. 53
    47
      .idea/workspace.xml
  2. 1
    1
      pom.xml

+ 53
- 47
.idea/workspace.xml Целия файл

@@ -2,7 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="24656c49-611f-4613-8dfe-095c8d9c4000" name="Default Changelist" comment="">
5
-      <change beforePath="$PROJECT_DIR$/src/main/java/AccountApp.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/AccountApp.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$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
6 7
     </list>
7 8
     <ignored path="$PROJECT_DIR$/out/" />
8 9
     <ignored path="$PROJECT_DIR$/target/" />
@@ -16,8 +17,11 @@
16 17
     <session id="1578324603">
17 18
       <usages-collector id="statistics.lifecycle.project">
18 19
         <counts>
20
+          <entry key="project.closed" value="2" />
21
+          <entry key="project.open.time.18" value="1" />
22
+          <entry key="project.open.time.20" value="1" />
19 23
           <entry key="project.open.time.6" value="1" />
20
-          <entry key="project.opened" value="1" />
24
+          <entry key="project.opened" value="3" />
21 25
         </counts>
22 26
       </usages-collector>
23 27
       <usages-collector id="statistics.file.extensions.open">
@@ -49,12 +53,12 @@
49 53
     </session>
50 54
   </component>
51 55
   <component name="FileEditorManager">
52
-    <leaf>
56
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
53 57
       <file pinned="false" current-in-tab="false">
54 58
         <entry file="file://$PROJECT_DIR$/pom.xml">
55 59
           <provider selected="true" editor-type-id="text-editor">
56
-            <state relative-caret-position="375">
57
-              <caret line="25" column="74" selection-start-line="25" selection-start-column="74" selection-end-line="25" selection-end-column="74" />
60
+            <state relative-caret-position="390">
61
+              <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
58 62
             </state>
59 63
           </provider>
60 64
         </entry>
@@ -62,7 +66,7 @@
62 66
       <file pinned="false" current-in-tab="false">
63 67
         <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
64 68
           <provider selected="true" editor-type-id="text-editor">
65
-            <state relative-caret-position="375">
69
+            <state relative-caret-position="330">
66 70
               <caret line="25" selection-start-line="25" selection-end-line="25" />
67 71
               <folding>
68 72
                 <element signature="imports" expanded="true" />
@@ -88,8 +92,8 @@
88 92
       <file pinned="false" current-in-tab="true">
89 93
         <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
90 94
           <provider selected="true" editor-type-id="text-editor">
91
-            <state relative-caret-position="135">
92
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
95
+            <state relative-caret-position="465">
96
+              <caret line="31" column="41" lean-forward="true" selection-start-line="31" selection-start-column="41" selection-end-line="31" selection-end-column="41" />
93 97
               <folding>
94 98
                 <element signature="imports" expanded="true" />
95 99
               </folding>
@@ -121,9 +125,9 @@
121 125
   <component name="IdeDocumentHistory">
122 126
     <option name="CHANGED_PATHS">
123 127
       <list>
124
-        <option value="$PROJECT_DIR$/pom.xml" />
125 128
         <option value="$PROJECT_DIR$/src/main/java/Account.java" />
126 129
         <option value="$PROJECT_DIR$/src/main/java/AccountApp.java" />
130
+        <option value="$PROJECT_DIR$/pom.xml" />
127 131
       </list>
128 132
     </option>
129 133
   </component>
@@ -151,6 +155,7 @@
151 155
       <foldersAlwaysOnTop value="true" />
152 156
     </navigator>
153 157
     <panes>
158
+      <pane id="Scope" />
154 159
       <pane id="PackagesPane" />
155 160
       <pane id="ProjectPane">
156 161
         <subPane>
@@ -174,13 +179,12 @@
174 179
           <select />
175 180
         </subPane>
176 181
       </pane>
177
-      <pane id="Scope" />
178 182
     </panes>
179 183
   </component>
180 184
   <component name="PropertiesComponent">
181 185
     <property name="WebServerToolWindowFactoryState" value="false" />
182 186
     <property name="aspect.path.notification.shown" value="true" />
183
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542234933200" />
187
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542242948006" />
184 188
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
185 189
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
186 190
     <property name="project.structure.last.edited" value="Modules" />
@@ -223,29 +227,26 @@
223 227
       <option name="number" value="Default" />
224 228
       <option name="presentableId" value="Default" />
225 229
       <updated>1542232515260</updated>
226
-      <workItem from="1542232517079" duration="2223000" />
230
+      <workItem from="1542232517079" duration="2272000" />
231
+      <workItem from="1542235072407" duration="35000" />
232
+      <workItem from="1542242747938" duration="199000" />
227 233
     </task>
228 234
     <servers />
229 235
   </component>
230 236
   <component name="TimeTrackingManager">
231
-    <option name="totallyTimeSpent" value="2223000" />
237
+    <option name="totallyTimeSpent" value="2506000" />
232 238
   </component>
233 239
   <component name="ToolWindowManager">
234 240
     <frame x="36" y="23" width="1621" height="958" extended-state="0" />
235 241
     <editor active="true" />
236 242
     <layout>
237
-      <window_info id="Image Layers" />
238
-      <window_info id="Designer" />
239
-      <window_info id="UI Designer" />
240
-      <window_info id="Capture Tool" />
241
-      <window_info id="Favorites" side_tool="true" />
242
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24952501" />
243
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25585812" />
243 244
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
244
-      <window_info anchor="bottom" id="Messages" weight="0.3290993" />
245
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
246
-      <window_info anchor="bottom" id="Version Control" />
247
-      <window_info anchor="bottom" id="Terminal" />
248
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
245
+      <window_info id="Image Layers" order="2" />
246
+      <window_info id="Designer" order="3" />
247
+      <window_info id="UI Designer" order="4" />
248
+      <window_info id="Capture Tool" order="5" />
249
+      <window_info id="Favorites" order="6" side_tool="true" />
249 250
       <window_info anchor="bottom" id="Message" order="0" />
250 251
       <window_info anchor="bottom" id="Find" order="1" />
251 252
       <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3290993" />
@@ -253,15 +254,20 @@
253 254
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
254 255
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
255 256
       <window_info anchor="bottom" id="TODO" order="6" />
256
-      <window_info anchor="right" id="Palette" />
257
-      <window_info anchor="right" id="Theme Preview" />
258
-      <window_info anchor="right" id="Capture Analysis" />
259
-      <window_info anchor="right" id="Palette&#9;" />
260
-      <window_info anchor="right" id="Database" />
261
-      <window_info anchor="right" id="Maven Projects" />
257
+      <window_info anchor="bottom" id="Version Control" order="7" />
258
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
259
+      <window_info anchor="bottom" id="Terminal" order="9" />
260
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.3290993" />
261
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.3290993" />
262 262
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
263 263
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
264 264
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
265
+      <window_info anchor="right" id="Palette" order="3" />
266
+      <window_info anchor="right" id="Capture Analysis" order="4" />
267
+      <window_info anchor="right" id="Database" order="5" />
268
+      <window_info anchor="right" id="Theme Preview" order="6" />
269
+      <window_info anchor="right" id="Palette&#9;" order="7" />
270
+      <window_info anchor="right" id="Maven Projects" order="8" />
265 271
     </layout>
266 272
   </component>
267 273
   <component name="TypeScriptGeneratedFilesManager">
@@ -271,23 +277,9 @@
271 277
     <option name="myLimit" value="2678400000" />
272 278
   </component>
273 279
   <component name="editorHistoryManager">
274
-    <entry file="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/com/mysql/jdbc/Util.class">
275
-      <provider selected="true" editor-type-id="text-editor">
276
-        <state relative-caret-position="3075">
277
-          <caret line="233" selection-start-line="233" selection-end-line="233" />
278
-        </state>
279
-      </provider>
280
-    </entry>
281
-    <entry file="file://$PROJECT_DIR$/pom.xml">
282
-      <provider selected="true" editor-type-id="text-editor">
283
-        <state relative-caret-position="375">
284
-          <caret line="25" column="74" selection-start-line="25" selection-start-column="74" selection-end-line="25" selection-end-column="74" />
285
-        </state>
286
-      </provider>
287
-    </entry>
288 280
     <entry file="file://$PROJECT_DIR$/src/main/java/Account.java">
289 281
       <provider selected="true" editor-type-id="text-editor">
290
-        <state relative-caret-position="375">
282
+        <state relative-caret-position="330">
291 283
           <caret line="25" selection-start-line="25" selection-end-line="25" />
292 284
           <folding>
293 285
             <element signature="imports" expanded="true" />
@@ -309,10 +301,24 @@
309 301
         </state>
310 302
       </provider>
311 303
     </entry>
304
+    <entry file="jar://$MAVEN_REPOSITORY$/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar!/com/mysql/jdbc/Util.class">
305
+      <provider selected="true" editor-type-id="text-editor">
306
+        <state relative-caret-position="3075">
307
+          <caret line="233" selection-start-line="233" selection-end-line="233" />
308
+        </state>
309
+      </provider>
310
+    </entry>
311
+    <entry file="file://$PROJECT_DIR$/pom.xml">
312
+      <provider selected="true" editor-type-id="text-editor">
313
+        <state relative-caret-position="390">
314
+          <caret line="26" column="16" lean-forward="true" selection-start-line="26" selection-start-column="16" selection-end-line="26" selection-end-column="16" />
315
+        </state>
316
+      </provider>
317
+    </entry>
312 318
     <entry file="file://$PROJECT_DIR$/src/main/java/AccountApp.java">
313 319
       <provider selected="true" editor-type-id="text-editor">
314
-        <state relative-caret-position="135">
315
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
320
+        <state relative-caret-position="465">
321
+          <caret line="31" column="41" lean-forward="true" selection-start-line="31" selection-start-column="41" selection-end-line="31" selection-end-column="41" />
316 322
           <folding>
317 323
             <element signature="imports" expanded="true" />
318 324
           </folding>

+ 1
- 1
pom.xml Целия файл

@@ -27,7 +27,7 @@
27 27
     <dependency>
28 28
         <groupId>mysql</groupId>
29 29
         <artifactId>mysql-connector-java</artifactId>
30
-        <version>5.1.6</version>
30
+        <version>8.0.12</version>
31 31
     </dependency>
32 32
     </dependencies>
33 33