Kr Younger 6 年 前
コミット
1d082be354
共有2 個のファイルを変更した141 個の追加11 個の削除を含む
  1. 106
    0
      .gitignore
  2. 35
    11
      .idea/workspace.xml

+ 106
- 0
.gitignore ファイルの表示

@@ -0,0 +1,106 @@
1
+.metadata
2
+bin/
3
+tmp/
4
+*.tmp
5
+*.bak
6
+*.swp
7
+*~.nib
8
+local.properties
9
+.settings/
10
+.loadpath
11
+.recommenders
12
+
13
+# External tool builders
14
+.externalToolBuilders/
15
+
16
+# Locally stored "Eclipse launch configurations"
17
+*.launch
18
+
19
+# PyDev specific (Python IDE for Eclipse)
20
+*.pydevproject
21
+
22
+# CDT-specific (C/C++ Development Tooling)
23
+.cproject
24
+
25
+# Java annotation processor (APT)
26
+.factorypath
27
+
28
+# PDT-specific (PHP Development Tools)
29
+.buildpath
30
+
31
+# sbteclipse plugin
32
+.target
33
+
34
+# Tern plugin
35
+.tern-project
36
+
37
+# TeXlipse plugin
38
+.texlipse
39
+
40
+# STS (Spring Tool Suite)
41
+.springBeans
42
+
43
+# Code Recommenders
44
+.recommenders/
45
+
46
+# Scala IDE specific (Scala & Java development for Eclipse)
47
+.cache-main
48
+.scala_dependencies
49
+.worksheet
50
+
51
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
52
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
53
+
54
+# User-specific stuff:
55
+.idea/**
56
+.idea/**/tasks.xml
57
+.idea/dictionaries
58
+
59
+# Sensitive or high-churn files:
60
+.idea/**/dataSources/
61
+.idea/**/dataSources.ids
62
+.idea/**/dataSources.xml
63
+.idea/**/dataSources.local.xml
64
+.idea/**/sqlDataSources.xml
65
+.idea/**/dynamic.xml
66
+.idea/**/uiDesigner.xml
67
+
68
+# Gradle:
69
+.idea/**/gradle.xml
70
+.idea/**/libraries
71
+.idea/*
72
+*.iml
73
+
74
+# CMake
75
+cmake-build-debug/
76
+
77
+# Mongo Explorer plugin:
78
+.idea/**/mongoSettings.xml
79
+
80
+## File-based project format:
81
+*.iws
82
+
83
+## Plugin-specific files:
84
+
85
+# IntelliJ
86
+/out/
87
+
88
+# mpeltonen/sbt-idea plugin
89
+.idea_modules/
90
+
91
+# JIRA plugin
92
+atlassian-ide-plugin.xml
93
+
94
+# Cursive Clojure plugin
95
+.idea/replstate.xml
96
+
97
+# Crashlytics plugin (for Android Studio and IntelliJ)
98
+com_crashlytics_export_strings.xml
99
+crashlytics.properties
100
+crashlytics-build.properties
101
+fabric.properties
102
+target/*
103
+
104
+.project
105
+.classpath
106
+.settings

+ 35
- 11
.idea/workspace.xml ファイルの表示

@@ -1,10 +1,7 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4
-    <list default="true" id="ff0f55eb-552a-45f4-8a74-866e22f63e9a" name="Default" comment="">
5
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
6
-      <change beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
7
-    </list>
4
+    <list default="true" id="ff0f55eb-552a-45f4-8a74-866e22f63e9a" name="Default" comment="" />
8 5
     <ignored path="$PROJECT_DIR$/out/" />
9 6
     <ignored path="$PROJECT_DIR$/target/" />
10 7
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -39,12 +36,12 @@
39 36
           </provider>
40 37
         </entry>
41 38
       </file>
42
-      <file leaf-file-name="README.md" pinned="false" current-in-tab="true">
39
+      <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
43 40
         <entry file="file://$PROJECT_DIR$/README.md">
44 41
           <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
45 42
             <state split_layout="SPLIT">
46
-              <first_editor relative-caret-position="102">
47
-                <caret line="6" column="39" lean-forward="false" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
43
+              <first_editor relative-caret-position="272">
44
+                <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
48 45
                 <folding />
49 46
               </first_editor>
50 47
               <second_editor />
@@ -52,6 +49,16 @@
52 49
           </provider>
53 50
         </entry>
54 51
       </file>
52
+      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
53
+        <entry file="file://$PROJECT_DIR$/.gitignore">
54
+          <provider selected="true" editor-type-id="text-editor">
55
+            <state relative-caret-position="510">
56
+              <caret line="106" column="0" lean-forward="true" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" />
57
+              <folding />
58
+            </state>
59
+          </provider>
60
+        </entry>
61
+      </file>
55 62
       <file leaf-file-name="Question1Test.java" pinned="false" current-in-tab="false">
56 63
         <entry file="file://$PROJECT_DIR$/src/test/java/Question1Test.java">
57 64
           <provider selected="true" editor-type-id="text-editor">
@@ -92,6 +99,7 @@
92 99
         <option value="$PROJECT_DIR$/src/test/java/Question1Test.java" />
93 100
         <option value="$PROJECT_DIR$/src/main/java/Question1.java" />
94 101
         <option value="$PROJECT_DIR$/README.md" />
102
+        <option value="$PROJECT_DIR$/.gitignore" />
95 103
       </list>
96 104
     </option>
97 105
   </component>
@@ -319,7 +327,7 @@
319 327
       <option name="number" value="Default" />
320 328
       <option name="presentableId" value="Default" />
321 329
       <updated>1541012263419</updated>
322
-      <workItem from="1541012264832" duration="4887000" />
330
+      <workItem from="1541012264832" duration="5000000" />
323 331
     </task>
324 332
     <servers />
325 333
   </component>
@@ -356,7 +364,7 @@
356 364
     </history-entry>
357 365
   </component>
358 366
   <component name="TimeTrackingManager">
359
-    <option name="totallyTimeSpent" value="4887000" />
367
+    <option name="totallyTimeSpent" value="5000000" />
360 368
   </component>
361 369
   <component name="ToolWindowManager">
362 370
     <frame x="0" y="23" width="1674" height="971" extended-state="6" />
@@ -429,17 +437,33 @@
429 437
         </state>
430 438
       </provider>
431 439
     </entry>
440
+    <entry file="file://$PROJECT_DIR$/../CashMachine/src/main/java/rocks/zipcode/atm/CashMachineApp.java">
441
+      <provider selected="true" editor-type-id="text-editor">
442
+        <state relative-caret-position="0">
443
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
444
+          <folding />
445
+        </state>
446
+      </provider>
447
+    </entry>
432 448
     <entry file="file://$PROJECT_DIR$/README.md">
433 449
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
434 450
         <state split_layout="SPLIT">
435
-          <first_editor relative-caret-position="102">
436
-            <caret line="6" column="39" lean-forward="false" selection-start-line="6" selection-start-column="39" selection-end-line="6" selection-end-column="39" />
451
+          <first_editor relative-caret-position="272">
452
+            <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
437 453
             <folding />
438 454
           </first_editor>
439 455
           <second_editor />
440 456
         </state>
441 457
       </provider>
442 458
     </entry>
459
+    <entry file="file://$PROJECT_DIR$/.gitignore">
460
+      <provider selected="true" editor-type-id="text-editor">
461
+        <state relative-caret-position="510">
462
+          <caret line="106" column="0" lean-forward="true" selection-start-line="106" selection-start-column="0" selection-end-line="106" selection-end-column="0" />
463
+          <folding />
464
+        </state>
465
+      </provider>
466
+    </entry>
443 467
   </component>
444 468
   <component name="masterDetails">
445 469
     <states>