trying to get clearing stars to work

assignments/a3/src/main/java/Controls.java

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

assignments/a3/src/main/java/Gallery.java

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

assignments/a3/src/main/java/Model.java

@@ -42,6 +42,11 @@ public class Model extends Observable implements Serializable
     return grid;
   }
   
+  public int getFilter()
+  {
+    return filter;
+  }
+  
   public void changeFilter(int x)
   {
     this.filter = x;