David Thornley пре 8 година
родитељ
комит
6484ee14c5
2 измењених фајлова са 32 додато и 27 уклоњено
  1. 27
    22
      Inventory.java
  2. 5
    5
      package.bluej

+ 27
- 22
Inventory.java Прегледај датотеку

9
 
9
 
10
     public void updateQuality() {
10
     public void updateQuality() {
11
         for (int i = 0; i < items.length; i++) {
11
         for (int i = 0; i < items.length; i++) {
12
-            if (!items[i].getName().equals("Aged Brie")) {
13
-                if (items[i].getQuality() > 0) {
14
-                    if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
15
-                        items[i].setQuality(items[i].getQuality() - 1);
16
-                    }
17
-                }
18
-            } else {
19
-                if (items[i].getQuality() < 50) {
20
-                    items[i].setQuality(items[i].getQuality() + 1);
21
-                }
22
-            }
12
+            //handles Sulfuras
13
+            if(items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
14
+                continue;}
23
 
15
 
24
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
16
+            if(items[i].getName().equals("Aged Brie")){
17
+                agedBrieUpdate(i);
18
+            } else{regularItemUpdate(i);}
19
+         
20
+            if (items[i].getQuality() < 80) {
25
                 items[i].setSellIn(items[i].getSellIn() - 1);
21
                 items[i].setSellIn(items[i].getSellIn() - 1);
26
             }
22
             }
27
 
23
 
28
-            if (items[i].getSellIn() < 0) {
29
-                if (!items[i].getName().equals("Aged Brie")) {
30
-                  items[i].setQuality(items[i].getQuality() - 1);
31
-                } else {
32
-                    if (items[i].getQuality() < 50) {
33
-                        items[i].setQuality(items[i].getQuality() + 1);
34
-                    }
35
-                }
36
-            }
37
         }
24
         }
25
+    }
26
+
27
+    public void agedBrieUpdate(int i){
28
+        if(items[i].getSellIn() > 0 && items[i].getQuality() <= 49){
29
+            items[i].setQuality(items[i].getQuality() + 1);
30
+        } else if(items[i].getSellIn() < 0 && items[i].getQuality() <= 48){
31
+            items[i].setQuality(items[i].getQuality() + 2);
32
+        } 
33
+    }
34
+
35
+    public void regularItemUpdate(int i){
36
+        if(items[i].getSellIn() > 0 && items[i].getQuality() > 0){
37
+            items[i].setQuality(items[i].getQuality() - 1);
38
+        } else if(items[i].getSellIn() < 0 && items[i].getQuality() > 1){
39
+            items[i].setQuality(items[i].getQuality() - 2);
40
+        } 
41
+    }
38
 }
42
 }
39
-}
43
+
44
+

+ 5
- 5
package.bluej Прегледај датотеку

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=1080
9
+editor.fx.0.width=1920
10
+editor.fx.0.x=-335
11
+editor.fx.0.y=-1080
12
 objectbench.height=164
12
 objectbench.height=164
13
 objectbench.width=776
13
 objectbench.width=776
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