Jamez-s 6 years ago
parent
commit
3be92541df
3 changed files with 53 additions and 31 deletions
  1. 1
    1
      TicketMachine.java
  2. 26
    15
      bluej.pkg
  3. 26
    15
      package.bluej

+ 1
- 1
TicketMachine.java View File

@@ -2,7 +2,7 @@
2 2
  * TicketMachine models a naive ticket machine that issues
3 3
  * flat-fare tickets.
4 4
  * The price of a ticket is specified via the constructor.
5
- * It is a naive machine in the sense that it trusts its users
5
+ * It is a naive machine  in the sense that it trusts its users
6 6
  * to insert enough money before trying to print a ticket.
7 7
  * It also assumes that users enter sensible amounts.
8 8
  *

+ 26
- 15
bluej.pkg View File

@@ -1,20 +1,23 @@
1 1
 #BlueJ package file
2
+dependency1.from=TicketMachineTest
3
+dependency1.to=TicketMachine
4
+dependency1.type=UsesDependency
2 5
 editor.fx.0.height=722
3
-editor.fx.0.width=800
4
-editor.fx.0.x=709
5
-editor.fx.0.y=113
6
+editor.fx.0.width=664
7
+editor.fx.0.x=102
8
+editor.fx.0.y=58
6 9
 objectbench.height=101
7
-objectbench.width=461
10
+objectbench.width=776
8 11
 package.divider.horizontal=0.6
9
-package.divider.vertical=0.8007380073800738
10
-package.editor.height=427
12
+package.divider.vertical=0.7906976744186046
13
+package.editor.height=401
11 14
 package.editor.width=674
12
-package.editor.x=1067
13
-package.editor.y=119
14
-package.frame.height=600
15
+package.editor.x=30
16
+package.editor.y=191
17
+package.frame.height=574
15 18
 package.frame.width=800
16
-package.numDependencies=0
17
-package.numTargets=1
19
+package.numDependencies=1
20
+package.numTargets=2
18 21
 package.showExtends=true
19 22
 package.showUses=true
20 23
 project.charset=UTF-8
@@ -24,9 +27,17 @@ readme.width=47
24 27
 readme.x=10
25 28
 readme.y=10
26 29
 target1.height=50
27
-target1.name=TicketMachine
30
+target1.name=TicketMachineTest
28 31
 target1.showInterface=false
29
-target1.type=ClassTarget
32
+target1.type=UnitTestTargetJunit4
30 33
 target1.width=120
31
-target1.x=80
32
-target1.y=50
34
+target1.x=110
35
+target1.y=20
36
+target2.association=TicketMachineTest
37
+target2.height=50
38
+target2.name=TicketMachine
39
+target2.showInterface=false
40
+target2.type=ClassTarget
41
+target2.width=120
42
+target2.x=80
43
+target2.y=50

+ 26
- 15
package.bluej View File

@@ -1,20 +1,23 @@
1 1
 #BlueJ package file
2
+dependency1.from=TicketMachineTest
3
+dependency1.to=TicketMachine
4
+dependency1.type=UsesDependency
2 5
 editor.fx.0.height=722
3
-editor.fx.0.width=800
4
-editor.fx.0.x=709
5
-editor.fx.0.y=113
6
+editor.fx.0.width=664
7
+editor.fx.0.x=102
8
+editor.fx.0.y=58
6 9
 objectbench.height=101
7
-objectbench.width=461
10
+objectbench.width=776
8 11
 package.divider.horizontal=0.6
9
-package.divider.vertical=0.8007380073800738
10
-package.editor.height=427
12
+package.divider.vertical=0.7906976744186046
13
+package.editor.height=401
11 14
 package.editor.width=674
12
-package.editor.x=1067
13
-package.editor.y=119
14
-package.frame.height=600
15
+package.editor.x=30
16
+package.editor.y=191
17
+package.frame.height=574
15 18
 package.frame.width=800
16
-package.numDependencies=0
17
-package.numTargets=1
19
+package.numDependencies=1
20
+package.numTargets=2
18 21
 package.showExtends=true
19 22
 package.showUses=true
20 23
 project.charset=UTF-8
@@ -24,9 +27,17 @@ readme.width=47
24 27
 readme.x=10
25 28
 readme.y=10
26 29
 target1.height=50
27
-target1.name=TicketMachine
30
+target1.name=TicketMachineTest
28 31
 target1.showInterface=false
29
-target1.type=ClassTarget
32
+target1.type=UnitTestTargetJunit4
30 33
 target1.width=120
31
-target1.x=80
32
-target1.y=50
34
+target1.x=110
35
+target1.y=20
36
+target2.association=TicketMachineTest
37
+target2.height=50
38
+target2.name=TicketMachine
39
+target2.showInterface=false
40
+target2.type=ClassTarget
41
+target2.width=120
42
+target2.x=80
43
+target2.y=50