[Gridarta-commit] SF.net SVN: gridarta:[9019] trunk/src/app/net/sf/gridarta/gui/map/mapview/ AbstractMapViewBasic.java

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

Revision: 9019
          http://gridarta.svn.sourceforge.net/gridarta/?rev=9019&view=rev
Author:   akirschbaum
Date:     2011-10-15 19:12:01 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Merge duplicated code.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java	2011-10-15 19:06:58 UTC (rev 9018)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java	2011-10-15 19:12:01 UTC (rev 9019)
@@ -20,7 +20,6 @@
 package net.sf.gridarta.gui.map.mapview;
 
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.gridarta.model.archetype.Archetype;
@@ -91,17 +90,10 @@
     @NotNull
     @Override
     public List<MapSquare<G, A, R>> getSelectedSquares() {
+        final Point[] selectedMapSquares = mapGrid.getSelection();
         final List<MapSquare<G, A, R>> selection = new ArrayList<MapSquare<G, A, R>>();
-        final Point pos = new Point();
-        final Rectangle selectedRec = mapGrid.getSelectedRec();
-        if (selectedRec != null) {
-            for (pos.x = selectedRec.x; pos.x < selectedRec.x + selectedRec.width; pos.x++) {
-                for (pos.y = selectedRec.y; pos.y < selectedRec.y + selectedRec.height; pos.y++) {
-                    if ((mapGrid.getFlags(pos) & MapGrid.GRID_FLAG_SELECTION) > 0) {
-                        selection.add(mapModel.getMapSquare(pos));
-                    }
-                }
-            }
+        for (final Point pos : selectedMapSquares) {
+            selection.add(mapModel.getMapSquare(pos));
         }
         return selection;
     }

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