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

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

Revision: 9076
          http://gridarta.svn.sourceforge.net/gridarta/?rev=9076&view=rev
Author:   akirschbaum
Date:     2011-10-30 18:14:11 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Revert r9074.

Revision Links:
--------------
    http://gridarta.svn.sourceforge.net/gridarta/?rev=9074&view=rev

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog
    trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java

Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog	2011-10-30 17:47:32 UTC (rev 9075)
+++ trunk/atrinik/ChangeLog	2011-10-30 18:14:11 UTC (rev 9076)
@@ -1,7 +1,3 @@
-2011-10-30  Andreas Kirschbaum
-
-	* Retain the selection when deactivating the map cursor.
-
 2011-10-18  Andreas Kirschbaum
 
 	* Fix Next Exit not finding all exits.

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2011-10-30 17:47:32 UTC (rev 9075)
+++ trunk/crossfire/ChangeLog	2011-10-30 18:14:11 UTC (rev 9076)
@@ -1,7 +1,3 @@
-2011-10-30  Andreas Kirschbaum
-
-	* Retain the selection when deactivating the map cursor.
-
 2011-10-18  Andreas Kirschbaum
 
 	* Fix Next Exit not finding all exits.

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2011-10-30 17:47:32 UTC (rev 9075)
+++ trunk/daimonin/ChangeLog	2011-10-30 18:14:11 UTC (rev 9076)
@@ -1,7 +1,3 @@
-2011-10-30  Andreas Kirschbaum
-
-	* Retain the selection when deactivating the map cursor.
-
 2011-10-18  Andreas Kirschbaum
 
 	* Fix Next Exit not finding all exits.

Modified: trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java	2011-10-30 17:47:32 UTC (rev 9075)
+++ trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java	2011-10-30 18:14:11 UTC (rev 9076)
@@ -330,7 +330,7 @@
     }
 
     /**
-     * Cursor gets deactivated.
+     * Cursor gets deactivated. All selections get lost.
      */
     public final void deactivate() {
         final boolean hasChanged = onMap;
@@ -340,6 +340,7 @@
             onMap = false;
             dragging = false;
             mapGrid.unSetCursor(pos);
+            mapGrid.unSelect();
             mapSquare = null;
             gameObject = null;
         } finally {

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