[give-challenge~svn:418] works with current version of map replayer

[akoller@kenai.com]

Project:    give-challenge
Repository: svn
Revision:   418
Author:     akoller
Date:       2010-07-02 16:00:39 UTC
Link:       

Log Message:
------------
works with current version of map replayer


Revisions:
----------
418


Modified Paths:
---------------
branches/replay/Code/give2-replay/src/main/java/give/replay/Main.java
branches/replay/Code/give2-replay/src/main/java/give/replay/WorldRenderer.java
branches/replay/Code/give2-replay/pom.xml


Diffs:
------
Index: branches/replay/Code/give2-replay/src/main/java/give/replay/Main.java
===================================================================
--- branches/replay/Code/give2-replay/src/main/java/give/replay/Main.java     
  (revision 417)
+++ branches/replay/Code/give2-replay/src/main/java/give/replay/Main.java     
  (revision 418)
@@ -15,6 +15,7 @@
 import com.jme.scene.state.WireframeState;
 import com.jme.scene.state.ZBufferState;
 import com.jme.system.DisplaySystem;
+import de.saar.penguin.give2.mapviewer.MapViewerFrame;
 import give.client.client3d.Client3DBase;
 import give.client.client3d.JmeUtil;
 import give.client.client3d.sceneobject.AlarmedTile;
@@ -48,7 +49,6 @@
 import give.mapreplay.DatabaseGameLogSource;
 import give.mapreplay.GameEventReplayer;
 import give.mapreplay.ReplayControlForm;
-import give.matchmaker.MatchmakerConfiguration;
 import give.world.World;
 import java.io.IOException;
 import java.sql.SQLException;
@@ -80,6 +80,14 @@
     private LightNode lightNode;
     private InvokeLaterThread lwjglThread;
 
+    private DatabaseGameLogSource source;
+    private GameEventReplayer replayer;
+    private MapViewerFrame mapViewerFrame;
+    private ReplayControlForm controlFrame;
+    private World world;
+    private World worldBackup;
+    private MessageHandlingThread handler;
+
     public static void main(String[] args) throws Exception {
         boolean tryToIntegrateWithMacOS = true;
 
@@ -104,21 +112,21 @@
             
System.setProperty("com.apple.mrj.application.apple.menu.about.name", "GIVE 
Map Replay");
         }
 
-        MatchmakerConfiguration config = new MatchmakerConfiguration(null);
-        config.readFromFile(configFile);
+//        MatchmakerConfiguration config = new MatchmakerConfiguration(null);
+//        config.readFromFile(configFile);
 
         InvokeLaterThread ilt = new InvokeLaterThread();
         ilt.start();
 
-        Main m = new Main(config, ilt);
+        Main m = new Main(configFile, ilt);
     }
 
-    public Main(MatchmakerConfiguration config, InvokeLaterThread 
gamethread) throws SQLException {
-        super(config);
-        this.config = config;
+    public Main(String configFile, InvokeLaterThread gamethread) throws 
SQLException {
+        super(configFile);
+
+
         this.lwjglThread = gamethread;
 
-        source = null;
         source = new 
DatabaseGameLogSource(config.getDb().getDatabaseConnection());
         replayer = new GameEventReplayer();
         mapViewerFrame = null;
@@ -409,6 +417,7 @@
         }
     }
 
+    /*
     @Override
     public void closeMap() {
         if (mapViewerFrame != null) {
@@ -416,19 +425,15 @@
             handler.interrupt();
             mapViewerFrame.setVisible(false);
 
-            mapViewerFrame =
-                    null;
-            mapViewer =
-                    null;
-            notificationPlugin =
-                    null;
-            textPlugin =
-                    null;
-            handler =
-                    null;
+            mapViewerFrame = null;
+            mapViewer = null;
+            notificationPlugin = null;
+            textPlugin = null;
+            handler = null;
         }
-
     }
+     *
+     */
 
     private void displayError(String error) {
         System.err.println("*** ERROR: " + error + " ***");
Index: 
branches/replay/Code/give2-replay/src/main/java/give/replay/WorldRenderer.java
===================================================================
--- 
branches/replay/Code/give2-replay/src/main/java/give/replay/WorldRenderer.java
      (revision 417)
+++ 
branches/replay/Code/give2-replay/src/main/java/give/replay/WorldRenderer.java
      (revision 418)
@@ -7,19 +7,18 @@
  * @author Steven
  */
 public class WorldRenderer implements Runnable {
-
-    private World world;
+    final private World world;
     private Main main;
 
-    public WorldRenderer(World w, Main m)
-    {
+    public WorldRenderer(World w, Main m) {
         world = w;
         main = m;
     }
 
     public void run() {
-        System.err.println("in WorldRenderer run(): main.renderAt(" + 
world.getPlayerPosition() + ", " + world.getPlayerOrientation());
-        main.renderAt(world.getPlayerPosition(), 
world.getPlayerOrientation());
+        synchronized (world) {
+            System.err.println("in WorldRenderer run(): main.renderAt(" + 
world.getPlayerPosition() + ", " + world.getPlayerOrientation());
+            main.renderAt(world.getPlayerPosition(), 
world.getPlayerOrientation());
+        }
     }
-
 }
Index: branches/replay/Code/give2-replay/pom.xml
===================================================================
--- branches/replay/Code/give2-replay/pom.xml   (revision 417)
+++ branches/replay/Code/give2-replay/pom.xml   (revision 418)
@@ -19,7 +19,7 @@
                <dependency>
             <groupId>de.saar.penguin</groupId>
             <artifactId>give2-map-replay</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.2-SNAPSHOT</version>
         </dependency>
     </dependencies>