Thread: [Gridarta-commit] SF.net SVN: gridarta: [3753] trunk (Page 53)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3753
          http://gridarta.svn.sourceforge.net/gridarta/?rev=3753&view=rev
Author:   akirschbaum
Date:     2008-03-28 01:11:43 -0700 (Fri, 28 Mar 2008)

Log Message:
-----------
Make map event generation work reliably; document the event ordering.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainView.java
    trunk/daimonin/src/daieditor/CMainView.java
    trunk/src/app/net/sf/gridarta/DefaultMapManager.java
    trunk/src/app/net/sf/gridarta/MapManager.java
    trunk/src/app/net/sf/gridarta/MapManagerListener.java

Modified: trunk/crossfire/src/cfeditor/CMainView.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainView.java	2008-03-27 21:31:17 UTC (rev 3752)
+++ trunk/crossfire/src/cfeditor/CMainView.java	2008-03-28 08:11:43 UTC (rev 3753)
@@ -267,11 +267,11 @@
     public void addLevelView(final MapView<GameObject, MapArchObject, Archetype, MapControl, CMapViewBasic> mapView) {
         assert !mapViews.contains(mapView);
         mapViews.add(0, mapView);
-        generateCurrentMapViewChangedEvent();
         mapView.addInternalFrameListener(this);
         mapDesktop.add(mapView);
+        mapManager.fireMapViewCreatedEvent(mapView);
+        setCurrentLevelView(mapView);
         mapView.setVisible(true);
-        setCurrentLevelView(mapView);
         mapView.setBounds(0, 0, mapDesktop.getWidth(), mapDesktop.getHeight());
         refreshMenus();
     }
@@ -286,6 +286,7 @@
         mapView.removeInternalFrameListener(this);
         mapViews.remove(mapView);
         generateCurrentMapViewChangedEvent();
+        mapManager.fireMapViewClosingEvent(mapView);
         mapDesktop.remove(mapView);
         // This is important: Removing a JInternalFrame from a JDesktopPane doesn't deselect it.
         // Thus it will still be referenced. To prevent a closed map from being referenced by Swing,

Modified: trunk/daimonin/src/daieditor/CMainView.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainView.java	2008-03-27 21:31:17 UTC (rev 3752)
+++ trunk/daimonin/src/daieditor/CMainView.java	2008-03-28 08:11:43 UTC (rev 3753)
@@ -271,11 +271,11 @@
     public void addLevelView(final MapView<GameObject, MapArchObject, Archetype, MapControl, CMapViewBasic> mapView) {
         assert !mapViews.contains(mapView);
         mapViews.add(0, mapView);
-        generateCurrentMapViewChangedEvent();
         mapView.addInternalFrameListener(this);
         mapDesktop.add(mapView);
+        mapManager.fireMapViewCreatedEvent(mapView);
+        setCurrentLevelView(mapView);
         mapView.setVisible(true);
-        setCurrentLevelView(mapView);
         mapView.setBounds(0, 0, mapDesktop.getWidth(), mapDesktop.getHeight());
         try {
             mapView.setMaximum(true);
@@ -295,6 +295,7 @@
         mapView.removeInternalFrameListener(this);
         mapViews.remove(mapView);
         generateCurrentMapViewChangedEvent();
+        mapManager.fireMapViewClosingEvent(mapView);
         mapDesktop.remove(mapView);
         // This is important: Removing a JInternalFrame from a JDesktopPane doesn't deselect it.
         // Thus it will still be referenced. To prevent a closed map from being referenced by Swing,

Modified: trunk/src/app/net/sf/gridarta/DefaultMapManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/DefaultMapManager.java	2008-03-27 21:31:17 UTC (rev 3752)
+++ trunk/src/app/net/sf/gridarta/DefaultMapManager.java	2008-03-28 08:11:43 UTC (rev 3753)
@@ -109,7 +109,6 @@
         if (mapControl.nViews() <= 1) {
             closeLevel(mapControl);
         } else {
-            fireMapViewClosingEvent(mapView);
             mainControl.getMainView().removeLevelView(mapView);
             mapControl.closeView(mapView);
         }
@@ -165,7 +164,6 @@
         } else {
             while (mapControl.nViews() > 0) {
                 final MapView<G, A, R, C, V> mapView = mapControl.getMapViewFrame();
-                fireMapViewClosingEvent(mapView);
                 mainControl.getMainView().removeLevelView(mapView);
                 mapControl.closeView(mapView);
             }
@@ -312,8 +310,6 @@
     public MapView<G, A, R, C, V> mapCreateView(@NotNull final C mapControl, @Nullable final Point viewPosition) {
         final MapView<G, A, R, C, V> mapView = mapControl.createView(viewPosition);
         mainControl.getMainView().addLevelView(mapView);
-        fireMapViewCreatedEvent(mapView);
-        mainControl.getMainView().setCurrentLevelView(mapView);
         return mapView;
     }
 
@@ -383,12 +379,8 @@
         }
     }
 
-    /**
-     * Notify all listeners about a created map view.
-     *
-     * @param mapView the created map view
-     */
-    private void fireMapViewCreatedEvent(@NotNull final MapView<G, A, R, C, V> mapView) {
+    /** {@inheritDoc} */
+    public void fireMapViewCreatedEvent(@NotNull final MapView<G, A, R, C, V> mapView) {
         for (final MapManagerListener<G, A, R, C, V> listener : listenerList.getListeners(MapManagerListener.class)) {
             listener.mapViewCreated(mapView);
         }
@@ -404,11 +396,8 @@
         }
     }
 
-    /**
-     * Notify all listeners about a map view to be closed.
-     * @param mapView map view that's being closed
-     */
-    private void fireMapViewClosingEvent(@NotNull final MapView<G, A, R, C, V> mapView) {
+    /** {@inheritDoc} */
+    public void fireMapViewClosingEvent(@NotNull final MapView<G, A, R, C, V> mapView) {
         for (final MapManagerListener<G, A, R, C, V> listener : listenerList.getListeners(MapManagerListener.class)) {
             listener.mapViewClosing(mapView);
         }

Modified: trunk/src/app/net/sf/gridarta/MapManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MapManager.java	2008-03-27 21:31:17 UTC (rev 3752)
+++ trunk/src/app/net/sf/gridarta/MapManager.java	2008-03-28 08:11:43 UTC (rev 3753)
@@ -187,6 +187,19 @@
     void fireCurrentMapViewChangedEvent(@Nullable MapView<G, A, R, C, V> currentMapView);
 
     /**
+     * Notify all listeners about a map view to be closed.
+     * @param mapView map view that's being closed
+     */
+    void fireMapViewClosingEvent(@NotNull MapView<G, A, R, C, V> mapView);
+
+    /**
+     * Notify all listeners about a created map view.
+     *
+     * @param mapView the created map view
+     */
+    void fireMapViewCreatedEvent(@NotNull MapView<G, A, R, C, V> mapView);
+
+    /**
      * Refreshes all map view of the active map. Does nothing if no map is opened.
      */
     void refreshCurrentMap();

Modified: trunk/src/app/net/sf/gridarta/MapManagerListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/MapManagerListener.java	2008-03-27 21:31:17 UTC (rev 3752)
+++ trunk/src/app/net/sf/gridarta/MapManagerListener.java	2008-03-28 08:11:43 UTC (rev 3753)
@@ -30,8 +30,18 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Interface for listeners listening to {@link MapManager} changes.
- *
+ * Interface for listeners listening to {@link MapManager} changes. The
+ * following events are created (in roughly the given order):
+ * <ul>
+ * <li>{@link #mapCreated(MapControl)} - after a map has been created or opened
+ * <li>{@link #currentMapChanged(MapControl)} - the newly created map now is
+ * the current map
+ * <li>{@link #mapViewCreated(MapView)} - after a map view has been created
+ * <li>{@link #currentMapViewChanged(MapView)} - the new map view now is the
+ * current map view
+ * <li>{@link #mapViewClosing(MapView)} - the map view has been closed
+ * <li>{@link #mapClosing(MapControl)} - the map has been closed
+ * </ul>
  * @author Andreas Kirschbaum
  */
 public interface MapManagerListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>, C extends MapControl<G, A, R>, V extends MapViewBasic<G, A, R>> extends EventListener {


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




Thread: [Gridarta-commit] SF.net SVN: gridarta: [3753] trunk (Page 53)

gridarta-commit