[Gridarta-commit] SF.net SVN: gridarta: [1204] trunk

[<aki...@us...>]

Revision: 1204
          http://svn.sourceforge.net/gridarta/?rev=1204&view=rev
Author:   akirschbaum
Date:     2006-12-22 11:53:34 -0800 (Fri, 22 Dec 2006)

Log Message:
-----------
Properly update connection view when the current map changes.

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/cfeditor/CMapArchPanel.java
    trunk/crossfire/src/cfeditor/map/MapControl.java
    trunk/daimonin/src/daieditor/CMapArchPanel.java
    trunk/daimonin/src/daieditor/map/MapControl.java
    trunk/src/app/net/sf/gridarta/gui/ConnectionView.java
    trunk/src/app/net/sf/gridarta/map/MapControl.java

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/crossfire/ChangeLog	2006-12-22 19:53:34 UTC (rev 1204)
@@ -1,5 +1,7 @@
 2006-12-22  Andreas Kirschbaum
 
+	* Properly update connection view when the current map changes.
+
 	* Remove support for loading maps with invalid width/height
 	specifications.
 

Modified: trunk/crossfire/src/cfeditor/CMapArchPanel.java
===================================================================
--- trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/crossfire/src/cfeditor/CMapArchPanel.java	2006-12-22 19:53:34 UTC (rev 1204)
@@ -230,6 +230,8 @@
         updateFont(true);
 
         document = archEdit.getDocument();
+
+        mainControl.addMainControlListener(connectionView);
     }
 
     /**

Modified: trunk/crossfire/src/cfeditor/map/MapControl.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapControl.java	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/crossfire/src/cfeditor/map/MapControl.java	2006-12-22 19:53:34 UTC (rev 1204)
@@ -304,10 +304,7 @@
         return mapFile;
     }
 
-    /**
-     * Returns model (= map data of this level).
-     * @return model (= map data of this level)
-     */
+    /** {@inheritDoc} */
     public MapModel getMapModel() {
         return mapModel;
     }

Modified: trunk/daimonin/src/daieditor/CMapArchPanel.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/daimonin/src/daieditor/CMapArchPanel.java	2006-12-22 19:53:34 UTC (rev 1204)
@@ -250,6 +250,8 @@
         updateFont(true);
 
         document = archEdit.getDocument();
+
+        mainControl.addMainControlListener(connectionView);
     }
 
     /** {@inheritDoc} */

Modified: trunk/daimonin/src/daieditor/map/MapControl.java
===================================================================
--- trunk/daimonin/src/daieditor/map/MapControl.java	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/daimonin/src/daieditor/map/MapControl.java	2006-12-22 19:53:34 UTC (rev 1204)
@@ -383,10 +383,7 @@
         return mapFile;
     }
 
-    /**
-     * Returns model (= map data of this level).
-     * @return model (= map data of this level)
-     */
+    /** {@inheritDoc} */
     public MapModel getMapModel() {
         return mapModel;
     }

Modified: trunk/src/app/net/sf/gridarta/gui/ConnectionView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/ConnectionView.java	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/src/app/net/sf/gridarta/gui/ConnectionView.java	2006-12-22 19:53:34 UTC (rev 1204)
@@ -29,12 +29,15 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import net.sf.gridarta.MainControlListener;
 import net.sf.gridarta.gameobject.GameObject;
 import net.sf.gridarta.map.MapArchObject;
+import net.sf.gridarta.map.MapControl;
 import net.sf.gridarta.map.MapModel;
 import net.sf.gridarta.map.MapModelEvent;
 import net.sf.gridarta.map.MapModelListener;
 import net.sf.gridarta.map.MapSquare;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A Panel that holds information about the connections of the selected arch on the selected map.
@@ -46,7 +49,7 @@
  * @todo attach
  * @serial exclude
  */
-public final class ConnectionView extends JPanel implements MapModelListener {
+public final class ConnectionView extends JPanel implements MainControlListener, MapModelListener {
 
     /** The conections. */
     private final Map<Integer, List<GameObject>> connections = new TreeMap<Integer, List<GameObject>>();
@@ -75,6 +78,11 @@
         scanMapForConnections(e.getMapModel());
     }
 
+    /** {@inheritDoc} */
+    public void currentMapChanged(@Nullable final MapControl mapControl) {
+        scanMapForConnections(mapControl.getMapModel());
+    }
+
     /**
      * Scans a map for the contained connections.
      * @param model Model of map to scan

Modified: trunk/src/app/net/sf/gridarta/map/MapControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/map/MapControl.java	2006-12-22 19:43:29 UTC (rev 1203)
+++ trunk/src/app/net/sf/gridarta/map/MapControl.java	2006-12-22 19:53:34 UTC (rev 1204)
@@ -3,6 +3,7 @@
 /**
  * Currently nothing more than a marker interface for unification.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author Andreas Kirschbaum
  */
 public interface MapControl {
 
@@ -12,4 +13,10 @@
      */
     boolean isPickmap();
 
+    /**
+     * Returns model (= map data of this level).
+     * @return model (= map data of this level)
+     */
+    MapModel getMapModel();
+
 } // interface MapControl


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