shakila 8 years ago
parent
commit
0f1d00c7c8
2 changed files with 9 additions and 7 deletions
  1. 3
    1
      Inventory.java
  2. 6
    6
      package.bluej

+ 3
- 1
Inventory.java View File

12
         if (items[i].getName().equals("Conjured")){
12
         if (items[i].getName().equals("Conjured")){
13
             items[i].setQuality(items[i].getQuality() *2);
13
             items[i].setQuality(items[i].getQuality() *2);
14
         }
14
         }
15
+
15
         if (!items[i].getName().equals("Aged Brie") && !items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
16
         if (!items[i].getName().equals("Aged Brie") && !items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
16
             if (items[i].getQuality() > 0 && items[i].getQuality() < 50) {  
17
             if (items[i].getQuality() > 0 && items[i].getQuality() < 50) {  
17
                 items[i].setQuality(items[i].getQuality() - 1);
18
                 items[i].setQuality(items[i].getQuality() - 1);
25
         }
26
         }
26
 
27
 
27
         if (items[i].getSellIn() < 0 && !items[i].getName().equals("Aged Brie")) {
28
         if (items[i].getSellIn() < 0 && !items[i].getName().equals("Aged Brie")) {
28
-                items[i].setQuality(items[i].getQuality() - 1); 
29
+            items[i].setQuality(items[i].getQuality() - 1); 
29
         }
30
         }
31
+
30
         if (items[i].getName().equals("Aged Brie") && items[i].getQuality() < 50 && items[i].getSellIn() < 0 ){
32
         if (items[i].getName().equals("Aged Brie") && items[i].getQuality() < 50 && items[i].getSellIn() < 0 ){
31
             items[i].setQuality(items[i].getQuality() + 1);
33
             items[i].setQuality(items[i].getQuality() + 1);
32
 
34
 

+ 6
- 6
package.bluej View File

5
 dependency2.from=InventoryTest
5
 dependency2.from=InventoryTest
6
 dependency2.to=Inventory
6
 dependency2.to=Inventory
7
 dependency2.type=UsesDependency
7
 dependency2.type=UsesDependency
8
-editor.fx.0.height=722
9
-editor.fx.0.width=800
10
-editor.fx.0.x=320
11
-editor.fx.0.y=50
8
+editor.fx.0.height=716
9
+editor.fx.0.width=1181
10
+editor.fx.0.x=40
11
+editor.fx.0.y=23
12
 objectbench.height=164
12
 objectbench.height=164
13
-objectbench.width=776
13
+objectbench.width=461
14
 package.divider.horizontal=0.6
14
 package.divider.horizontal=0.6
15
 package.divider.vertical=0.6845018450184502
15
 package.divider.vertical=0.6845018450184502
16
 package.editor.height=364
16
 package.editor.height=364
17
 package.editor.width=674
17
 package.editor.width=674
18
-package.editor.x=577
18
+package.editor.x=480
19
 package.editor.y=61
19
 package.editor.y=61
20
 package.frame.height=600
20
 package.frame.height=600
21
 package.frame.width=800
21
 package.frame.width=800