Explorar o código

missed the copy paste for 2-4 on both sets of stars

tarfeef101 %!s(int64=6) %!d(string=hai) anos
pai
achega
eaf621a651

+ 6 - 6
assignments/a3/src/main/java/Controls.java

@@ -68,9 +68,9 @@ public class Controls extends JPanel implements Observer, Serializable
           model.changeFilter(1);
         }
       }
-      else if (e.getSource() == star2 || model.getFilter() == 2)
+      else if (e.getSource() == star2)
       {
-        if (!(star2.isSelected()))
+        if (!(star2.isSelected()) || model.getFilter() == 2)
         {
           star1.setSelected(false);
           star2.setSelected(false);
@@ -99,9 +99,9 @@ public class Controls extends JPanel implements Observer, Serializable
           model.changeFilter(2);
         }
       }
-      else if (e.getSource() == star3 || model.getFilter() == 3)
+      else if (e.getSource() == star3)
       {
-        if (!(star3.isSelected()))
+        if (!(star3.isSelected()) || model.getFilter() == 3)
         {
           star1.setSelected(false);
           star2.setSelected(false);
@@ -130,9 +130,9 @@ public class Controls extends JPanel implements Observer, Serializable
           model.changeFilter(3);
         }
       }
-      else if (e.getSource() == star4 || model.getFilter() == 4)
+      else if (e.getSource() == star4)
       {
-        if (!(star4.isSelected()))
+        if (!(star4.isSelected()) || model.getFilter() == 4)
         {
           star1.setSelected(false);
           star2.setSelected(false);

+ 6 - 6
assignments/a3/src/main/java/Gallery.java

@@ -155,9 +155,9 @@ class Item extends JPanel implements Serializable
           data.setRating(1);
         }
       }
-      else if (e.getSource() == star2 || data.getRating() == 2)
+      else if (e.getSource() == star2)
       {
-        if (!(star2.isSelected()))
+        if (!(star2.isSelected()) || data.getRating() == 2)
         {
           star1.setSelected(false);
           star2.setSelected(false);
@@ -186,9 +186,9 @@ class Item extends JPanel implements Serializable
           data.setRating(2);
         }
       }
-      else if (e.getSource() == star3 || data.getRating() == 3)
+      else if (e.getSource() == star3)
       {
-        if (!(star3.isSelected()))
+        if (!(star3.isSelected()) || data.getRating() == 3)
         {
           star1.setSelected(false);
           star2.setSelected(false);
@@ -217,9 +217,9 @@ class Item extends JPanel implements Serializable
           data.setRating(3);
         }
       }
-      else if (e.getSource() == star4 || data.getRating() == 4)
+      else if (e.getSource() == star4)
       {
-        if (!(star4.isSelected()))
+        if (!(star4.isSelected()) || data.getRating() == 4)
         {
           star1.setSelected(false);
           star2.setSelected(false);