mpierse пре 7 година
родитељ
комит
0f891b7c8f
2 измењених фајлова са 99 додато и 184 уклоњено
  1. 48
    48
      .idea/dataSources/40b547e2-1649-4fd2-8ce9-1d6c33f41447.xml
  2. 51
    136
      .idea/workspace.xml

+ 48
- 48
.idea/dataSources/40b547e2-1649-4fd2-8ce9-1d6c33f41447.xml
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 51
- 136
.idea/workspace.xml Прегледај датотеку

@@ -1,7 +1,10 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="8a472df0-6928-458d-8f54-50f83b9be8d4" name="Default Changelist" comment="" />
4
+    <list default="true" id="8a472df0-6928-458d-8f54-50f83b9be8d4" name="Default Changelist" comment="">
5
+      <change beforePath="$PROJECT_DIR$/.idea/dataSources/40b547e2-1649-4fd2-8ce9-1d6c33f41447.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/40b547e2-1649-4fd2-8ce9-1d6c33f41447.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
7
+    </list>
5 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6 9
     <option name="SHOW_DIALOG" value="false" />
7 10
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,30 +27,6 @@
24 27
         <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
25 28
         <item name="@localhost [2]" type="feb32156:DbDataSourceImpl" />
26 29
       </path>
27
-      <path>
28
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
29
-        <item name="@localhost [2]" type="feb32156:DbDataSourceImpl" />
30
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
31
-      </path>
32
-      <path>
33
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
34
-        <item name="@localhost [2]" type="feb32156:DbDataSourceImpl" />
35
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
36
-        <item name="new_pokemon: schema" type="c314c289:MysqlImplModel$Schema" />
37
-      </path>
38
-      <path>
39
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
40
-        <item name="@localhost [2]" type="feb32156:DbDataSourceImpl" />
41
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
42
-        <item name="pokemon: schema" type="c314c289:MysqlImplModel$Schema" />
43
-      </path>
44
-      <path>
45
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
46
-        <item name="@localhost [2]" type="feb32156:DbDataSourceImpl" />
47
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
48
-        <item name="pokemon: schema" type="c314c289:MysqlImplModel$Schema" />
49
-        <item name="types: table" type="98d5ac3d:MysqlImplModel$Table" />
50
-      </path>
51 30
     </expand>
52 31
     <select />
53 32
   </component>
@@ -60,8 +39,10 @@
60 39
     <session id="-1761479715">
61 40
       <usages-collector id="statistics.lifecycle.project">
62 41
         <counts>
42
+          <entry key="project.closed" value="1" />
63 43
           <entry key="project.open.time.0" value="1" />
64
-          <entry key="project.opened" value="1" />
44
+          <entry key="project.open.time.10" value="1" />
45
+          <entry key="project.opened" value="2" />
65 46
         </counts>
66 47
       </usages-collector>
67 48
       <usages-collector id="statistics.file.extensions.open">
@@ -82,12 +63,12 @@
82 63
       </usages-collector>
83 64
       <usages-collector id="statistics.file.extensions.edit">
84 65
         <counts>
85
-          <entry key="sql" value="1666" />
66
+          <entry key="sql" value="1701" />
86 67
         </counts>
87 68
       </usages-collector>
88 69
       <usages-collector id="statistics.file.types.edit">
89 70
         <counts>
90
-          <entry key="Scratch" value="1666" />
71
+          <entry key="Scratch" value="1701" />
91 72
         </counts>
92 73
       </usages-collector>
93 74
       <usages-collector id="statistics.spring.boot.mvc.usages" />
@@ -97,48 +78,12 @@
97 78
     </session>
98 79
   </component>
99 80
   <component name="FileEditorManager">
100
-    <leaf>
81
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
101 82
       <file pinned="false" current-in-tab="true">
102 83
         <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/console.sql">
103 84
           <provider selected="true" editor-type-id="text-editor">
104
-            <state relative-caret-position="143">
105
-              <caret line="73" column="24" lean-forward="true" selection-start-line="73" selection-start-column="24" selection-end-line="73" selection-end-column="24" />
106
-            </state>
107
-          </provider>
108
-        </entry>
109
-      </file>
110
-      <file pinned="false" current-in-tab="false">
111
-        <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/types">
112
-          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
113
-            <state>
114
-              <filtering enabled="true" />
115
-            </state>
116
-          </provider>
117
-        </entry>
118
-      </file>
119
-      <file pinned="false" current-in-tab="false">
120
-        <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/pokemon_trainer">
121
-          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
122
-            <state>
123
-              <filtering enabled="true" />
124
-            </state>
125
-          </provider>
126
-        </entry>
127
-      </file>
128
-      <file pinned="false" current-in-tab="false">
129
-        <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/trainers">
130
-          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
131
-            <state>
132
-              <filtering enabled="true" />
133
-            </state>
134
-          </provider>
135
-        </entry>
136
-      </file>
137
-      <file pinned="false" current-in-tab="false">
138
-        <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/pokemons">
139
-          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
140
-            <state>
141
-              <filtering enabled="true" />
85
+            <state relative-caret-position="253">
86
+              <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
142 87
             </state>
143 88
           </provider>
144 89
         </entry>
@@ -146,7 +91,7 @@
146 91
       <file pinned="false" current-in-tab="false">
147 92
         <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/pokemon_sql/pokemon_trainers.sql">
148 93
           <provider selected="true" editor-type-id="text-editor">
149
-            <state relative-caret-position="-177530">
94
+            <state relative-caret-position="45">
150 95
               <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
151 96
             </state>
152 97
           </provider>
@@ -184,16 +129,17 @@
184 129
     <sorting>DEFINITION_ORDER</sorting>
185 130
   </component>
186 131
   <component name="ProjectFrameBounds">
187
-    <option name="x" value="8" />
188
-    <option name="y" value="23" />
189
-    <option name="width" value="1424" />
190
-    <option name="height" value="807" />
132
+    <option name="x" value="-132" />
133
+    <option name="y" value="-1030" />
134
+    <option name="width" value="1729" />
135
+    <option name="height" value="868" />
191 136
   </component>
192 137
   <component name="ProjectView">
193 138
     <navigator proportions="" version="1">
194 139
       <foldersAlwaysOnTop value="true" />
195 140
     </navigator>
196 141
     <panes>
142
+      <pane id="PackagesPane" />
197 143
       <pane id="Scope" />
198 144
       <pane id="ProjectPane">
199 145
         <subPane>
@@ -222,25 +168,17 @@
222 168
               <item name="Database Consoles" type="d62648e6:ScratchProjectViewPane$MyRootNode" />
223 169
               <item name="40b547e2-1649-4fd2-8ce9-1d6c33f41447" type="1e004dc1:ScratchProjectViewPane$MyRootNode$1$1" />
224 170
             </path>
225
-            <path>
226
-              <item name="PokemonSqlLab" type="b2602c69:ProjectViewProjectNode" />
227
-              <item name="Scratches and Consoles" type="1a2a3e82:ScratchProjectViewPane$MyProjectNode" />
228
-              <item name="Database Consoles" type="d62648e6:ScratchProjectViewPane$MyRootNode" />
229
-              <item name="40b547e2-1649-4fd2-8ce9-1d6c33f41447" type="1e004dc1:ScratchProjectViewPane$MyRootNode$1$1" />
230
-              <item name="pokemon_sql" type="1e004dc1:ScratchProjectViewPane$MyRootNode$1$1" />
231
-            </path>
232 171
           </expand>
233 172
           <select />
234 173
         </subPane>
235 174
       </pane>
236
-      <pane id="PackagesPane" />
237 175
     </panes>
238 176
   </component>
239 177
   <component name="PropertiesComponent">
240 178
     <property name="DatabaseDriversLRU" value="sqlserver&#10;mysql" />
241 179
     <property name="WebServerToolWindowFactoryState" value="false" />
242 180
     <property name="aspect.path.notification.shown" value="true" />
243
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541905065732" />
181
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541905102768" />
244 182
     <property name="database.console.LAST_STATE" value="true" />
245 183
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
246 184
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
@@ -277,29 +215,25 @@
277 215
       <option name="number" value="Default" />
278 216
       <option name="presentableId" value="Default" />
279 217
       <updated>1541866577745</updated>
280
-      <workItem from="1541866579173" duration="19023000" />
218
+      <workItem from="1541866579173" duration="19757000" />
219
+      <workItem from="1541954568976" duration="980000" />
281 220
     </task>
282 221
     <servers />
283 222
   </component>
284 223
   <component name="TimeTrackingManager">
285
-    <option name="totallyTimeSpent" value="19023000" />
224
+    <option name="totallyTimeSpent" value="20737000" />
286 225
   </component>
287 226
   <component name="ToolWindowManager">
288
-    <frame x="8" y="23" width="1424" height="807" extended-state="0" />
227
+    <frame x="-132" y="-1030" width="1729" height="868" extended-state="0" />
289 228
     <editor active="true" />
290 229
     <layout>
291
-      <window_info id="Image Layers" />
292
-      <window_info id="Designer" />
293
-      <window_info id="UI Designer" />
294
-      <window_info id="Capture Tool" />
295
-      <window_info id="Favorites" side_tool="true" />
296
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.12011577" />
230
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.099585064" />
297 231
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
298
-      <window_info anchor="bottom" id="Database Changes" weight="0.32867134" />
299
-      <window_info anchor="bottom" id="Version Control" weight="0.32867134" />
300
-      <window_info active="true" anchor="bottom" id="Database Console" visible="true" weight="0.53286713" />
301
-      <window_info anchor="bottom" id="Terminal" weight="0.32867134" />
302
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
232
+      <window_info id="Image Layers" order="2" />
233
+      <window_info id="Designer" order="3" />
234
+      <window_info id="UI Designer" order="4" />
235
+      <window_info id="Capture Tool" order="5" />
236
+      <window_info id="Favorites" order="6" side_tool="true" />
303 237
       <window_info anchor="bottom" id="Message" order="0" />
304 238
       <window_info anchor="bottom" id="Find" order="1" />
305 239
       <window_info anchor="bottom" id="Run" order="2" weight="0.32867134" />
@@ -307,15 +241,20 @@
307 241
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
308 242
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
309 243
       <window_info anchor="bottom" id="TODO" order="6" />
310
-      <window_info anchor="right" id="Palette" />
311
-      <window_info anchor="right" id="Theme Preview" />
312
-      <window_info anchor="right" id="Capture Analysis" />
313
-      <window_info anchor="right" id="Palette&#9;" />
314
-      <window_info anchor="right" id="Database" visible="true" weight="0.24167873" />
315
-      <window_info anchor="right" id="Maven Projects" />
244
+      <window_info active="true" anchor="bottom" id="Database Console" order="7" visible="true" weight="0.5322165" />
245
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.32867134" />
246
+      <window_info anchor="bottom" id="Database Changes" order="9" weight="0.32867134" />
247
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.32867134" />
248
+      <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
316 249
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
317 250
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
318 251
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
252
+      <window_info anchor="right" id="Palette" order="3" />
253
+      <window_info anchor="right" id="Capture Analysis" order="4" />
254
+      <window_info anchor="right" id="Theme Preview" order="5" />
255
+      <window_info anchor="right" id="Palette&#9;" order="6" />
256
+      <window_info anchor="right" id="Database" order="7" visible="true" weight="0.19798459" />
257
+      <window_info anchor="right" id="Maven Projects" order="8" />
319 258
     </layout>
320 259
   </component>
321 260
   <component name="TypeScriptGeneratedFilesManager">
@@ -342,52 +281,28 @@
342 281
         </state>
343 282
       </provider>
344 283
     </entry>
345
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/pokemon_sql/pokemon_types.sql">
284
+    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/pokemons" />
285
+    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/pokemon_trainer" />
286
+    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/trainers" />
287
+    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/types" />
288
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/console.sql">
346 289
       <provider selected="true" editor-type-id="text-editor">
347
-        <state relative-caret-position="15">
348
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
290
+        <state relative-caret-position="253">
291
+          <caret line="80" lean-forward="true" selection-start-line="80" selection-end-line="80" />
349 292
         </state>
350 293
       </provider>
351 294
     </entry>
352 295
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/pokemon_sql/pokemon_trainers.sql">
353 296
       <provider selected="true" editor-type-id="text-editor">
354
-        <state relative-caret-position="-177530">
297
+        <state relative-caret-position="45">
355 298
           <caret line="3" column="4" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="4" />
356 299
         </state>
357 300
       </provider>
358 301
     </entry>
359
-    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/pokemons">
360
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
361
-        <state>
362
-          <filtering enabled="true" />
363
-        </state>
364
-      </provider>
365
-    </entry>
366
-    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/pokemon_trainer">
367
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
368
-        <state>
369
-          <filtering enabled="true" />
370
-        </state>
371
-      </provider>
372
-    </entry>
373
-    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/trainers">
374
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
375
-        <state>
376
-          <filtering enabled="true" />
377
-        </state>
378
-      </provider>
379
-    </entry>
380
-    <entry file="das://40b547e2-1649-4fd2-8ce9-1d6c33f41447/schema/pokemon/table/types">
381
-      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
382
-        <state>
383
-          <filtering enabled="true" />
384
-        </state>
385
-      </provider>
386
-    </entry>
387
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/console.sql">
302
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/40b547e2-1649-4fd2-8ce9-1d6c33f41447/pokemon_sql/pokemon_types.sql">
388 303
       <provider selected="true" editor-type-id="text-editor">
389
-        <state relative-caret-position="143">
390
-          <caret line="73" column="24" lean-forward="true" selection-start-line="73" selection-start-column="24" selection-end-line="73" selection-end-column="24" />
304
+        <state relative-caret-position="15">
305
+          <caret line="1" selection-start-line="1" selection-end-line="1" />
391 306
         </state>
392 307
       </provider>
393 308
     </entry>