gridarta-commit Mailing List for gridarta (Page 54)

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

Revision: 8410
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8410&view=rev
Author:   akirschbaum
Date:     2010-06-23 17:43:50 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
Make CopyBufferTest work in headless mode.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkActions.java
    trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
    trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java
    trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java
    trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
    trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViews.java
    trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
    trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java
    trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
    trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java
    trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewFactory.java
    trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreator.java
    trunk/src/test/net/sf/gridarta/gui/selectedsquare/SelectedSquareActionsTest.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
    trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
    trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java
    trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapView.java
    trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewBasic.java

Modified: trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkActions.java
===================================================================

--- trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkActions.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkActions.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -184,8 +184,8 @@
 
         if (performAction) {
             final A mapArchObject = mapModel.getMapArchObject();
-            final EditBookmarkDialog<G, A, R> editBookmarkDialog = new EditBookmarkDialog<G, A, R>(mapView, mapArchObject.getMapName());
-            if (editBookmarkDialog.showDialog(mapView)) {
+            final EditBookmarkDialog<G, A, R> editBookmarkDialog = new EditBookmarkDialog<G, A, R>(mapView.getInternalFrame(), mapArchObject.getMapName());
+            if (editBookmarkDialog.showDialog(mapView.getInternalFrame())) {
                 bookmarksMapMenuManager.addRecent(mapModel, editBookmarkDialog.getDescription());
             }
         }

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -735,7 +735,7 @@
         if (destinationPoint != null) {
             showLocation(newMapView, destinationPoint);
         } else {
-            newMapView.getMapViewBasic().getViewport().setViewPosition(calculateNewViewPosition(currentMapView.getMapViewBasic(), newMapView.getMapViewBasic(), direction));
+            newMapView.getMapViewBasic().getScrollPane().getViewport().setViewPosition(calculateNewViewPosition(currentMapView.getMapViewBasic().getScrollPane(), newMapView.getMapViewBasic().getScrollPane(), direction));
         }
 
         if (ACTION_BUILDER.showOnetimeConfirmDialog(parent, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, "enterExitClose") == JOptionPane.YES_OPTION) {
@@ -923,7 +923,7 @@
         }
 
         if (performAction) {
-            mapViewsManager.newMapView(mapView.getMapControl(), mapView.getMapViewBasic().getViewport().getViewPosition());
+            mapViewsManager.newMapView(mapView.getMapControl(), mapView.getMapViewBasic().getScrollPane().getViewport().getViewPosition());
         }
 
         return true;

Added: trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -0,0 +1,130 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 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.mapview;
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.util.ArrayList;
+import java.util.List;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.map.grid.MapGrid;
+import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.map.mapmodel.MapSquare;
+import net.sf.gridarta.model.mapcursor.MapCursor;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Abstract base class for {@link MapViewBasic} implementations.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author Andreas Kirschbaum
+ */
+public abstract class AbstractMapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements MapViewBasic<G, A, R> {
+
+    /**
+     * The {@link MapModel} to display.
+     */
+    @NotNull
+    private final MapModel<G, A, R> mapModel;
+
+    /**
+     * The {@link MapGrid} of this view.
+     */
+    @NotNull
+    private final MapGrid mapGrid;
+
+    /**
+     * The {@link MapCursor} of this view.
+     */
+    @NotNull
+    private final MapCursor mapCursor;
+
+    /**
+     * Creates a new instance.
+     * @param mapModel the map model to use
+     */
+    protected AbstractMapViewBasic(@NotNull final MapModel<G, A, R> mapModel) {
+        this.mapModel = mapModel;
+        mapGrid = new MapGrid(this.mapModel.getMapArchObject().getMapSize());
+        mapCursor = new MapCursor(mapGrid);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public MapGrid getMapGrid() {
+        return mapGrid;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public MapCursor getMapCursor() {
+        return mapCursor;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public Point[] getSelection() {
+        final List<Point> selection = new ArrayList<Point>();
+        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((Point) pos.clone());
+                    }
+                }
+            }
+        }
+        return selection.toArray(new Point[selection.size()]);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public List<MapSquare<G, A, R>> getSelectedSquares() {
+        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));
+                    }
+                }
+            }
+        }
+        return selection;
+    }
+
+} // class AbstractMapViewBasic


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

Copied: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java (from rev 8409, trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -0,0 +1,325 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 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.mapview;
+
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.beans.PropertyVetoException;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import javax.swing.JInternalFrame;
+import net.sf.gridarta.gui.utils.MenuUtils;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.io.PathManager;
+import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.maparchobject.MapArchObjectListener;
+import net.sf.gridarta.model.map.mapcontrol.DefaultMapControl;
+import net.sf.gridarta.model.map.mapcontrol.MapControl;
+import net.sf.gridarta.model.map.mapcontrol.MapControlListener;
+import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.map.mapmodel.MapModelListener;
+import net.sf.gridarta.model.map.mapmodel.MapSquare;
+import net.sf.gridarta.model.map.validation.ErrorCollector;
+import net.sf.gridarta.utils.RandomUtils;
+import net.sf.gridarta.utils.Size2D;
+import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Default {@link MapView} implementation.
+ * @author Andreas Kirschbaum
+ */
+public class DefaultMapView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JInternalFrame implements MapView<G, A, R> {
+
+    /**
+     * The Logger for printing log messages.
+     */
+    private static final Category log = Logger.getLogger(DefaultMapView.class);
+
+    /**
+     * The serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The controller of this view.
+     */
+    @NotNull
+    private final MapControl<G, A, R> mapControl;
+
+    /**
+     * View number.
+     */
+    private final int number;
+
+    /**
+     * The underlying map view object.
+     */
+    @NotNull
+    private final MapViewBasic<G, A, R> mapViewBasic;
+
+    /**
+     * The {@link PathManager} for converting path names.
+     */
+    @NotNull
+    private final PathManager pathManager;
+
+    /**
+     * The {@link MapModelListener} used to detect changes in the map model that
+     * should be reflected in the window title.
+     */
+    private final MapModelListener<G, A, R> mapModelListener = new MapModelListener<G, A, R>() {
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapSizeChanged(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D newSize) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapSquaresChanged(@NotNull final Set<MapSquare<G, A, R>> mapSquares) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapObjectsChanged(@NotNull final Set<G> gameObjects, @NotNull final Set<G> transientGameObjects) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void errorsChanged(@NotNull final ErrorCollector<G, A, R> errors) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapFileChanged(@Nullable final File oldMapFile) {
+            updateTitle();
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void modifiedChanged(@NotNull final MapModel<G, A, R> mapModel) {
+            updateTitle();
+        }
+
+    };
+
+    /**
+     * The {@link MapArchObjectListener} used to detect changes in the map model
+     * that should be reflected in the window title.
+     */
+    private final MapArchObjectListener mapArchObjectListener = new MapArchObjectListener() {
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapMetaChanged() {
+            updateTitle();
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void mapSizeChanged(@NotNull final Size2D mapSize) {
+            // ignore
+        }
+
+    };
+
+    /**
+     * The {@link MapControlListener} used to detect changes in the map control
+     * that should be reflected in the window title.
+     */
+    private final MapControlListener<G, A, R> mapControlListener = new MapControlListener<G, A, R>() {
+
+        /** {@inheritDoc} */
+        @Override
+        public void saved(@NotNull final DefaultMapControl<G, A, R> mapControl) {
+            updateTitle();
+        }
+
+    };
+
+    /**
+     * Create a new instance.
+     * @param mapControl the controller of this view
+     * @param number Each view of a map will get a number
+     * @param mapViewBasic The underlying map view object. <code>null</code>
+     * @param pathManager the path manager for converting path names
+     */
+    public DefaultMapView(@NotNull final MapControl<G, A, R> mapControl, final int number, @NotNull final MapViewBasic<G, A, R> mapViewBasic, @NotNull final PathManager pathManager) {
+        super(getWindowTitle(mapControl, number, pathManager), true, true, true, true);
+        this.mapControl = mapControl;
+        this.number = number;
+        this.mapViewBasic = mapViewBasic;
+        this.pathManager = pathManager;
+        final MapModel<G, A, R> mapModel = mapControl.getMapModel();
+        mapModel.addMapModelListener(mapModelListener);
+        mapModel.getMapArchObject().addMapArchObjectListener(mapArchObjectListener);
+        mapControl.addMapControlListener(mapControlListener);
+        getContentPane().setLayout(new BorderLayout());
+        getContentPane().add(mapViewBasic.getScrollPane(), BorderLayout.CENTER);
+        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
+        setAutoscrolls(true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void closeNotify() {
+        getContentPane().remove(mapViewBasic.getScrollPane());
+        mapViewBasic.closeNotify();
+        mapControl.removeMapControlListener(mapControlListener);
+        final MapModel<G, A, R> mapModel = mapControl.getMapModel();
+        mapModel.getMapArchObject().removeMapArchObjectListener(mapArchObjectListener);
+        mapModel.removeMapModelListener(mapModelListener);
+        //mapFileActions.closeNotify();
+        MenuUtils.disposeMenuElement(getJMenuBar());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nullable
+    @Override
+    public G getSelectedGameObject() {
+        final List<G> objects = getSelectedGameObjects();
+        final int objectSize = objects.size();
+        if (objectSize == 0) {
+            return null;
+        }
+        if (objectSize == 1) {
+            return objects.get(0);
+        }
+        return objects.get(RandomUtils.rnd.nextInt(objects.size()));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public List<G> getSelectedGameObjects() {
+        final Collection<MapSquare<G, A, R>> selectedMapSquares = mapViewBasic.getSelectedSquares();
+        if (selectedMapSquares.isEmpty()) {
+            return mapControl.getMapModel().getAllGameObjects();
+        }
+
+        final List<G> objects = new ArrayList<G>();
+        for (final Iterable<G> mapSquare : selectedMapSquares) {
+            for (final GameObject<G, A, R> gameObject : mapSquare) {
+                objects.add(gameObject.getHead());
+            }
+        }
+        return objects;
+    }
+
+    /**
+     * Update the Map-Window Title (according to name and changeFlag).
+     */
+    private void updateTitle() {
+        setTitle(getWindowTitle());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public String getWindowTitle() {
+        return getWindowTitle(mapControl, number, pathManager);
+    }
+
+    /**
+     * Returns the title for the map window.
+     * @param mapControl the map control to use
+     * @param number the view number
+     * @param pathManager the path manager for converting path names
+     * @return the title
+     */
+    @NotNull
+    private static String getWindowTitle(@NotNull final MapControl<?, ?, ?> mapControl, final int number, @NotNull final PathManager pathManager) {
+        final File mapFile = mapControl.getMapModel().getMapFile();
+        return (mapFile == null ? "<unsaved>" : pathManager.getMapPath(mapFile)) + " [ " + mapControl.getMapModel().getMapArchObject().getMapName() + " ] (" + number + ")" + (mapControl.getMapModel().isModified() ? " *" : "");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public Component getComponent() {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public MapControl<G, A, R> getMapControl() {
+        return mapControl;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public MapViewBasic<G, A, R> getMapViewBasic() {
+        return mapViewBasic;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void activate() {
+        try {
+            setSelected(true);
+        } catch (final PropertyVetoException e) {
+            log.warn("Unexpected exception", e);
+        }
+        setVisible(true);
+        requestFocus();
+        restoreSubcomponentFocus();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public JInternalFrame getInternalFrame() {
+        return this;
+    }
+
+} // class MapView

Copied: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java (from rev 8409, trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -0,0 +1,244 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 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.mapview;
+
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import javax.swing.JScrollPane;
+import javax.swing.JViewport;
+import javax.swing.ScrollPaneConstants;
+import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
+import net.sf.gridarta.gui.map.renderer.MapRenderer;
+import net.sf.gridarta.gui.map.renderer.RendererFactory;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.baseobject.BaseObject;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.map.grid.MapGrid;
+import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.map.mapmodel.MapModelListener;
+import net.sf.gridarta.model.map.mapmodel.MapSquare;
+import net.sf.gridarta.model.map.validation.ErrorCollector;
+import net.sf.gridarta.model.map.validation.errors.ValidationError;
+import net.sf.gridarta.model.mapcursor.MapCursor;
+import net.sf.gridarta.model.mapcursor.MapCursorEvent;
+import net.sf.gridarta.model.mapcursor.MapCursorListener;
+import net.sf.gridarta.utils.CommonConstants;
+import net.sf.gridarta.utils.Size2D;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Default {@link MapViewBasic} implementation.
+ * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @author Andreas Kirschbaum
+ */
+public class DefaultMapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractMapViewBasic<G, A, R> {
+
+    /**
+     * The {@link MapModel} to display.
+     */
+    @NotNull
+    private final MapModel<G, A, R> mapModel;
+
+    /**
+     * The erroneous {@link MapSquare}s.
+     */
+    @NotNull
+    private final Map<MapSquare<G, A, R>, ValidationError<G, A, R>> erroneousMapSquares = new HashMap<MapSquare<G, A, R>, ValidationError<G, A, R>>();
+
+    /**
+     * The {@link AbstractMapRenderer} for rendering {@link #mapModel}.
+     */
+    @NotNull
+    private final AbstractMapRenderer<G, A, R> renderer;
+
+    /**
+     * The {@link JScrollPane} for this instance.
+     */
+    @NotNull
+    private final JScrollPane scrollPane;
+
+    /**
+     * The {@link MapCursorListener} attached to {@link #mapCursor}.
+     */
+    @NotNull
+    private final MapCursorListener mapCursorListener = new MapCursorListener() {
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
+            final MapCursor mapCursor = e.getSource();
+            final Point cursorLocation = mapCursor.getLocation();
+            if (cursorLocation != null) {
+                final Rectangle rectangle = renderer.getSquareBounds(cursorLocation);
+                renderer.scrollRectToVisible(rectangle);
+            }
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
+            // Ignore mode change events
+        }
+
+    };
+
+    /**
+     * The {@link MapModelListener} attached to {@link #mapModel}.
+     */
+    @NotNull
+    private final MapModelListener<G, A, R> mapModelListener = new MapModelListener<G, A, R>() {
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapSizeChanged(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D newSize) {
+            getMapGrid().resize(newSize);
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapSquaresChanged(@NotNull final Set<MapSquare<G, A, R>> mapSquares) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapObjectsChanged(@NotNull final Set<G> gameObjects, @NotNull final Set<G> transientGameObjects) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void errorsChanged(@NotNull final ErrorCollector<G, A, R> errors) {
+            DefaultMapViewBasic.this.errorsChanged(errors);
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void mapFileChanged(@Nullable final File oldMapFile) {
+            // ignore
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void modifiedChanged(@NotNull final MapModel<G, A, R> mapModel) {
+            // ignore
+        }
+
+    };
+
+    /**
+     * Creates a new instance.
+     * @param mapModel the map model to use
+     * @param isPickmap whether the map model belongs to a pickmap
+     * @param initial the initial view position to show; null=show top left
+     * corner
+     * @param xScrollDistance the x distance when scrolling
+     * @param yScrollDistance the y distance when scrolling
+     * @param rendererFactory the renderer factory to use
+     */
+    public DefaultMapViewBasic(@NotNull final MapModel<G, A, R> mapModel, final boolean isPickmap, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance, @NotNull final RendererFactory<G, A, R> rendererFactory) {
+        super(mapModel);
+        this.mapModel = mapModel;
+        scrollPane = new JScrollPane(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        if (isPickmap) {
+            scrollPane.setBackground(CommonConstants.BG_COLOR);
+        }
+
+        // set the pixel increment scrolling for clicking once on a scroll bar arrow
+        scrollPane.getVerticalScrollBar().setUnitIncrement(yScrollDistance);
+        scrollPane.getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
+
+        scrollPane.getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
+        getMapCursor().addMapCursorListener(mapCursorListener);
+
+        renderer = isPickmap ? rendererFactory.newPickmapRenderer(mapModel, getMapGrid()) : rendererFactory.newMapRenderer(mapModel, getMapGrid());
+        scrollPane.setViewportView(renderer);
+        if (initial != null) {
+            scrollPane.getViewport().setViewPosition(initial);
+        }
+
+        mapModel.addMapModelListener(mapModelListener);
+
+        renderer.setErroneousMapSquares(erroneousMapSquares);
+        renderer.setFocusable(true);
+        scrollPane.setFocusable(true);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void closeNotify() {
+        renderer.closeNotify();
+        getMapCursor().removeMapCursorListener(mapCursorListener);
+        scrollPane.setViewportView(null);
+        mapModel.removeMapModelListener(mapModelListener);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public MapRenderer getRenderer() {
+        return renderer;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public JScrollPane getScrollPane() {
+        return scrollPane;
+    }
+
+    /**
+     * Updates the erroneous map squares.
+     * @param errors the errors to display
+     */
+    private void errorsChanged(@NotNull final ErrorCollector<G, A, R> errors) {
+        erroneousMapSquares.clear();
+        final MapGrid mapGrid = getMapGrid();
+        mapGrid.beginTransaction();
+        try {
+            mapGrid.clearErrors();
+            for (final ValidationError<G, A, R> validationError : errors.getErrors()) {
+                for (final MapSquare<G, A, R> mapSquare : validationError.getMapSquares()) {
+                    erroneousMapSquares.put(mapSquare, validationError);
+                    mapGrid.setError(mapSquare.getMapX(), mapSquare.getMapY());
+                }
+                for (final G gameObject : validationError.getGameObjects()) {
+                    final BaseObject<G, A, R, ?> topContainer = gameObject.getTopContainer();
+                    mapGrid.setError(topContainer.getMapX(), topContainer.getMapY());
+                }
+            }
+        } finally {
+            mapGrid.endTransaction();
+        }
+    }
+
+} // class DefaultMapViewBasic

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -84,8 +84,8 @@
     @NotNull
     @Override
     public MapView<G, A, R> newMapView(@NotNull final MapControl<G, A, R> mapControl, @Nullable final Point viewPosition, final int viewCounter) {
-        final MapView<G, A, R> mapView = new MapView<G, A, R>(mapControl, viewCounter, new MapViewBasic<G, A, R>(mapControl.getMapModel(), mapControl.isPickmap(), viewPosition, xScrollDistance, yScrollDistance, rendererFactory), pathManager);
-        mapView.setJMenuBar(ACTION_BUILDER.createMenuBar(false, "mapwindow"));
+        final MapView<G, A, R> mapView = new DefaultMapView<G, A, R>(mapControl, viewCounter, new DefaultMapViewBasic<G, A, R>(mapControl.getMapModel(), mapControl.isPickmap(), viewPosition, xScrollDistance, yScrollDistance, rendererFactory), pathManager);
+        mapView.getInternalFrame().setJMenuBar(ACTION_BUILDER.createMenuBar(false, "mapwindow"));
         return mapView;
     }
 

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -19,32 +19,13 @@
 
 package net.sf.gridarta.gui.map.mapview;
 
-import java.awt.BorderLayout;
 import java.awt.Component;
-import java.beans.PropertyVetoException;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 import javax.swing.JInternalFrame;
-import net.sf.gridarta.gui.utils.MenuUtils;
 import net.sf.gridarta.model.archetype.Archetype;
 import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.io.PathManager;
 import net.sf.gridarta.model.map.maparchobject.MapArchObject;
-import net.sf.gridarta.model.map.maparchobject.MapArchObjectListener;
-import net.sf.gridarta.model.map.mapcontrol.DefaultMapControl;
 import net.sf.gridarta.model.map.mapcontrol.MapControl;
-import net.sf.gridarta.model.map.mapcontrol.MapControlListener;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mapmodel.MapModelListener;
-import net.sf.gridarta.model.map.mapmodel.MapSquare;
-import net.sf.gridarta.model.map.validation.ErrorCollector;
-import net.sf.gridarta.utils.RandomUtils;
-import net.sf.gridarta.utils.Size2D;
-import org.apache.log4j.Category;
-import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -53,157 +34,12 @@
  * control.
  * @author Andreas Kirschbaum
  */
-public class MapView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JInternalFrame {
+public interface MapView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
 
     /**
-     * The Logger for printing log messages.
-     */
-    private static final Category log = Logger.getLogger(MapView.class);
-
-    /**
-     * The serial version UID.
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The controller of this view.
-     */
-    @NotNull
-    private final MapControl<G, A, R> mapControl;
-
-    /**
-     * View number.
-     */
-    private final int number;
-
-    /**
-     * The underlying map view object.
-     */
-    @NotNull
-    private final MapViewBasic<G, A, R> mapViewBasic;
-
-    /**
-     * The {@link PathManager} for converting path names.
-     */
-    @NotNull
-    private final PathManager pathManager;
-
-    /**
-     * The {@link MapModelListener} used to detect changes in the map model that
-     * should be reflected in the window title.
-     */
-    private final MapModelListener<G, A, R> mapModelListener = new MapModelListener<G, A, R>() {
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapSizeChanged(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D newSize) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapSquaresChanged(@NotNull final Set<MapSquare<G, A, R>> mapSquares) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapObjectsChanged(@NotNull final Set<G> gameObjects, @NotNull final Set<G> transientGameObjects) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void errorsChanged(@NotNull final ErrorCollector<G, A, R> errors) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapFileChanged(@Nullable final File oldMapFile) {
-            updateTitle();
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void modifiedChanged(@NotNull final MapModel<G, A, R> mapModel) {
-            updateTitle();
-        }
-
-    };
-
-    /**
-     * The {@link MapArchObjectListener} used to detect changes in the map model
-     * that should be reflected in the window title.
-     */
-    private final MapArchObjectListener mapArchObjectListener = new MapArchObjectListener() {
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapMetaChanged() {
-            updateTitle();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public void mapSizeChanged(@NotNull final Size2D mapSize) {
-            // ignore
-        }
-
-    };
-
-    /**
-     * The {@link MapControlListener} used to detect changes in the map control
-     * that should be reflected in the window title.
-     */
-    private final MapControlListener<G, A, R> mapControlListener = new MapControlListener<G, A, R>() {
-
-        /** {@inheritDoc} */
-        @Override
-        public void saved(@NotNull final DefaultMapControl<G, A, R> mapControl) {
-            updateTitle();
-        }
-
-    };
-
-    /**
-     * Create a new instance.
-     * @param mapControl the controller of this view
-     * @param number Each view of a map will get a number
-     * @param mapViewBasic The underlying map view object. <code>null</code>
-     * @param pathManager the path manager for converting path names
-     */
-    public MapView(@NotNull final MapControl<G, A, R> mapControl, final int number, @NotNull final MapViewBasic<G, A, R> mapViewBasic, @NotNull final PathManager pathManager) {
-        super(getWindowTitle(mapControl, number, pathManager), true, true, true, true);
-        this.mapControl = mapControl;
-        this.number = number;
-        this.mapViewBasic = mapViewBasic;
-        this.pathManager = pathManager;
-        final MapModel<G, A, R> mapModel = mapControl.getMapModel();
-        mapModel.addMapModelListener(mapModelListener);
-        mapModel.getMapArchObject().addMapArchObjectListener(mapArchObjectListener);
-        mapControl.addMapControlListener(mapControlListener);
-        getContentPane().setLayout(new BorderLayout());
-        getContentPane().add(mapViewBasic, BorderLayout.CENTER);
-        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        setAutoscrolls(true);
-    }
-
-    /**
      * This function must be called when the view is closed.
      */
-    public void closeNotify() {
-        getContentPane().remove(mapViewBasic);
-        mapViewBasic.closeNotify();
-        mapControl.removeMapControlListener(mapControlListener);
-        final MapModel<G, A, R> mapModel = mapControl.getMapModel();
-        mapModel.getMapArchObject().removeMapArchObjectListener(mapArchObjectListener);
-        mapModel.removeMapModelListener(mapModelListener);
-        //mapFileActions.closeNotify();
-        MenuUtils.disposeMenuElement(getJMenuBar());
-    }
+    void closeNotify();
 
     /**
      * Return one selected game object. If more than one game object is
@@ -213,17 +49,7 @@
      *         object is selected.
      */
     @Nullable
-    public G getSelectedGameObject() {
-        final List<G> objects = getSelectedGameObjects();
-        final int objectSize = objects.size();
-        if (objectSize == 0) {
-            return null;
-        }
-        if (objectSize == 1) {
-            return objects.get(0);
-        }
-        return objects.get(RandomUtils.rnd.nextInt(objects.size()));
-    }
+    G getSelectedGameObject();
 
     /**
      * Return all selected game objects. If nothing is selected, return all game
@@ -231,89 +57,47 @@
      * @return The selected game objects.
      */
     @NotNull
-    public List<G> getSelectedGameObjects() {
-        final Collection<MapSquare<G, A, R>> selectedMapSquares = mapViewBasic.getSelectedSquares();
-        if (selectedMapSquares.isEmpty()) {
-            return mapControl.getMapModel().getAllGameObjects();
-        }
+    List<G> getSelectedGameObjects();
 
-        final List<G> objects = new ArrayList<G>();
-        for (final Iterable<G> mapSquare : selectedMapSquares) {
-            for (final GameObject<G, A, R> gameObject : mapSquare) {
-                objects.add(gameObject.getHead());
-            }
-        }
-        return objects;
-    }
-
     /**
-     * Update the Map-Window Title (according to name and changeFlag).
-     */
-    private void updateTitle() {
-        setTitle(getWindowTitle());
-    }
-
-    /**
      * Returns the title for the map window.
      * @return the title
      */
     @NotNull
-    public String getWindowTitle() {
-        return getWindowTitle(mapControl, number, pathManager);
-    }
+    String getWindowTitle();
 
     /**
-     * Returns the title for the map window.
-     * @param mapControl the map control to use
-     * @param number the view number
-     * @param pathManager the path manager for converting path names
-     * @return the title
-     */
-    @NotNull
-    private static String getWindowTitle(@NotNull final MapControl<?, ?, ?> mapControl, final int number, @NotNull final PathManager pathManager) {
-        final File mapFile = mapControl.getMapModel().getMapFile();
-        return (mapFile == null ? "<unsaved>" : pathManager.getMapPath(mapFile)) + " [ " + mapControl.getMapModel().getMapArchObject().getMapName() + " ] (" + number + ")" + (mapControl.getMapModel().isModified() ? " *" : "");
-    }
-
-    /**
      * Returns the component associated with this MapView that can be used as
      * parent for dialogs.
      * @return Component as parent for dialogs.
      */
-    public Component getComponent() {
-        return this;
-    }
+    @NotNull
+    Component getComponent();
 
     /**
      * Return the controller of this view.
      * @return the controller of this view
      */
     @NotNull
-    public MapControl<G, A, R> getMapControl() {
-        return mapControl;
-    }
+    MapControl<G, A, R> getMapControl();
 
     /**
      * Return the associated {@link MapViewBasic}.
      * @return the associated <code>MapViewBasic</code>
      */
     @NotNull
-    public MapViewBasic<G, A, R> getMapViewBasic() {
-        return mapViewBasic;
-    }
+    MapViewBasic<G, A, R> getMapViewBasic();
 
     /**
      * Activate this map view.
      */
-    public void activate() {
-        try {
-            setSelected(true);
-        } catch (final PropertyVetoException e) {
-            log.warn("Unexpected exception", e);
-        }
-        setVisible(true);
-        requestFocus();
-        restoreSubcomponentFocus();
-    }
+    void activate();
 
-} // class MapView
+    /**
+     * Returns the {@link JInternalFrame} instance for this map view.
+     * @return the internal frame
+     */
+    @NotNull
+    JInternalFrame getInternalFrame();
+
+} // interface MapView

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -20,289 +20,70 @@
 package net.sf.gridarta.gui.map.mapview;
 
 import java.awt.Point;
-import java.awt.Rectangle;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import javax.swing.JScrollPane;
-import javax.swing.JViewport;
-import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
 import net.sf.gridarta.gui.map.renderer.MapRenderer;
-import net.sf.gridarta.gui.map.renderer.RendererFactory;
 import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.gameobject.GameObject;
 import net.sf.gridarta.model.map.grid.MapGrid;
 import net.sf.gridarta.model.map.maparchobject.MapArchObject;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mapmodel.MapModelListener;
 import net.sf.gridarta.model.map.mapmodel.MapSquare;
-import net.sf.gridarta.model.map.validation.ErrorCollector;
-import net.sf.gridarta.model.map.validation.errors.ValidationError;
 import net.sf.gridarta.model.mapcursor.MapCursor;
-import net.sf.gridarta.model.mapcursor.MapCursorEvent;
-import net.sf.gridarta.model.mapcursor.MapCursorListener;
-import net.sf.gridarta.utils.CommonConstants;
-import net.sf.gridarta.utils.Size2D;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * MapViewBasic is a view for maps.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  * @author Andreas Kirschbaum
- * @todo extending JScrollPane is not a good idea.
  */
-public class MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JScrollPane {
+public interface MapViewBasic<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
 
     /**
-     * The serial version UID.
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The {@link MapModel} to display.
-     */
-    @NotNull
-    private final MapModel<G, A, R> mapModel;
-
-    /**
-     * The {@link MapGrid} of this view.
-     */
-    @NotNull
-    private final MapGrid mapGrid;
-
-    /**
-     * The {@link MapCursor} of this view.
-     */
-    @NotNull
-    private final MapCursor mapCursor;
-
-    /**
-     * The erroneous {@link MapSquare}s.
-     */
-    @NotNull
-    private final Map<MapSquare<G, A, R>, ValidationError<G, A, R>> erroneousMapSquares = new HashMap<MapSquare<G, A, R>, ValidationError<G, A, R>>();
-
-    /**
-     * The {@link AbstractMapRenderer} for rendering {@link #mapModel}.
-     */
-    @NotNull
-    private final AbstractMapRenderer<G, A, R> renderer;
-
-    /**
-     * The {@link MapCursorListener} attached to {@link #mapCursor}.
-     */
-    @NotNull
-    private final MapCursorListener mapCursorListener = new MapCursorListener() {
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
-            final MapCursor mapCursor = e.getSource();
-            final Point cursorLocation = mapCursor.getLocation();
-            if (cursorLocation != null) {
-                final Rectangle rectangle = renderer.getSquareBounds(cursorLocation);
-                renderer.scrollRectToVisible(rectangle);
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
-            // Ignore mode change events
-        }
-
-    };
-
-    /**
-     * The {@link MapModelListener} attached to {@link #mapModel}.
-     */
-    @NotNull
-    private final MapModelListener<G, A, R> mapModelListener = new MapModelListener<G, A, R>() {
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapSizeChanged(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D newSize) {
-            getMapGrid().resize(newSize);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapSquaresChanged(@NotNull final Set<MapSquare<G, A, R>> mapSquares) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapObjectsChanged(@NotNull final Set<G> gameObjects, @NotNull final Set<G> transientGameObjects) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void errorsChanged(@NotNull final ErrorCollector<G, A, R> errors) {
-            MapViewBasic.this.errorsChanged(errors);
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void mapFileChanged(@Nullable final File oldMapFile) {
-            // ignore
-        }
-
-        /** {@inheritDoc} */
-        @Override
-        public void modifiedChanged(@NotNull final MapModel<G, A, R> mapModel) {
-            // ignore
-        }
-
-    };
-
-    /**
-     * Creates a new instance.
-     * @param mapModel the map model to use
-     * @param isPickmap whether the map model belongs to a pickmap
-     * @param initial the initial view position to show; null=show top left
-     * corner
-     * @param xScrollDistance the x distance when scrolling
-     * @param yScrollDistance the y distance when scrolling
-     * @param rendererFactory the renderer factory to use
-     */
-    public MapViewBasic(@NotNull final MapModel<G, A, R> mapModel, final boolean isPickmap, @Nullable final Point initial, final int xScrollDistance, final int yScrollDistance, @NotNull final RendererFactory<G, A, R> rendererFactory) {
-        super(VERTICAL_SCROLLBAR_AS_NEEDED, HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        this.mapModel = mapModel;
-        mapGrid = new MapGrid(this.mapModel.getMapArchObject().getMapSize());
-        mapCursor = new MapCursor(mapGrid);
-        if (isPickmap) {
-            setBackground(CommonConstants.BG_COLOR);
-        }
-
-        // set the pixel increment scrolling for clicking once on a scroll bar arrow
-        getVerticalScrollBar().setUnitIncrement(yScrollDistance);
-        getHorizontalScrollBar().setUnitIncrement(xScrollDistance);
-
-        getViewport().setScrollMode(JViewport.SIMPLE_SCROLL_MODE);
-        mapCursor.addMapCursorListener(mapCursorListener);
-
-        renderer = isPickmap ? rendererFactory.newPickmapRenderer(mapModel, mapGrid) : rendererFactory.newMapRenderer(mapModel, mapGrid);
-        setViewportView(renderer);
-        if (initial != null) {
-            getViewport().setViewPosition(initial);
-        }
-
-        mapModel.addMapModelListener(mapModelListener);
-
-        renderer.setErroneousMapSquares(erroneousMapSquares);
-        renderer.setFocusable(true);
-        setFocusable(true);
-    }
-
-    /**
      * Returns the {@link MapGrid} of this view.
      * @return the map grid of this view
      */
     @NotNull
-    public MapGrid getMapGrid() {
-        return mapGrid;
-    }
+    MapGrid getMapGrid();
 
     /**
      * Returns the {@link MapCursor} of this view.
      * @return the map cursor of this view
      */
     @NotNull
-    public MapCursor getMapCursor() {
-        return mapCursor;
-    }
+    MapCursor getMapCursor();
 
     /**
      * Returns the selection.
      * @return the selection
      */
     @NotNull
-    public Point[] getSelection() {
-        final List<Point> selection = new ArrayList<Point>();
-        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((Point) pos.clone());
-                    }
-                }
-            }
-        }
-        return selection.toArray(new Point[selection.size()]);
-    }
+    Point[] getSelection();
 
     /**
      * Returns the selected squares.
      * @return the selected squares; the list may be modified by the caller
      */
     @NotNull
-    public List<MapSquare<G, A, R>> getSelectedSquares() {
-        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));
-                    }
-                }
-            }
-        }
-        return selection;
-    }
+    List<MapSquare<G, A, R>> getSelectedSquares();
 
     /**
      * Must be called when this renderer is not used anymore. It un-registers all
      * listeners.
      */
-    public void closeNotify() {
-        renderer.closeNotify();
-        mapCursor.removeMapCursorListener(mapCursorListener);
-        setViewportView(null);
-        mapModel.removeMapModelListener(mapModelListener);
-    }
+    void closeNotify();
 
     /**
      * Returns the {@link MapRenderer} for this view.
      * @return the map renderer.
      */
     @NotNull
-    public MapRenderer getRenderer() {
-        return renderer;
-    }
+    MapRenderer getRenderer();
 
     /**
-     * Updates the erroneous map squares.
-     * @param errors the errors to display
+     * Returns the {@link JScrollPane} of this map view basic.
+     * @return the scroll pane
      */
-    private void errorsChanged(@NotNull final ErrorCollector<G, A, R> errors) {
-        erroneousMapSquares.clear();
-        mapGrid.beginTransaction();
-        try {
-            mapGrid.clearErrors();
-            for (final ValidationError<G, A, R> validationError : errors.getErrors()) {
-                for (final MapSquare<G, A, R> mapSquare : validationError.getMapSquares()) {
-                    erroneousMapSquares.put(mapSquare, validationError);
-                    mapGrid.setError(mapSquare.getMapX(), mapSquare.getMapY());
-                }
-                for (final G gameObject : validationError.getGameObjects()) {
-                    final BaseObject<G, A, R, ?> topContainer = gameObject.getTopContainer();
-                    mapGrid.setError(topContainer.getMapX(), topContainer.getMapY());
-                }
-            }
-        } finally {
-            mapGrid.endTransaction();
-        }
-    }
+    @NotNull
+    JScrollPane getScrollPane();
 
-} // class MapViewBasic
+} // interface MapViewBasic

Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViews.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViews.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViews.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -123,7 +123,7 @@
     public Point[] getViewPositions() {
         final Point[] result = new Point[mapViews.size()];
         for (int i = 0; i < result.length; i++) {
-            result[i] = mapViews.get(i).getMapViewBasic().getViewport().getViewPosition();
+            result[i] = mapViews.get(i).getMapViewBasic().getScrollPane().getViewport().getViewPosition();
         }
         return result;
     }

Modified: trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -27,6 +27,7 @@
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
 import javax.swing.JMenu;
 import javax.swing.event.InternalFrameEvent;
 import javax.swing.event.InternalFrameListener;
@@ -273,9 +274,10 @@
     public void setCurrentMapView(@NotNull final MapView<G, A, R> mapView) {
         mapViewManager.setActiveMapView(mapView);
         // De-iconify if necessary
-        if (mapView.isIcon()) {
+        final JInternalFrame internalFrame = mapView.getInternalFrame();
+        if (internalFrame.isIcon()) {
             try {
-                mapView.setIcon(false);
+                internalFrame.setIcon(false);
             } catch (final PropertyVetoException e) {
                 log.warn(ACTION_BUILDER.format("logUnexpectedException", e));
             }
@@ -283,8 +285,8 @@
             return;
         }
         updateFocus(true);
-        mapView.requestFocus();
-        mapView.restoreSubcomponentFocus();
+        internalFrame.requestFocus();
+        internalFrame.restoreSubcomponentFocus();
     }
 
     /**
@@ -292,19 +294,20 @@
      * @param mapView the map view to be removed (closed)
      */
     private void removeMapView(@NotNull final MapView<G, A, R> mapView) {
-        mapView.removeInternalFrameListener(internalFrameListener);
+        final JInternalFrame internalFrame = mapView.getInternalFrame();
+        internalFrame.removeInternalFrameListener(internalFrameListener);
         mapViewManager.removeMapView(mapView);
         if (windowActions.remove(mapView) == null) {
             assert false;
         }
-        remove(mapView);
+        remove(internalFrame);
         // 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,
         // we check whether it's selected and if so deselect it.
         if (getSelectedFrame() == mapView) {
             setSelectedFrame(null);
         }
-        mapView.dispose();
+        internalFrame.dispose();
         repaint();
 
         updateFocus(true);
@@ -320,14 +323,15 @@
         windowActions.put(mapView, windowAction);
         updateFrameIcon(mapView);
 
-        mapView.addInternalFrameListener(internalFrameListener);
-        add(mapView);
+        final JInternalFrame internalFrame = mapView.getInternalFrame();
+        internalFrame.addInternalFrameListener(internalFrameListener);
+        add(internalFrame);
         mapViewManager.addMapView(mapView);
         setCurrentMapView(mapView);
-        mapView.setVisible(true);
-        mapView.setBounds(0, 0, getWidth(), getHeight());
+        internalFrame.setVisible(true);
+        internalFrame.setBounds(0, 0, getWidth(), getHeight());
         try {
-            mapView.setMaximum(true);
+            internalFrame.setMaximum(true);
         } catch (final PropertyVetoException e) {
             log.error("PropertyVetoException: " + e);
         }
@@ -342,7 +346,7 @@
         final Action windowAction = windowActions.get(mapView);
         assert windowAction != null;
         final Icon icon = new ImageIcon(mapImageCache.getOrCreateIcon(mapView.getMapControl()));
-        mapView.setFrameIcon(icon);
+        mapView.getInternalFrame().setFrameIcon(icon);
         windowAction.putValue(Action.SMALL_ICON, icon);
     }
 
@@ -366,8 +370,9 @@
     private void activateAndRaiseMapView(@NotNull final MapView<G, A, R> mapView) {
         mapManager.setCurrentMap(mapView.getMapControl());
         mapView.activate();
-        mapView.moveToFront();
-        setSelectedFrame(mapView);
+        final JInternalFrame internalFrame = mapView.getInternalFrame();
+        internalFrame.moveToFront();
+        setSelectedFrame(internalFrame);
     }
 
     /**
@@ -398,10 +403,11 @@
     private void updateFocus(final boolean fCareAboutIconification) {
         // Show the next map (if such exists)
         for (final MapView<G, A, R> mapView : mapViewManager) {
-            if (mapView.isIcon()) {
+            final JInternalFrame internalFrame = mapView.getInternalFrame();
+            if (internalFrame.isIcon()) {
                 if (!fCareAboutIconification) {
                     try {
-                        mapView.setIcon(false);
+                        internalFrame.setIcon(false);
                     } catch (final PropertyVetoException e) {
                         log.warn(ACTION_BUILDER.format("logUnexpectedException", e));
                     }

Modified: trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -160,7 +160,7 @@
         this.mapDesktop = mapDesktop;
         this.mapView = mapView;
         this.mapManager = mapManager;
-        putValue(SHORT_DESCRIPTION, "Switches to map " + mapView.getTitle());
+        putValue(SHORT_DESCRIPTION, "Switches to map " + mapView.getInternalFrame().getTitle());
         mapView.getMapControl().getMapModel().addMapModelListener(mapModelListener);
         mapManager.addMapManagerListener(mapManagerListener);
         setIndex(-1);

Modified: trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java	2010-06-23 16:21:32 UTC (rev 8409)
+++ trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java	2010-06-23 17:43:50 UTC (rev 8410)
@@ -26,6 +26,7 @@
 import javax.swing.JTabbedPane;
 import javax.swing.SwingConstants;
 import javax.swing.event.ChangeListener;
+import net.sf.gridarta.gui.map.mapview.MapViewBasic;
 import net.sf.gridarta.mapfiles.MapFile;
 import net.sf.gridarta.mapfiles.MapFolder;
 import net.sf.gridarta.mapfiles.MapFolderListener;
@@ -209,7 +210,8 @@
         }
 
         final int index = pickmapChooserModel.addMapFile(mapFile);
-        pickmapPanel.insertTab(getTitle(mapFile), null, mapFile.getView(), null, index);
+        final MapViewBasic<G,A,R> mapViewBasic = mapFile.getView();
+        pickmapPanel.insertTab(getTitle(mapFile), null, mapViewBasic == null ? null : mapViewBasic.getScrollPane(), null, index);
     }
 
     /**
@@ -234,7 +236,8 @@
             return;
         }
         pickmapPanel.setTitleAt(index, getTitle(mapFile));
-        pickmapPanel.setComponentAt(index, mapFile.getView());
+        final MapViewBasic<G, A, R> mapViewBasic = mapFile.getView();
+        pickmapPanel.setComponentAt(index, mapViewBasic == null ? null : mapViewBasic.getScrollPane());
     }
 
     /**

Modified: trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java
===================================================================
--- trunk/src/test/net/...
 
[truncated message content]

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 54)

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