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

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

Revision: 14743
          http://crossfire.svn.sourceforge.net/crossfire/?rev=14743&view=rev
Author:   akirschbaum
Date:     2011-06-30 19:59:26 +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 19:53:19 UTC (rev 14742)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/CfMapUpdater.java	2011-06-30 19:59:26 UTC (rev 14743)
@@ -28,7 +28,6 @@
 import com.realtime.crossfire.jxclient.guistate.GuiStateManager;
 import com.realtime.crossfire.jxclient.map.CfMap;
 import com.realtime.crossfire.jxclient.server.crossfire.CrossfireServerConnection;
-import com.realtime.crossfire.jxclient.server.crossfire.CrossfireTickListener;
 import com.realtime.crossfire.jxclient.server.socket.ClientSocketState;
 import org.jetbrains.annotations.NotNull;
 
@@ -102,19 +101,6 @@
     };
 
     /**
-     * The listener for receiving "tick" commands.
-     */
-    @NotNull
-    private final CrossfireTickListener crossfireTickListener = new CrossfireTickListener() {
-
-        @Override
-        public void tick(final int tickNo) {
-            mapUpdaterState.tick(tickNo);
-        }
-
-    };
-
-    /**
      * Creates a new instance.
      * @param mapUpdaterState the map updater state to update
      * @param crossfireServerConnection the connection to monitor
@@ -126,7 +112,7 @@
         facesManager.addFacesManagerListener(facesManagerListener);
         crossfireServerConnection.setCrossfireUpdateMapListener(mapUpdaterState);
         guiStateManager.addGuiStateListener(guiStateListener);
-        crossfireServerConnection.addCrossfireTickListener(crossfireTickListener);
+        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 19:53:19 UTC (rev 14742)
+++ jxclient/trunk/src/jxclient/com/realtime/crossfire/jxclient/mapupdater/MapUpdaterState.java	2011-06-30 19:59:26 UTC (rev 14743)
@@ -30,6 +30,7 @@
 import com.realtime.crossfire.jxclient.map.CfMapAnimations;
 import com.realtime.crossfire.jxclient.map.CfMapSquare;
 import com.realtime.crossfire.jxclient.map.Location;
+import com.realtime.crossfire.jxclient.server.crossfire.CrossfireTickListener;
 import com.realtime.crossfire.jxclient.server.crossfire.CrossfireUpdateMapListener;
 import com.realtime.crossfire.jxclient.server.crossfire.MapSizeListener;
 import com.realtime.crossfire.jxclient.util.EventListenerList2;
@@ -49,7 +50,7 @@
  * applies to the whole map model {@link #map}.
  * @author Andreas Kirschbaum
  */
-public class MapUpdaterState implements CrossfireUpdateMapListener {
+public class MapUpdaterState implements CrossfireTickListener, CrossfireUpdateMapListener {
 
     /**
      * The object used for synchronization.


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