Arin Turpin 6 år sedan
förälder
incheckning
ef8e4ac916
3 ändrade filer med 14 tillägg och 13 borttagningar
  1. 4
    3
      TicketMachine.java
  2. 5
    5
      bluej.pkg
  3. 5
    5
      package.bluej

+ 4
- 3
TicketMachine.java Visa fil

@@ -46,9 +46,10 @@ public class TicketMachine
46 46
         
47 47
     }
48 48
     
49
-   // public int setSaving(int amount){
50
-   //     saving = this.price * TicketMachine.discount(amount);
51
-   // }
49
+   public int setSaving(int amount){
50
+        saving = this.price * (price - amount);
51
+        return saving;
52
+    }
52 53
     
53 54
    
54 55
    public TicketMachine(int price){

+ 5
- 5
bluej.pkg Visa fil

@@ -1,16 +1,16 @@
1 1
 #BlueJ package file
2
-editor.fx.0.height=0
3
-editor.fx.0.width=0
2
+editor.fx.0.height=702
3
+editor.fx.0.width=1280
4 4
 editor.fx.0.x=0
5
-editor.fx.0.y=0
5
+editor.fx.0.y=22
6 6
 objectbench.height=164
7 7
 objectbench.width=676
8 8
 package.divider.horizontal=0.6
9 9
 package.divider.vertical=0.6845018450184502
10 10
 package.editor.height=364
11 11
 package.editor.width=574
12
-package.editor.x=100
13
-package.editor.y=100
12
+package.editor.x=580
13
+package.editor.y=22
14 14
 package.frame.height=600
15 15
 package.frame.width=700
16 16
 package.numDependencies=0

+ 5
- 5
package.bluej Visa fil

@@ -1,16 +1,16 @@
1 1
 #BlueJ package file
2
-editor.fx.0.height=0
3
-editor.fx.0.width=0
2
+editor.fx.0.height=702
3
+editor.fx.0.width=1280
4 4
 editor.fx.0.x=0
5
-editor.fx.0.y=0
5
+editor.fx.0.y=22
6 6
 objectbench.height=164
7 7
 objectbench.width=676
8 8
 package.divider.horizontal=0.6
9 9
 package.divider.vertical=0.6845018450184502
10 10
 package.editor.height=364
11 11
 package.editor.width=574
12
-package.editor.x=100
13
-package.editor.y=100
12
+package.editor.x=580
13
+package.editor.y=22
14 14
 package.frame.height=600
15 15
 package.frame.width=700
16 16
 package.numDependencies=0