Shivam Patel 8 лет назад
Родитель
Сommit
8166ecfb8b
2 измененных файлов: 23 добавлений и 21 удалений
  1. 19
    17
      Inventory.java
  2. 4
    4
      package.bluej

+ 19
- 17
Inventory.java Просмотреть файл

@@ -9,31 +9,33 @@ public class Inventory {
9 9
 
10 10
     public void updateQuality() {
11 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
-                    }
12
+            if (items[i].getName().equals("Aged Brie")) {
13
+                if(items[i].getQuality() < 50){
14
+                    items[i].setQuality(items[i].getQuality() + 1);
17 15
                 }
18
-            } else {
19
-                if (items[i].getQuality() < 50) {
16
+                if(items[i].getSellIn() < 0 && items[i].getQuality() < 50){
20 17
                     items[i].setQuality(items[i].getQuality() + 1);
21 18
                 }
22 19
             }
20
+            else if(items[i].getName().equals("Sulfuras, Hand of Ragnaros")){
21
+                items[i].setQuality(items[i].getQuality());
23 22
 
24
-            if (!items[i].getName().equals("Sulfuras, Hand of Ragnaros")) {
25
-                items[i].setSellIn(items[i].getSellIn() - 1);
26 23
             }
24
+            else {
25
+                if(items[i].getSellIn() > 0 && items[i].getQuality() > 0 ){
26
+                    items[i].setQuality(items[i].getQuality() -1);
27 27
 
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 28
                 }
29
+                else if(items[i].getSellIn() <= 0 && items[i].getQuality() > 0 ) {
30
+                    items[i].setQuality(items[i].getQuality() - 2);
31
+                }
32
+            }
33
+            if(items[i].getQuality() < 80){
34
+                items[i].setSellIn(items[i].getSellIn() - 1);
35
+
36 36
             }
37
+
37 38
         }
38
-}
39
+
40
+    }
39 41
 }

+ 4
- 4
package.bluej Просмотреть файл

@@ -41,13 +41,13 @@ target2.name=InventoryTest
41 41
 target2.showInterface=false
42 42
 target2.type=UnitTestTargetJunit4
43 43
 target2.width=80
44
-target2.x=40
45
-target2.y=160
44
+target2.x=340
45
+target2.y=140
46 46
 target3.association=InventoryTest
47 47
 target3.height=50
48 48
 target3.name=Inventory
49 49
 target3.showInterface=false
50 50
 target3.type=ClassTarget
51 51
 target3.width=80
52
-target3.x=10
53
-target3.y=190
52
+target3.x=310
53
+target3.y=170