Przeglądaj źródła

Did what i could

Raymond Farria 8 lat temu
rodzic
commit
c8dd75d8e7
6 zmienionych plików z 353 dodań i 33 usunięć
  1. 9
    0
      .idea/ZCW-YeOldeCode.iml
  2. 8
    0
      .idea/modules.xml
  3. 6
    0
      .idea/vcs.xml
  4. 241
    0
      .idea/workspace.xml
  5. 33
    0
      AccountTest.java
  6. 56
    33
      package.bluej

+ 9
- 0
.idea/ZCW-YeOldeCode.iml Wyświetl plik

@@ -0,0 +1,9 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+    <exclude-output />
5
+    <content url="file://$MODULE_DIR$" />
6
+    <orderEntry type="inheritedJdk" />
7
+    <orderEntry type="sourceFolder" forTests="false" />
8
+  </component>
9
+</module>

+ 8
- 0
.idea/modules.xml Wyświetl plik

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/.idea/ZCW-YeOldeCode.iml" filepath="$PROJECT_DIR$/.idea/ZCW-YeOldeCode.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6
- 0
.idea/vcs.xml Wyświetl plik

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

+ 241
- 0
.idea/workspace.xml Wyświetl plik

@@ -0,0 +1,241 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="7030b16e-6aff-49bf-91f3-caf1a984c244" name="Default" comment="" />
5
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6
+    <option name="TRACKING_ENABLED" value="true" />
7
+    <option name="SHOW_DIALOG" value="false" />
8
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
9
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
10
+    <option name="LAST_RESOLUTION" value="IGNORE" />
11
+  </component>
12
+  <component name="Git.Settings">
13
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
14
+  </component>
15
+  <component name="GradleLocalSettings">
16
+    <option name="externalProjectsViewState">
17
+      <projects_view />
18
+    </option>
19
+  </component>
20
+  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
21
+  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
22
+  <component name="JsGulpfileManager">
23
+    <detection-done>true</detection-done>
24
+    <sorting>DEFINITION_ORDER</sorting>
25
+  </component>
26
+  <component name="ProjectFrameBounds">
27
+    <option name="y" value="60" />
28
+    <option name="width" value="1260" />
29
+    <option name="height" value="672" />
30
+  </component>
31
+  <component name="ProjectView">
32
+    <navigator currentView="ProjectPane" proportions="" version="1">
33
+      <flattenPackages />
34
+      <showMembers />
35
+      <showModules />
36
+      <showLibraryContents />
37
+      <hideEmptyPackages />
38
+      <abbreviatePackageNames />
39
+      <autoscrollToSource />
40
+      <autoscrollFromSource />
41
+      <sortByType />
42
+      <manualOrder />
43
+      <foldersAlwaysOnTop value="true" />
44
+    </navigator>
45
+    <panes>
46
+      <pane id="Scratches" />
47
+      <pane id="ProjectPane">
48
+        <subPane>
49
+          <expand>
50
+            <path>
51
+              <item name="ZCW-YeOldeCode" type="b2602c69:ProjectViewProjectNode" />
52
+              <item name="ZCW-YeOldeCode" type="462c0819:PsiDirectoryNode" />
53
+            </path>
54
+          </expand>
55
+          <select />
56
+        </subPane>
57
+      </pane>
58
+      <pane id="Scope" />
59
+      <pane id="PackagesPane" />
60
+      <pane id="AndroidView" />
61
+    </panes>
62
+  </component>
63
+  <component name="PropertiesComponent">
64
+    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
65
+    <property name="WebServerToolWindowFactoryState" value="false" />
66
+    <property name="aspect.path.notification.shown" value="true" />
67
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
68
+  </component>
69
+  <component name="RunDashboard">
70
+    <option name="ruleStates">
71
+      <list>
72
+        <RuleState>
73
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
74
+        </RuleState>
75
+        <RuleState>
76
+          <option name="name" value="StatusDashboardGroupingRule" />
77
+        </RuleState>
78
+      </list>
79
+    </option>
80
+  </component>
81
+  <component name="RunManager">
82
+    <configuration default="true" type="Applet" factoryName="Applet">
83
+      <option name="HTML_USED" value="false" />
84
+      <option name="WIDTH" value="400" />
85
+      <option name="HEIGHT" value="300" />
86
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
87
+      <module />
88
+    </configuration>
89
+    <configuration default="true" type="Application" factoryName="Application">
90
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
91
+      <option name="MAIN_CLASS_NAME" />
92
+      <option name="VM_PARAMETERS" />
93
+      <option name="PROGRAM_PARAMETERS" />
94
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
95
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
96
+      <option name="ALTERNATIVE_JRE_PATH" />
97
+      <option name="ENABLE_SWING_INSPECTOR" value="false" />
98
+      <option name="ENV_VARIABLES" />
99
+      <option name="PASS_PARENT_ENVS" value="true" />
100
+      <module name="" />
101
+      <envs />
102
+    </configuration>
103
+    <configuration default="true" type="JUnit" factoryName="JUnit">
104
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
105
+      <module name="" />
106
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
107
+      <option name="ALTERNATIVE_JRE_PATH" />
108
+      <option name="PACKAGE_NAME" />
109
+      <option name="MAIN_CLASS_NAME" />
110
+      <option name="METHOD_NAME" />
111
+      <option name="TEST_OBJECT" value="class" />
112
+      <option name="VM_PARAMETERS" value="-ea" />
113
+      <option name="PARAMETERS" />
114
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
115
+      <option name="ENV_VARIABLES" />
116
+      <option name="PASS_PARENT_ENVS" value="true" />
117
+      <option name="TEST_SEARCH_SCOPE">
118
+        <value defaultName="singleModule" />
119
+      </option>
120
+      <envs />
121
+      <patterns />
122
+    </configuration>
123
+    <configuration default="true" type="Remote" factoryName="Remote">
124
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
125
+      <option name="SERVER_MODE" value="false" />
126
+      <option name="SHMEM_ADDRESS" value="javadebug" />
127
+      <option name="HOST" value="localhost" />
128
+      <option name="PORT" value="5005" />
129
+    </configuration>
130
+    <configuration default="true" type="TestNG" factoryName="TestNG">
131
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
132
+      <module name="" />
133
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
134
+      <option name="ALTERNATIVE_JRE_PATH" />
135
+      <option name="SUITE_NAME" />
136
+      <option name="PACKAGE_NAME" />
137
+      <option name="MAIN_CLASS_NAME" />
138
+      <option name="METHOD_NAME" />
139
+      <option name="GROUP_NAME" />
140
+      <option name="TEST_OBJECT" value="CLASS" />
141
+      <option name="VM_PARAMETERS" value="-ea" />
142
+      <option name="PARAMETERS" />
143
+      <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
144
+      <option name="OUTPUT_DIRECTORY" />
145
+      <option name="ANNOTATION_TYPE" />
146
+      <option name="ENV_VARIABLES" />
147
+      <option name="PASS_PARENT_ENVS" value="true" />
148
+      <option name="TEST_SEARCH_SCOPE">
149
+        <value defaultName="singleModule" />
150
+      </option>
151
+      <option name="USE_DEFAULT_REPORTERS" value="false" />
152
+      <option name="PROPERTIES_FILE" />
153
+      <envs />
154
+      <properties />
155
+      <listeners />
156
+    </configuration>
157
+    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
158
+      <module name="" />
159
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
160
+      <option name="PROGRAM_PARAMETERS" />
161
+      <predefined_log_file id="idea.log" enabled="true" />
162
+    </configuration>
163
+  </component>
164
+  <component name="ShelveChangesManager" show_recycled="false">
165
+    <option name="remove_strategy" value="false" />
166
+  </component>
167
+  <component name="SvnConfiguration">
168
+    <configuration />
169
+  </component>
170
+  <component name="TaskManager">
171
+    <task active="true" id="Default" summary="Default task">
172
+      <changelist id="7030b16e-6aff-49bf-91f3-caf1a984c244" name="Default" comment="" />
173
+      <created>1530052918020</created>
174
+      <option name="number" value="Default" />
175
+      <option name="presentableId" value="Default" />
176
+      <updated>1530052918020</updated>
177
+      <workItem from="1530052919464" duration="11000" />
178
+    </task>
179
+    <servers />
180
+  </component>
181
+  <component name="TimeTrackingManager">
182
+    <option name="totallyTimeSpent" value="11000" />
183
+  </component>
184
+  <component name="ToolWindowManager">
185
+    <frame x="0" y="60" width="1260" height="672" extended-state="0" />
186
+    <layout>
187
+      <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" />
188
+      <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" />
189
+      <window_info id="Palette&#9;" 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" />
190
+      <window_info id="Image Layers" 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" />
191
+      <window_info id="Capture Analysis" 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" />
192
+      <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" />
193
+      <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" />
194
+      <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" />
195
+      <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" />
196
+      <window_info id="Terminal" 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" />
197
+      <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" />
198
+      <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" />
199
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24958949" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
200
+      <window_info id="Database" 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" />
201
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
202
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
203
+      <window_info id="UI 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" />
204
+      <window_info id="Theme Preview" 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" />
205
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
206
+      <window_info id="Favorites" 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="true" content_ui="tabs" />
207
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
208
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
209
+      <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
210
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
211
+      <window_info id="Find" 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" />
212
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
213
+    </layout>
214
+  </component>
215
+  <component name="TypeScriptGeneratedFilesManager">
216
+    <option name="version" value="1" />
217
+  </component>
218
+  <component name="VcsContentAnnotationSettings">
219
+    <option name="myLimit" value="2678400000" />
220
+  </component>
221
+  <component name="XDebuggerManager">
222
+    <breakpoint-manager />
223
+    <watches-manager />
224
+  </component>
225
+  <component name="masterDetails">
226
+    <states>
227
+      <state key="ProjectJDKs.UI">
228
+        <settings>
229
+          <last-edited>1.8</last-edited>
230
+          <splitter-proportions>
231
+            <option name="proportions">
232
+              <list>
233
+                <option value="0.2" />
234
+              </list>
235
+            </option>
236
+          </splitter-proportions>
237
+        </settings>
238
+      </state>
239
+    </states>
240
+  </component>
241
+</project>

+ 33
- 0
AccountTest.java Wyświetl plik

@@ -0,0 +1,33 @@
1
+
2
+
3
+import static org.junit.Assert.*;
4
+import org.junit.After;
5
+import org.junit.Before;
6
+import org.junit.Test;
7
+
8
+/**
9
+ * The test class AccountTest.
10
+ *
11
+ * @author  (your name)
12
+ * @version (a version number or a date)
13
+ */
14
+public class AccountTest
15
+{
16
+    Account account;
17
+    @Before
18
+    public void setUp(){
19
+        account = new Account();
20
+    }
21
+    
22
+    @Test
23
+    public void depositTest(){
24
+        account.deposit(10);
25
+        int expected = 10;
26
+        int actual = account.balance();
27
+        
28
+        assertEquals(expected, actual);
29
+       
30
+    }
31
+    
32
+    
33
+}

+ 56
- 33
package.bluej Wyświetl plik

@@ -1,26 +1,41 @@
1 1
 #BlueJ package file
2
-dependency1.from=Account
3
-dependency1.to=AccountException
2
+dependency1.from=Calendar1
3
+dependency1.to=CalendarGraphic
4 4
 dependency1.type=UsesDependency
5
-dependency2.from=DepositAccount
6
-dependency2.to=AccountException
5
+dependency2.from=Calendar1
6
+dependency2.to=DateException
7 7
 dependency2.type=UsesDependency
8
-editor.fx.0.height=722
9
-editor.fx.0.width=800
10
-editor.fx.0.x=114
11
-editor.fx.0.y=175
8
+dependency3.from=Account
9
+dependency3.to=AccountException
10
+dependency3.type=UsesDependency
11
+dependency4.from=Calendar
12
+dependency4.to=DateException
13
+dependency4.type=UsesDependency
14
+dependency5.from=Date
15
+dependency5.to=DateException
16
+dependency5.type=UsesDependency
17
+dependency6.from=DepositAccount
18
+dependency6.to=AccountException
19
+dependency6.type=UsesDependency
20
+dependency7.from=AccountTest
21
+dependency7.to=Account
22
+dependency7.type=UsesDependency
23
+editor.fx.0.height=0
24
+editor.fx.0.width=0
25
+editor.fx.0.x=0
26
+editor.fx.0.y=0
12 27
 objectbench.height=101
13 28
 objectbench.width=461
14 29
 package.divider.horizontal=0.6
15 30
 package.divider.vertical=0.8007380073800738
16 31
 package.editor.height=427
17 32
 package.editor.width=674
18
-package.editor.x=1006
19
-package.editor.y=133
33
+package.editor.x=480
34
+package.editor.y=132
20 35
 package.frame.height=600
21 36
 package.frame.width=800
22
-package.numDependencies=2
23
-package.numTargets=13
37
+package.numDependencies=7
38
+package.numTargets=14
24 39
 package.showExtends=true
25 40
 package.showUses=true
26 41
 project.charset=UTF-8
@@ -37,12 +52,12 @@ target1.width=130
37 52
 target1.x=450
38 53
 target1.y=190
39 54
 target10.height=50
40
-target10.name=Scrabble
55
+target10.name=DepositAccount
41 56
 target10.showInterface=false
42 57
 target10.type=ClassTarget
43
-target10.width=80
44
-target10.x=10
45
-target10.y=250
58
+target10.width=120
59
+target10.x=170
60
+target10.y=120
46 61
 target11.height=50
47 62
 target11.name=TriangleTwo
48 63
 target11.showInterface=false
@@ -58,26 +73,34 @@ target12.width=140
58 73
 target12.x=190
59 74
 target12.y=30
60 75
 target13.height=50
61
-target13.name=DateException
76
+target13.name=AccountTest
62 77
 target13.showInterface=false
63
-target13.type=ClassTarget
64
-target13.width=120
65
-target13.x=470
66
-target13.y=340
78
+target13.type=UnitTestTargetJunit4
79
+target13.width=80
80
+target13.x=80
81
+target13.y=80
82
+target14.height=50
83
+target14.name=DateException
84
+target14.showInterface=false
85
+target14.type=ClassTarget
86
+target14.width=120
87
+target14.x=470
88
+target14.y=340
67 89
 target2.height=50
68
-target2.name=Account
90
+target2.name=Calendar1
69 91
 target2.showInterface=false
70 92
 target2.type=ClassTarget
71
-target2.width=80
72
-target2.x=50
73
-target2.y=110
93
+target2.width=90
94
+target2.x=330
95
+target2.y=220
96
+target3.association=AccountTest
74 97
 target3.height=50
75
-target3.name=Calendar1
98
+target3.name=Account
76 99
 target3.showInterface=false
77 100
 target3.type=ClassTarget
78
-target3.width=90
79
-target3.x=330
80
-target3.y=220
101
+target3.width=80
102
+target3.x=50
103
+target3.y=110
81 104
 target4.height=50
82 105
 target4.name=Squares
83 106
 target4.showInterface=false
@@ -114,9 +137,9 @@ target8.width=80
114 137
 target8.x=350
115 138
 target8.y=290
116 139
 target9.height=50
117
-target9.name=DepositAccount
140
+target9.name=Scrabble
118 141
 target9.showInterface=false
119 142
 target9.type=ClassTarget
120
-target9.width=120
121
-target9.x=170
122
-target9.y=120
143
+target9.width=80
144
+target9.x=10
145
+target9.y=250