gridarta-commit Mailing List for gridarta (Page 28)

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

Revision: 9060
          http://gridarta.svn.sourceforge.net/gridarta/?rev=9060&view=rev
Author:   akirschbaum
Date:     2011-10-18 16:45:21 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
Extract ExitIterator from MapActions.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gui/map/mapactions/ExitIterator.java

Added: trunk/src/app/net/sf/gridarta/gui/map/mapactions/ExitIterator.java
===================================================================

--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/ExitIterator.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/ExitIterator.java	2011-10-18 16:45:21 UTC (rev 9060)
@@ -0,0 +1,159 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2011 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.map.mapactions;
+
+import java.awt.Point;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.exitconnector.ExitMatcher;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.utils.Size2D;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An {@link Iterator} that returns all map squares containing an exit game
+ * object.
+ * @author Andreas Kirschbaum
+ */
+public class ExitIterator<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements Iterator<G> {
+
+    /**
+     * The {@link ExitMatcher} for selecting exit game objects.
+     */
+    @NotNull
+    private final ExitMatcher<G, A, R> exitMatcher;
+
+    /**
+     * The {@link MapModel} begin searched.
+     */
+    @NotNull
+    private final MapModel<G, A, R> mapModel;
+
+    /**
+     * The search direction: <code>-1</code> for backward or <code>+1</code> for
+     * forward.
+     */
+    private final int direction;
+
+    /**
+     * The current location on the map.
+     */
+    @NotNull
+    private final Point point;
+
+    /**
+     * The starting exit game object or <code>null</code>.
+     */
+    @Nullable
+    private final G start;
+
+    /**
+     * The number of map squares remaining to be searched.
+     */
+    private int remainingMapSquares;
+
+    /**
+     * Whether {@link #next} is valid.
+     */
+    private boolean findNextPending = true;
+
+    /**
+     * The next exit game object to return from {@link #next()}.
+     */
+    @Nullable
+    private G next;
+
+    /**
+     * Creates a new instance.
+     * @param exitMatcher the exit matcher for selecting exit game objects
+     * @param mapModel the map model to search
+     * @param xStart the x coordinate to start seacrhing
+     * @param yStart the y coordinate to start seacrhing
+     * @param direction the search direction: <code>-1</code> for backward or
+     * <code>+1</code> for forward
+     */
+    public ExitIterator(@NotNull final ExitMatcher<G, A, R> exitMatcher, @NotNull final MapModel<G, A, R> mapModel, final int xStart, final int yStart, final int direction) {
+        if (direction != -1 && direction != 1) {
+            throw new IllegalArgumentException();
+        }
+        this.exitMatcher = exitMatcher;
+        this.mapModel = mapModel;
+        this.direction = direction;
+        point = new Point(xStart, yStart);
+        start = exitMatcher.getValidExit(mapModel, point);
+        final Size2D mapSize = mapModel.getMapArchObject().getMapSize();
+        remainingMapSquares = mapSize.getWidth() * mapSize.getHeight();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean hasNext() {
+        findNext();
+        return next != null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public G next() {
+        findNext();
+        if (next == null) {
+            throw new NoSuchElementException();
+        }
+        findNextPending = true;
+        return next;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Updates {@link #next} to the next match.
+     */
+    private void findNext() {
+        if (!findNextPending) {
+            return;
+        }
+        findNextPending = false;
+
+        //noinspection WhileLoopSpinsOnField
+        while (remainingMapSquares-- > 0) {
+            mapModel.nextPoint(point, direction);
+            next = exitMatcher.getValidExit(mapModel, point);
+            if (next != null && next != start) {
+                return;
+            }
+        }
+        next = null;
+    }
+
+}


Property changes on: trunk/src/app/net/sf/gridarta/gui/map/mapactions/ExitIterator.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java	2011-10-18 16:44:23 UTC (rev 9059)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java	2011-10-18 16:45:21 UTC (rev 9060)
@@ -45,6 +45,7 @@
 import net.sf.gridarta.model.mapmanager.MapManager;
 import net.sf.gridarta.model.mapmanager.MapManagerListener;
 import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapSquare;
 import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
 import net.sf.gridarta.model.mapviewsettings.MapViewSettingsListener;
 import net.sf.gridarta.utils.ActionUtils;
@@ -576,18 +577,13 @@
      */
     private void selectExit(@NotNull final MapView<G, A, R> mapView, final int xStart, final int yStart, final int direction) {
         final MapModel<G, A, R> mapModel = mapView.getMapControl().getMapModel();
-        final Size2D mapSize = mapModel.getMapArchObject().getMapSize();
-        final Point point = new Point(xStart, yStart);
-        final G currentExit = exitMatcher.getValidExit(mapModel, point);
-        for (int i = mapSize.getWidth() * mapSize.getHeight(); i > 0; i--) {
-            mapModel.nextPoint(point, direction);
-            final G exit = exitMatcher.getValidExit(mapModel, point);
-            if (exit != null && exit != currentExit) {
-                mapView.setCursorLocation(point);
-                return;
-            }
-        }
-        if (currentExit == null) {
+        final ExitIterator<G, A, R> exitIterator = new ExitIterator<G, A, R>(exitMatcher, mapModel, xStart, yStart, direction);
+        if (exitIterator.hasNext()) {
+            final G exit = exitIterator.next();
+            final MapSquare<G,A,R> mapSquare = exit.getMapSquare();
+            assert mapSquare != null;
+            mapView.setCursorLocation(mapSquare.getMapLocation());
+        } else {
             mapView.setCursorLocation(null);
         }
     }

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





2006	Jan	Feb	Mar	Apr	May (103)	Jun (121)	Jul (16)	Aug (67)	Sep (126)	Oct (161)	Nov (164)	Dec (588)
2007	Jan (394)	Feb (181)	Mar (131)	Apr (180)	May (255)	Jun (11)	Jul (79)	Aug (70)	Sep (274)	Oct (138)	Nov (195)	Dec (8)
2008	Jan (3)	Feb (142)	Mar (162)	Apr (124)	May (148)	Jun (157)	Jul (425)	Aug (373)	Sep (264)	Oct (315)	Nov (225)	Dec (6)
2009	Jan (67)	Feb (78)	Mar (279)	Apr (294)	May (92)	Jun (65)	Jul (134)	Aug (41)	Sep (138)	Oct (125)	Nov (126)	Dec (122)
2010	Jan (15)	Feb (48)	Mar (9)	Apr (195)	May (373)	Jun (507)	Jul (42)	Aug (16)	Sep (38)	Oct (81)	Nov (64)	Dec (18)
2011	Jan (13)	Feb (12)	Mar (39)	Apr (1)	May (2)	Jun (27)	Jul (27)	Aug (31)	Sep (14)	Oct (102)	Nov (20)	Dec (37)
2012	Jan (22)	Feb (1)	Mar (1)	Apr (2)	May (2)	Jun (18)	Jul (6)	Aug (1)	Sep (1)	Oct	Nov	Dec
2013	Jan (1)	Feb (2)	Mar (1)	Apr (1)	May (47)	Jun (7)	Jul (107)	Aug	Sep	Oct (112)	Nov (31)	Dec (17)
2014	Jan (29)	Feb (111)	Mar (34)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct (2)	Nov (18)	Dec (10)

gridarta-commit Mailing List for gridarta (Page 28)

gridarta-commit — svn commit digest list (high traffic)