[#75] Refresh field on highlight change via listener

yarcat · Jan 31, 2013 · 1ff7ed0 · 1ff7ed0
1 parent eac3224
commit 1ff7ed0
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/Lib/src/com/yarcat/chemistrylines/view/FieldHightlights.java b/Lib/src/com/yarcat/chemistrylines/view/FieldHightlights.java
@@ -16,8 +16,13 @@ public enum Mark {
     }
     // @formatter:on
 
+    public interface Listener {
+        public void onHighlightChange();
+    }
+
     final ArrayList<EnumSet<Mark>> mMarks;
     final Field mField;
+    private Listener mListener;
 
     private FieldHightlights(Field f, ArrayList<EnumSet<Mark>> m) {
         mField = f;
@@ -33,11 +38,11 @@ public static FieldHightlights create(Field f) {
         return new FieldHightlights(f, m);
     }
 
-    public void setMark(int n, Mark m) {
+    private void setMark(int n, Mark m) {
         mMarks.get(n).add(m);
     }
 
-    public void clearMark(int n, Mark m) {
+    private void clearMark(int n, Mark m) {
         mMarks.get(n).remove(m);
     }
 
@@ -49,22 +54,26 @@ public boolean hasMark(int n, Mark m) {
     public void onNewSource(int n) {
         setMark(n, Mark.SOURCE);
         markCellsReachableFrom(n);
+        onChange();
     }
 
     @Override
     public void onNewTarget(int n) {
         setMark(n, Mark.TARGET);
+        onChange();
     }
 
     @Override
     public void onSourceCleared(int n) {
         clearMark(n, Mark.SOURCE);
         clearCellsReachableFrom(n);
+        onChange();
     }
 
     @Override
     public void onTargetCleared(int n) {
         clearMark(n, Mark.TARGET);
+        onChange();
     }
 
     private void markCellsReachableFrom(int n) {
@@ -83,4 +92,14 @@ private void clearCellsReachableFrom(int n) {
             clearMark(i, Mark.REACHABLE);
         }
     }
+
+    private void onChange() {
+       if (mListener != null) {
+           mListener.onHighlightChange();
+       }
+    }
+
+    public void setListener(Listener l) {
+        mListener = l;
+    }
 }
diff --git a/Swing/src/com/yarcat/chemistrylines/swing/SwingChemistryLines.java b/Swing/src/com/yarcat/chemistrylines/swing/SwingChemistryLines.java
@@ -29,7 +29,7 @@ public SwingChemistryLines(GameLogic game, SwingField fieldUI,
     }
 
     void refresh() {
-        refreshField();
+        mFieldUI.refresh();
         mPreviewUI.refresh();
         if (mCleanerUI != null) {
             mCleanerUI.refresh();
@@ -42,10 +42,6 @@ private void refreshScore() {
         mScoreUI.append(mGame.getScorer().get());
     }
 
-    private void refreshField() {
-        mFieldUI.refresh();
-    }
-
     @Override
     public void mouseClicked(MouseEvent e) {
     }
@@ -59,7 +55,6 @@ public void mouseEntered(MouseEvent e) {
             } else {
                 selection().select(b.n);
             }
-            refreshField();
         }
     }
 
@@ -76,8 +71,6 @@ public void mousePressed(MouseEvent e) {
         } else {
             selection().select(b.n);
         }
-        // TODO: refresh field via selection listener
-        refreshField();
     }
 
     @Override
@@ -104,7 +97,6 @@ private void tryMakeMove() {
             } catch (InvalidMove e1) {
             }
             selection().clear();
-            refreshField();
         }
     }
 

diff --git a/Swing/src/com/yarcat/chemistrylines/swing/SwingField.java b/Swing/src/com/yarcat/chemistrylines/swing/SwingField.java
@@ -9,10 +9,10 @@
 import com.yarcat.chemistrylines.field.Field;
 import com.yarcat.chemistrylines.game.GameLogic;
 import com.yarcat.chemistrylines.view.FieldHightlights;
-import com.yarcat.chemistrylines.view.SelectionInView;
 import com.yarcat.chemistrylines.view.FieldHightlights.Mark;
+import com.yarcat.chemistrylines.view.SelectionInView;
 
-class SwingField {
+class SwingField implements FieldHightlights.Listener {
     @SuppressWarnings("serial")
     class FieldButton extends ElementButton {
         public final int n;
@@ -76,6 +76,7 @@ public SwingField(GameLogic game, FieldButton[] buttons) {
         mButtons = buttons;
         mSel = new SelectionInView();
         mFieldMarks = FieldHightlights.create(mGame.getField());
+        mFieldMarks.setListener(this);
         mSel.setListener(mFieldMarks);
     }
 
@@ -108,4 +109,9 @@ public void clear(int n) {
     FieldButton newButton(int n) {
         return new FieldButton(n);
     }
+
+    @Override
+    public void onHighlightChange() {
+        refresh();
+    }
 }