Leon 6 лет назад
Родитель
Сommit
f0b16e89e7
3 измененных файлов: 54 добавлений и 3 удалений
  1. 6
    0
      .gitignore
  2. 6
    0
      .idea/vcs.xml
  3. 42
    3
      .idea/workspace.xml

+ 6
- 0
.gitignore Просмотреть файл

@@ -0,0 +1,6 @@
1
+/target/
2
+.DS_Store
3
+.classpath
4
+#.project
5
+.settings
6
+*.iml

+ 6
- 0
.idea/vcs.xml Просмотреть файл

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
5
+  </component>
6
+</project>

+ 42
- 3
.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="bd173a31-0f51-40e5-8a39-e42f2083e0e0" name="Default" comment="" />
4
+    <list default="true" id="bd173a31-0f51-40e5-8a39-e42f2083e0e0" name="Default" comment="">
5
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
6
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
7
+    </list>
5 8
     <ignored path="$PROJECT_DIR$/target/" />
6 9
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7 10
     <option name="TRACKING_ENABLED" value="true" />
@@ -11,16 +14,41 @@
11 14
     <option name="LAST_RESOLUTION" value="IGNORE" />
12 15
   </component>
13 16
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
17
+  <component name="FileEditorManager">
18
+    <leaf>
19
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
20
+        <entry file="file://$PROJECT_DIR$/.gitignore">
21
+          <provider selected="true" editor-type-id="text-editor">
22
+            <state relative-caret-position="75">
23
+              <caret line="5" column="5" lean-forward="true" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
24
+              <folding />
25
+            </state>
26
+          </provider>
27
+        </entry>
28
+      </file>
29
+    </leaf>
30
+  </component>
31
+  <component name="Git.Settings">
32
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
33
+  </component>
14 34
   <component name="GradleLocalSettings">
15 35
     <option name="externalProjectsViewState">
16 36
       <projects_view />
17 37
     </option>
18 38
   </component>
39
+  <component name="IdeDocumentHistory">
40
+    <option name="CHANGED_PATHS">
41
+      <list>
42
+        <option value="$PROJECT_DIR$/.gitignore" />
43
+      </list>
44
+    </option>
45
+  </component>
19 46
   <component name="ProjectFrameBounds">
20 47
     <option name="y" value="23" />
21 48
     <option name="width" value="1440" />
22 49
     <option name="height" value="873" />
23 50
   </component>
51
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
24 52
   <component name="ProjectView">
25 53
     <navigator currentView="ProjectPane" proportions="" version="1">
26 54
       <flattenPackages />
@@ -264,6 +292,7 @@
264 292
   </component>
265 293
   <component name="ToolWindowManager">
266 294
     <frame x="0" y="23" width="1440" height="873" extended-state="6" />
295
+    <editor active="true" />
267 296
     <layout>
268 297
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
269 298
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -274,9 +303,9 @@
274 303
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
275 304
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
276 305
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
277
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
306
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
278 307
       <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
279
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3290653" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
308
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3290653" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
280 309
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
281 310
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
282 311
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -301,4 +330,14 @@
301 330
     <breakpoint-manager />
302 331
     <watches-manager />
303 332
   </component>
333
+  <component name="editorHistoryManager">
334
+    <entry file="file://$PROJECT_DIR$/.gitignore">
335
+      <provider selected="true" editor-type-id="text-editor">
336
+        <state relative-caret-position="75">
337
+          <caret line="5" column="5" lean-forward="true" selection-start-line="5" selection-start-column="5" selection-end-line="5" selection-end-column="5" />
338
+          <folding />
339
+        </state>
340
+      </provider>
341
+    </entry>
342
+  </component>
304 343
 </project>