[Crossfire-cvs] SF.net SVN: crossfire:[14745] jxclient/trunk/src/jxclient/com/realtime/ crossfire/jxclient/mapupdater

[Crossfire C. r. messages. <cro...@li...>]

Revision: 14745
          http://crossfire.svn.sourceforge.net/crossfire/?rev=14745&view=rev
Author:   akirschbaum
Date:     2011-06-30 20:04:46 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
Simplify CfMapUpdater.

Modified Paths:
--------------
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java
    jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapUpdaterState.java

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java	2011-06-30 20:00:51 UTC (rev 14744)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java	2011-06-30 20:04:46 UTC (rev 14745)
@@ -21,9 +21,7 @@
 
 package com.realtime.crossfire.jxclient.mapupdater;
 
-import com.realtime.crossfire.jxclient.faces.Face;
 import com.realtime.crossfire.jxclient.faces.FacesManager;
-import com.realtime.crossfire.jxclient.faces.FacesManagerListener;
 import com.realtime.crossfire.jxclient.guistate.GuiStateListener;
 import com.realtime.crossfire.jxclient.guistate.GuiStateManager;
 import com.realtime.crossfire.jxclient.map.CfMap;
@@ -44,19 +42,6 @@
     private final MapUpdaterState mapUpdaterState;
 
     /**
-     * The listener to detect updated faces.
-     */
-    @NotNull
-    private final FacesManagerListener facesManagerListener = new FacesManagerListener() {
-
-        @Override
-        public void faceUpdated(@NotNull final Face face) {
-            mapUpdaterState.faceUpdated(face.getFaceNum());
-        }
-
-    };
-
-    /**
      * The {@link GuiStateListener} for detecting established or dropped
      * connections.
      */
@@ -109,7 +94,7 @@
      */
     public CfMapUpdater(@NotNull final MapUpdaterState mapUpdaterState, @NotNull final CrossfireServerConnection crossfireServerConnection, @NotNull final FacesManager facesManager, @NotNull final GuiStateManager guiStateManager) {
         this.mapUpdaterState = mapUpdaterState;
-        facesManager.addFacesManagerListener(facesManagerListener);
+        facesManager.addFacesManagerListener(mapUpdaterState);
         crossfireServerConnection.setCrossfireUpdateMapListener(mapUpdaterState);
         guiStateManager.addGuiStateListener(guiStateListener);
         crossfireServerConnection.addCrossfireTickListener(mapUpdaterState);

Modified: jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapUpdaterState.java
===================================================================
--- jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapUpdaterState.java	2011-06-30 20:00:51 UTC (rev 14744)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapUpdaterState.java	2011-06-30 20:04:46 UTC (rev 14745)
@@ -25,6 +25,7 @@
 import com.realtime.crossfire.jxclient.animations.Animations;
 import com.realtime.crossfire.jxclient.faces.Face;
 import com.realtime.crossfire.jxclient.faces.FacesManager;
+import com.realtime.crossfire.jxclient.faces.FacesManagerListener;
 import com.realtime.crossfire.jxclient.guistate.GuiStateManager;
 import com.realtime.crossfire.jxclient.map.CfMap;
 import com.realtime.crossfire.jxclient.map.CfMapAnimations;
@@ -50,7 +51,7 @@
  * applies to the whole map model {@link #map}.
  * @author Andreas Kirschbaum
  */
-public class MapUpdaterState implements CrossfireTickListener, CrossfireUpdateMapListener {
+public class MapUpdaterState implements CrossfireTickListener, CrossfireUpdateMapListener, FacesManagerListener {
 
     /**
      * The object used for synchronization.
@@ -399,15 +400,15 @@
 
     /**
      * Processes an updated face image.
-     * @param faceNum the face that has changed
+     * @param face the face that has changed
      */
-    public void faceUpdated(final int faceNum) {
+    public void faceUpdated(@NotNull final Face face) {
         synchronized (sync) {
             mapBegin();
 
             //noinspection NestedSynchronizedStatement,SynchronizeOnNonFinalField
             synchronized (map) {
-                map.updateFace(faceNum, mapWidth, mapHeight);
+                map.updateFace(face.getFaceNum(), mapWidth, mapHeight);
             }
 
             mapEnd(false);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.