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

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

Revision: 4866
          http://gridarta.svn.sourceforge.net/gridarta/?rev=4866&view=rev
Author:   akirschbaum
Date:     2008-08-15 21:09:37 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
Remove dependency MapUserListener -> CMapViewBasic.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
    trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
    trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java

Modified: trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java	2008-08-15 21:06:04 UTC (rev 4865)
+++ trunk/crossfire/src/cfeditor/gui/map/CMapViewBasic.java	2008-08-15 21:09:37 UTC (rev 4866)
@@ -134,7 +134,7 @@
 
         mapModel.addMapModelListener(mapModelListener);
 
-        mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, toolPalette);
+        mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(renderer, toolPalette);
         renderer.addMouseListener(mapUserListener);
         renderer.addMouseMotionListener(mapUserListener);
         renderer.setErroneousMapSquares(erroneousMapSquares);

Modified: trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java	2008-08-15 21:06:04 UTC (rev 4865)
+++ trunk/daimonin/src/daieditor/gui/map/CMapViewBasic.java	2008-08-15 21:09:37 UTC (rev 4866)
@@ -138,7 +138,7 @@
 
         mapModel.addMapModelListener(mapModelListener);
 
-        mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(this, toolPalette);
+        mapUserListener = new MapUserListener<GameObject, MapArchObject, Archetype, CMapViewBasic>(renderer, toolPalette);
         renderer.addMouseListener(mapUserListener);
         renderer.addMouseMotionListener(mapUserListener);
         renderer.setErroneousMapSquares(erroneousMapSquares);

Modified: trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java	2008-08-15 21:06:04 UTC (rev 4865)
+++ trunk/src/app/net/sf/gridarta/gui/map/MapUserListener.java	2008-08-15 21:09:37 UTC (rev 4866)
@@ -48,9 +48,9 @@
     /*XXX:@NotNull*/
     private MouseOpEvent<G, A, R, V> mouseOpEvent = null;
 
-    public MapUserListener(final V mapViewBasic, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
+    public MapUserListener(final LevelRenderer renderer, @NotNull final ToolPalette<G, A, R, V> toolPalette) {
         this.toolPalette = toolPalette;
-        renderer = mapViewBasic.getRenderer();
+        this.renderer = renderer;
     }
 
     public void init(@NotNull final MapView<G, A, R, V> mapView) {


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