gridarta-commit Mailing List for gridarta (Page 361)

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

Revision: 484
          http://svn.sourceforge.net/gridarta/?rev=484&view=rev
Author:   christianhujer
Date:     2006-10-07 06:41:41 -0700 (Sat, 07 Oct 2006)

Log Message:
-----------
Moved unified classes (GameObjectContainer, MapSquare) from crossfire / daimonin to gridarta.

Modified Paths:
--------------
    trunk/crossfire/src/cfeditor/CMainView.java
    trunk/crossfire/src/cfeditor/gameobject/GameObject.java
    trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
    trunk/crossfire/src/cfeditor/map/MapModel.java
    trunk/daimonin/src/daieditor/CMainControl.java
    trunk/daimonin/src/daieditor/CMapFileEncode.java
    trunk/daimonin/src/daieditor/CMapTileList.java
    trunk/daimonin/src/daieditor/CMapViewBasic.java
    trunk/daimonin/src/daieditor/CopyBuffer.java
    trunk/daimonin/src/daieditor/ReplaceDialog.java
    trunk/daimonin/src/daieditor/gameobject/GameObject.java
    trunk/daimonin/src/daieditor/gui/ConnectionView.java
    trunk/daimonin/src/daieditor/gui/ErrorListView.java
    trunk/daimonin/src/daieditor/gui/map/DefaultLevelRenderer.java
    trunk/daimonin/src/daieditor/gui/map/SimpleLevelRenderer.java
    trunk/daimonin/src/daieditor/gui/map/tools/DeletionTool.java
    trunk/daimonin/src/daieditor/map/DefaultMapModel.java
    trunk/daimonin/src/daieditor/map/MapControl.java
    trunk/daimonin/src/daieditor/map/MapModel.java
    trunk/daimonin/src/daieditor/map/MapModelEvent.java
    trunk/daimonin/src/daieditor/map/validation/DelegatingMapValidator.java
    trunk/daimonin/src/daieditor/map/validation/GameObjectsValidationError.java
    trunk/daimonin/src/daieditor/map/validation/MapValidationError.java
    trunk/daimonin/src/daieditor/map/validation/SquareValidationError.java
    trunk/daimonin/src/daieditor/map/validation/SquareValidator.java
    trunk/daimonin/src/daieditor/map/validation/ValidationError.java
    trunk/daimonin/src/daieditor/map/validation/checks/BlockedMobOrSpawnPointChecker.java
    trunk/daimonin/src/daieditor/map/validation/checks/BlockedMobOrSpawnPointError.java
    trunk/daimonin/src/daieditor/map/validation/checks/DoubleLayerChecker.java
    trunk/daimonin/src/daieditor/map/validation/checks/DoubleLayerError.java
    trunk/daimonin/src/daieditor/map/validation/checks/DoubleTypeChecker.java
    trunk/daimonin/src/daieditor/map/validation/checks/DoubleTypeError.java
    trunk/daimonin/src/daieditor/map/validation/checks/ExitChecker.java
    trunk/daimonin/src/daieditor/map/validation/checks/SquareWithoutFloorChecker.java
    trunk/daimonin/src/daieditor/map/validation/checks/SquareWithoutFloorError.java
    trunk/src/app/net/sf/gridarta/gameobject/GameObject.java
    trunk/src/app/net/sf/gridarta/map/MapModel.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gameobject/GameObjectContainer.java
    trunk/src/app/net/sf/gridarta/gameobject/RecursiveGameObjectIterator.java
    trunk/src/app/net/sf/gridarta/map/MapSquare.java

Removed Paths:
-------------
    trunk/crossfire/src/cfeditor/gameobject/GameObjectContainer.java
    trunk/crossfire/src/cfeditor/gameobject/RecursiveGameObjectIterator.java
    trunk/crossfire/src/cfeditor/map/MapSquare.java
    trunk/daimonin/src/daieditor/gameobject/GameObjectContainer.java
    trunk/daimonin/src/daieditor/gameobject/RecursiveGameObjectIterator.java
    trunk/daimonin/src/daieditor/map/MapSquare.java

Modified: trunk/crossfire/src/cfeditor/CMainView.java
===================================================================

--- trunk/crossfire/src/cfeditor/CMainView.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/CMainView.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -307,7 +307,7 @@
                 // now try to get the topmost object
                 GameObject arch = null;
                 if (pmap.isPointValid(pmap.getMapView().getHighlightStart())) {
-                    arch = pmap.getMapModel().getMapSquare(pmap.getMapView().getHighlightStart()).getFirst();
+                    arch = (GameObject) pmap.getMapModel().getMapSquare(pmap.getMapView().getHighlightStart()).getFirst();
                 }
                 if (arch != null) {
                     // so here we return the arch from the pickmap

Modified: trunk/crossfire/src/cfeditor/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObject.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -31,16 +31,15 @@
 import cfeditor.IGUIConstants;
 import cfeditor.MultiArchData;
 import cfeditor.ScriptArchData;
-import cfeditor.map.MapSquare;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import javax.swing.JList;
+import net.sf.gridarta.gameobject.GameObjectContainer;
+import net.sf.gridarta.map.MapSquare;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -50,7 +49,7 @@
  * @author <a href="mailto:mic...@no...">Michael Toennies</a>
  * @author <a href="mailto:and...@gm...">Andreas Vogl</a>
  */
-public class GameObject extends GameObjectContainer implements Cloneable, net.sf.gridarta.gameobject.GameObject, Iterable<GameObject> {
+public class GameObject extends net.sf.gridarta.gameobject.GameObject<GameObject> implements Cloneable, Iterable<GameObject> {
 
     private static final Logger log = Logger.getLogger(GameObject.class);
 
@@ -154,7 +153,7 @@
      *  <li>A MapSquare, which means that this GameObject is top level on that MapSquare.</li>
      * </ul>
      */
-    private GameObjectContainer container;
+    private GameObjectContainer<GameObject> container;
 
     /**
      * All inventory objects. Set to {@link Collections#EMPTY_LIST}
@@ -224,13 +223,6 @@
         this.archetype = archetype;
     }
 
-    /** {@inheritDoc}
-     * @note DO NOT INVOKE DIRECTLY YET!
-     */
-    public void setArchetype(final net.sf.gridarta.gameobject.GameObject archetype) {
-        this.archetype = (GameObject) archetype;
-    }
-
     /** {@inheritDoc} */
     public boolean isArchetype() {
         return archetype == this;
@@ -454,32 +446,18 @@
         return isInContainer() ? ((GameObject) container).getTopContainer() : this;
     }
 
-    /**
-     * Sets container of this GameObject.
-     * There are two possibilities for the container:
-     * <ul>
-     *  <li>Another GameObject, which means this object is in the inventory of that GameObject.</li>
-     *  <li>A MapSquare, which means that this GameObject is top level on that MapSquare.</li>
-     * </ul>
-     * @param container container of this GameObject.
-     */
-    public void setContainer(final GameObjectContainer container) {
+    /** {@inheritDoc} */
+    public void setContainer(final GameObjectContainer<GameObject> container) {
         this.container = container;
     }
 
-    /**
-     * Check whether this GameObject is in a Container (in Daimonin sense,
-     * which means being in a MapSquare isn't, but being in an GameObject is).
-     * @return <code>true</code> if this GameObject has a Container and the
-     * Container is an GameObject, otherwise (no Container or Container is not
-     * an GameObject) false
-     */
+    /** {@inheritDoc} */
     public boolean isInContainer() {
         return container != null && container instanceof GameObject;
     }
 
     /** {@inheritDoc} */
-    @Override public MapSquare getMapSquare() {
+    @Override public MapSquare<GameObject> getMapSquare() {
         return container != null ? container.getMapSquare() : null;
     }
 

Deleted: trunk/crossfire/src/cfeditor/gameobject/GameObjectContainer.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/GameObjectContainer.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/gameobject/GameObjectContainer.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -1,427 +0,0 @@
-/*
- * Daimonin Java Editor.
- * Copyright (C) 2005  Christian Hujer
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-package cfeditor.gameobject;
-
-import cfeditor.map.MapSquare;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Base class for classes that contain GameObjects as children in the sense of containment.
- * The interface serves 2 main purposes:
- * <ul>
- * <li>{@link GameObject} extends this class for containing other GameObjects, like inventory contents e.g. of a bag or attached events.</li>
- * <li>{@link MapSquare} extends this class to list the tiles on a MapSquare.</li>
- * </ul>
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- * @todo: In case of MapSquares, this class is most likely bogus regarding multipart objects. This needs to be fixed.
- */
-@SuppressWarnings({"ClassReferencesSubclass"})
-public abstract class GameObjectContainer implements Iterable<GameObject>, Serializable {
-
-    /** Serial Version. */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The contents of this container.
-     * @note the order of this container is bottom to top.
-     */
-    @NotNull private List<GameObject> contents;
-
-    /** Iterable implementation for recursice traversal. */
-    @NotNull private transient Iterable<GameObject> recursive;
-
-    /** Iterable implementation for reverse traversal. */
-    @NotNull private transient Iterable<GameObject> reverse;
-
-    /** Create a new GameObjectContainer. */
-    protected GameObjectContainer() {
-        initData();
-    }
-
-    /**
-     * Initialize the fields.
-     * This is needed because there are two ways of object construction,
-     * <ul>
-     * <li>regular object construction via constructor invocation and</li>
-     * <li>cloning of objects via {@link #clone()}.</li>
-     * </ul>
-     */
-    private void initData() {
-        contents = new ArrayList<GameObject>();
-        recursive = new Iterable<GameObject>() {
-            /** {@inheritDoc} */
-            public Iterator<GameObject> iterator() {
-                return new RecursiveGameObjectIterator(GameObjectContainer.this);
-            }
-        };
-        reverse = new Iterable<GameObject>() {
-            /** {@inheritDoc} */
-            public Iterator<GameObject> iterator() {
-                return new ReverseIterator<GameObject>(contents);
-            }
-        }; // Iterable<GameObject> reverse
-    }
-
-    /**
-     * {@inheritDoc}
-     * The Iterator returned does not recurse, it only contains objects on the first level.
-     * The Iterator returned is transparent, that means modifying the iterator's collection actually modifies the underlying GameObjectContainer.
-     */
-    @NotNull public final Iterator<GameObject> iterator() {
-        // Do not return contents.iterator() directly because otherwise the remove() operation will not properly unlink the removed GameObject from its container.
-        return new Iterator<GameObject>() {
-
-            /** The basic iterator. */
-            private Iterator<GameObject> delegate = contents.iterator();
-            private GameObject current;
-
-            /** {@inheritDoc} */
-            public boolean hasNext() {
-                return delegate.hasNext();
-            }
-
-            /** {@inheritDoc} */
-            public GameObject next() {
-                return current = delegate.next();
-            }
-
-            /** {@inheritDoc} */
-            public void remove() {
-                // keep this in sync with GameObjectContainer#remove(GameObject)
-                // we can't simply invoke GameObjectContainer#remove(current) because that would result in a ConcurrentModificationException.
-                delegate.remove();
-                current.setContainer(null);
-                squareChanged();
-            }
-        };
-    }
-
-    /**
-     * Return an object that is the reverse representation.
-     * Invoke this method if you want to iterate over the contained GameObjects in reverse order.
-     * @return reverse representation
-     */
-    @NotNull public final Iterable<GameObject> reverse() {
-        return reverse;
-    }
-
-    /**
-     * Return an object that is a recursive representation.
-     * Invoke this method if you want to iterate over the contained GameObjects recursively.
-     * @return recursive representation
-     */
-    @NotNull public final Iterable<GameObject> recursive() {
-        return recursive;
-    }
-
-    /**
-     * Check whether this square is empty.
-     * @return <code>true</code> if this square is empty, otherwise <code>false</code>
-     */
-    public boolean isEmpty() {
-        return contents.isEmpty();
-    }
-
-    /**
-     * Return the first GameObject contained in this container.
-     * @return first GameObject contained or <code>null</code> if {@link #isEmpty()} returns <code>true</code>
-     */
-    @Nullable public final GameObject getFirst() {
-        return contents.isEmpty() ? null : contents.get(0);
-    }
-
-    /**
-     * Return the last GameObject contained in this container.
-     * You should not invoke this method to iterate over GameObjects, such invocation is regarded deprecated.
-     * @return last GameObject contained or <code>null</code> if {@link #isEmpty()} returns <code>true</code>
-     */
-    @Nullable public final GameObject getLast() {
-        return contents.isEmpty() ? null : contents.get(contents.size() - 1);
-    }
-
-    /**
-     * Remove a GameObject from this container.
-     * @param gameObject GameObject to remove
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    final void remove(@NotNull final GameObject gameObject) {
-        // keep this in sync with iterator()
-        if (!contents.remove(gameObject)) {
-            throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-        }
-        gameObject.setContainer(null);
-        squareChanged();
-    }
-
-    /** Remove all GameObjects from this container. */
-    public final void removeAll() {
-        if (contents.size() <= 0) {
-            return;
-        }
-
-        for (final GameObject gameObject : contents) {
-            gameObject.setContainer(null);
-        }
-        contents.clear();
-        squareChanged();
-    }
-
-    /**
-     * Move an item to top.
-     * @param gameObject item to move to top
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveTop(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex != contents.size() - 1) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Move an item up.
-     * @param gameObject item to move up
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveUp(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex < contents.size() - 1) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(oldIndex + 1, gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Move an item down.
-     * @param gameObject item to move down
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveDown(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex > 0) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(oldIndex - 1, gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Move an item to bottom.
-     * @param gameObject item to move to bottom
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveBottom(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex != 0) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(0, gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Get the X coordinate on the map.
-     * @return X coordinate on map
-     */
-    public abstract int getMapX();
-
-    /**
-     * Get the Y coordinate on the map.
-     * @return Y coordinate on map
-     */
-    public abstract int getMapY();
-
-    /**
-     * Add the given GameObject at the end of this Container.
-     * @param gameObject the free yet unlinked <code>GameObject</code> to be placed in the inventory
-     * @throws IllegalArgumentException if <var>gameObject</var> already is inside another container
-     */
-    public void addLast(@NotNull final GameObject gameObject) {
-        if (gameObject.isInContainer()) {
-            throw new IllegalArgumentException("Can't add " + gameObject + " to " + this + " because it's already inside " + gameObject.getContainer());
-        }
-        contents.add(gameObject);
-        gameObject.setContainer(this);
-        squareChanged();
-    }
-
-    /**
-     * Add the given GameObject at the end of this Container.
-     * @param gameObject the free yet unlinked <code>GameObject</code> to be placed in the inventory
-     * @throws IllegalArgumentException if <var>gameObject</var> already is inside another container
-     */
-    public void addFirst(@NotNull final GameObject gameObject) {
-        if (gameObject.isInContainer()) {
-            throw new IllegalArgumentException("Can't add " + gameObject + " to " + this + " because it's already inside " + gameObject.getContainer());
-        }
-        contents.add(0, gameObject);
-        gameObject.setContainer(this);
-        squareChanged();
-    }
-
-    /**
-     * Add a GameObject after another.
-     * @param previousGameObject previous anchor
-     * @param newGameObject GameObject to insert
-     * @throws IllegalArgumentException if <var>newGameObject</var> already is inside another container or <var>previousGameObject</var> isn't inside this container
-     */
-    public void insertAfter(@NotNull final GameObject previousGameObject, @NotNull final GameObject newGameObject) {
-        if (newGameObject.isInContainer()) {
-            throw new IllegalArgumentException("Can't add " + newGameObject + " to " + this + " because it's already inside " + newGameObject.getContainer());
-        }
-        final int insertIndex = contents.indexOf(previousGameObject);
-        if (insertIndex == -1) {
-            throw new IllegalArgumentException("Can't insert " + newGameObject + " after " + previousGameObject + " because that isn't inside " + this);
-        }
-        contents.add(insertIndex, newGameObject);
-        newGameObject.setContainer(this);
-        squareChanged();
-    }
-
-    /**
-     * Add a GameObject before another.
-     * @param newGameObject GameObject to insert
-     * @param nextGameObject nextGameObject anchor
-     * @throws IllegalArgumentException if <var>newGameObject</var> already is inside another container or <var>prev</var> isn't inside this container
-     */
-    public void insertBefore(@NotNull final GameObject newGameObject, @NotNull final GameObject nextGameObject) {
-        if (newGameObject.isInContainer()) {
-            throw new IllegalArgumentException("Can't add " + newGameObject + " to " + this + " because it's already inside " + newGameObject.getContainer());
-        }
-        final int insertIndex = contents.indexOf(nextGameObject);
-        if (insertIndex == -1) {
-            throw new IllegalArgumentException("Can't insert " + newGameObject + " before " + nextGameObject + " because that isn't inside " + this);
-        }
-        contents.add(insertIndex + 1, newGameObject);
-        newGameObject.setContainer(this);
-        squareChanged();
-    }
-
-    /**
-     * Replace an GameObject with another one.
-     * @param oldGameObject old GameObject to be replaced
-     * @param newGameObject new GameObject that replaces oldGameObject
-     * @throws IllegalArgumentException if <var>oldGameObject</var> isn't in this container
-     */
-    public void replace(@NotNull final GameObject oldGameObject, @NotNull final GameObject newGameObject) {
-        final int insertIndex = contents.indexOf(oldGameObject);
-        if (insertIndex == -1) {
-            throw new IllegalArgumentException(oldGameObject + " wasn't inside container " + this);
-        }
-        contents.remove(oldGameObject);
-        oldGameObject.setContainer(null);
-        contents.add(insertIndex, newGameObject);
-        newGameObject.setContainer(this);
-        squareChanged();
-    }
-
-    /**
-     * Get the MapSquare of this GameObjectContainer.
-     * @return MapSquare of this GameObjectContainer or <code>null</code> if this GameObjectContainer is not (yet?) connected to a map (a {@link MapSquare} would return itself)
-     */
-    @Nullable public abstract MapSquare getMapSquare();
-
-    /**
-     * Tell the model that this MapSquare has changed.
-     * This method must be invoked by all other methods that change something.
-     */
-    protected final void squareChanged() {
-        final MapSquare square = getMapSquare();
-        if (square != null) {
-            square.getModel().squareChanged(square);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @NotNull @Override protected GameObjectContainer clone() throws CloneNotSupportedException {
-        try {
-            final GameObjectContainer clone = (GameObjectContainer) super.clone();
-            clone.initData();
-            return clone;
-        } catch (final CloneNotSupportedException e) {
-            assert false;
-            throw new AssertionError();
-        }
-    }
-
-    /** {@inheritDoc} */
-    // writeObject() is not required because this class doesn't require special handling during serialization.
-    private void readObject(final ObjectInputStream stream) throws IOException, ClassNotFoundException {
-        stream.defaultReadObject();
-        // initialize transients
-        initData();
-    }
-
-    /**
-     * An iterator for iterating over a list in reverse order.
-     * @todo move this class to JAPI
-     */
-    private static class ReverseIterator<T> implements Iterator<T> {
-
-        /** The iterator used for delegation. */
-        @NotNull private final ListIterator<T> delegate;
-
-        /**
-         * Create a reverse iterator.
-         * @param list to iterate over in reverse order
-         */
-        public ReverseIterator(final List<T> list) {
-            delegate = list.listIterator(list.size());
-        }
-
-        /** {@inheritDoc} */
-        public boolean hasNext() {
-            return delegate.hasPrevious();
-        }
-
-        /** {@inheritDoc} */
-        @NotNull public T next() {
-            return delegate.previous();
-        }
-
-        /** {@inheritDoc} */
-        public void remove() {
-            delegate.remove();
-        }
-
-    } // class ReverseIterator
-
-} // interface GameObjectContainer

Deleted: trunk/crossfire/src/cfeditor/gameobject/RecursiveGameObjectIterator.java
===================================================================
--- trunk/crossfire/src/cfeditor/gameobject/RecursiveGameObjectIterator.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/gameobject/RecursiveGameObjectIterator.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -1,58 +0,0 @@
-package cfeditor.gameobject;
-
-import java.util.EmptyStackException;
-import java.util.Iterator;
-import java.util.Stack;
-
-/**
- * Iterator for recursively iterating over ArchObjectContainers.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-class RecursiveGameObjectIterator implements Iterator<GameObject> {
-
-    /** The Iterator stack. */
-    private Stack<Iterator<GameObject>> iteratorStack = new Stack<Iterator<GameObject>>();
-
-    /** The current iterator. */
-    private Iterator<GameObject> current;
-
-    /**
-     * Create a recursive GameObject Iterator.
-     * @param container GameObjectContainer to start with
-     */
-    RecursiveGameObjectIterator(final GameObjectContainer container) {
-        current = container.iterator();
-    }
-
-    /** {@inheritDoc} */
-    public boolean hasNext() {
-        return current.hasNext();
-    }
-
-    /** {@inheritDoc} */
-    public GameObject next() {
-        final GameObject arch = current.next();
-        try {
-            return arch;
-        } finally {
-            if (!arch.isEmpty()) {
-                iteratorStack.push(current);
-                current = arch.iterator();
-            } else {
-                try {
-                    while (!current.hasNext() ) {
-                        current = iteratorStack.pop();
-                    }
-                } catch (final EmptyStackException e) {
-                    /* ignore. */
-                }
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    public void remove() {
-        current.remove();
-    }
-
-} // class RecursiveGameObjectIterator

Modified: trunk/crossfire/src/cfeditor/map/DefaultMapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/map/DefaultMapModel.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -38,6 +38,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import net.sf.gridarta.Size2D;
+import net.sf.gridarta.map.MapSquare;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -58,7 +59,7 @@
      * The map, containing all arches grid-wise.
      * Index: [width][height]
      */
-    private MapSquare[][] mapGrid;
+    private MapSquare<GameObject>[][] mapGrid;
 
     /** Size of this map. */
     private Size2D mapSize;
@@ -92,7 +93,7 @@
     }
 
     /** Iterator for iterating over all squares of a model. */
-    private class MapSquareIterator implements Iterator<MapSquare> {
+    private class MapSquareIterator implements Iterator<MapSquare<GameObject>> {
 
         /**
          * Index of current map square.
@@ -116,9 +117,9 @@
         }
 
         /** {@inheritDoc} */
-        public MapSquare next() {
+        public MapSquare<GameObject> next() {
             try {
-                final MapSquare square = mapGrid[point / mapSize.getHeight()][point % mapSize.getHeight()];
+                final MapSquare<GameObject> square = mapGrid[point / mapSize.getHeight()][point % mapSize.getHeight()];
                 point++;
                 return square;
             } catch (final ArrayIndexOutOfBoundsException e) {
@@ -207,12 +208,12 @@
     }
 
     /** {@inheritDoc} */
-    public Iterator<MapSquare> iterator() {
+    public Iterator<MapSquare<GameObject>> iterator() {
         return new MapSquareIterator();
     }
 
     /** {@inheritDoc} */
-    public MapSquare getMapSquare(final Point p) throws ArrayIndexOutOfBoundsException {
+    public MapSquare<GameObject> getMapSquare(final Point p) throws ArrayIndexOutOfBoundsException {
         return mapGrid[p.x][p.y];
     }
 
@@ -870,7 +871,7 @@
 
             // Now the critical step: create an GameObject array of new dimension,
             // copy all objects and set it to replace the current one.
-            final MapSquare[][] newGrid = new MapSquare[newSize.getWidth()][newSize.getHeight()];
+            final MapSquare<GameObject>[][] newGrid = new MapSquare[newSize.getWidth()][newSize.getHeight()];
 
             // relink all arches to the new grid
             for (int x = 0; x < newSize.getWidth(); x++) {
@@ -878,7 +879,7 @@
                     if (x < mapSize.getWidth() && y < mapSize.getHeight()) {
                         newGrid[x][y] = mapGrid[x][y];
                     } else {
-                        newGrid[x][y] = new MapSquare(this, x, y);
+                        newGrid[x][y] = new MapSquare<GameObject>(this, x, y);
                     }
                 }
             }
@@ -1014,7 +1015,7 @@
     */
 
     /** {@inheritDoc} */
-    public void squareChanged(final MapSquare square) {
+    public void squareChanged(@NotNull final MapSquare<GameObject> square) {
     }
 
     /**

Modified: trunk/crossfire/src/cfeditor/map/MapModel.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapModel.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/map/MapModel.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -5,12 +5,13 @@
 import java.util.Iterator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import net.sf.gridarta.map.MapSquare;
 
 /**
  * Interface for MapModels.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
  */
-public interface MapModel extends net.sf.gridarta.map.MapModel {
+public interface MapModel extends net.sf.gridarta.map.MapModel<GameObject> {
 
     /** Enable autojoin when inserting objects. */
     boolean JOIN_ENABLE = true;
@@ -19,7 +20,7 @@
     boolean JOIN_DISABLE = false;
 
     /** {@inheritDoc} */
-    Iterator<MapSquare> iterator();
+    Iterator<MapSquare<GameObject>> iterator();
 
     /**
      * Get the square at a specified location.
@@ -27,7 +28,7 @@
      * @return square at <var>p</var>
      * @throws ArrayIndexOutOfBoundsException in case p specifies a location that's not valid within this map model
      */
-    MapSquare getMapSquare(Point p) throws ArrayIndexOutOfBoundsException;
+    MapSquare<GameObject> getMapSquare(Point p) throws ArrayIndexOutOfBoundsException;
 
     @Nullable Point getMouseRightPos();
 
@@ -71,13 +72,8 @@
 
     void setFileName(String strFileName);
 
-    /**
-     * Method to notify the model that a map square was changed.
-     * A change to a square is atomic if {@link #getTransactionDepth()} returns 0, otherwise it is transactional.
-     * The model then notifies the registered listeners of the changes.
-     * @param square MapSquare that has changed
-     */
-    void squareChanged(@NotNull MapSquare square);
+    /** {@inheritDoc} */
+    void squareChanged(@NotNull MapSquare<GameObject> square);
 
     MapArchObject getMapArchObject();
 

Deleted: trunk/crossfire/src/cfeditor/map/MapSquare.java
===================================================================
--- trunk/crossfire/src/cfeditor/map/MapSquare.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/crossfire/src/cfeditor/map/MapSquare.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -1,90 +0,0 @@
-/*
- * Daimonin Java Editor.
- * Copyright (C) 2000  Michael Toennies
- * Copyright (C) 2001  Andreas Vogl
- *
- * (code based on: Gridder. 2D grid based level editor. (C) 2000  Pasi Keränen)
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-package cfeditor.map;
-
-import cfeditor.gameobject.GameObject;
-import cfeditor.gameobject.GameObjectContainer;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * A single Map Square.
- * This class is implemented in a way that changes via some modifier methods in a map square will automatically fire events in the associated MapModel.
- * A MapSquare always knows its model.
- * It's not possible to create a MapSquare that is not associated to a model.
- *
- * <p>The objects are stored bottom to top: {@link #getFirst()} returns the
- * object at the bottom, {@link #getLast()} returns the object at the top of
- * the tile.
- *
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- */
-public class MapSquare extends GameObjectContainer {
-
-    /** The MaoModel this square is associated with. */
-    @NotNull private final MapModel model;
-
-    /** The X Coordinate of this map square within the model's grid. */
-    private final int x;
-
-    /** The Y Coordinate of this map square within the model's grid. */
-    private final int y;
-
-    /**
-     * Creates a new instance of MapSquare.
-     * @param model MapModel for this MapSquare
-     * @param x     X Coordinate of this map square within the model's grid
-     * @param y     Y Coordinate of this map square within the model's grid
-     */
-    MapSquare(@NotNull final MapModel model, final int x, final int y) {
-        this.model = model;
-        this.x = x;
-        this.y = y;
-    }
-
-    /**
-     * Get the MapModel.
-     * @return MapModel
-     */
-    @NotNull public MapModel getModel() {
-        return model;
-    }
-
-    /** {@inheritDoc} */
-    @Override public final int getMapX() {
-        return x;
-    }
-
-    /** {@inheritDoc} */
-    @Override public final int getMapY() {
-        return y;
-    }
-
-    /** {@inheritDoc} */
-    @Override @NotNull public final MapSquare getMapSquare() {
-        return this;
-    }
-
-} // class MapSquare

Modified: trunk/daimonin/src/daieditor/CMainControl.java
===================================================================
--- trunk/daimonin/src/daieditor/CMainControl.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/CMainControl.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -53,7 +53,6 @@
 import daieditor.map.MapModel;
 import daieditor.map.MapModelEvent;
 import daieditor.map.MapModelListener;
-import daieditor.map.MapSquare;
 import daieditor.map.validation.DefaultErrorCollector;
 import daieditor.map.validation.DelegatingMapValidator;
 import daieditor.map.validation.ErrorCollector;
@@ -115,6 +114,7 @@
 import net.sf.gridarta.MainControl;
 import net.sf.gridarta.gui.HideFileFilterProxy;
 import net.sf.gridarta.map.MapType;
+import net.sf.gridarta.map.MapSquare;
 import net.sf.gridarta.textedit.scripteditor.ScriptEditControl;
 import net.sf.japi.swing.ActionFactory;
 import static net.sf.japi.swing.ActionFactory.getFactory;
@@ -2052,7 +2052,7 @@
     /** {@inheritDoc} */
     public void mapSquaresChanged(final MapModelEvent e) {
         if (prefs.getBoolean(PREFS_VALIDATOR_AUTO, PREFS_VALIDATOR_AUTO_DEFAULT)) {
-            final MapSquare[] squares = e.getSquares();
+            final MapSquare<GameObject>[] squares = e.getSquares();
             if (squares != null) {
                 final ErrorCollector errorCollector = new DefaultErrorCollector();
                 validators.validate(squares, errorCollector);

Modified: trunk/daimonin/src/daieditor/CMapFileEncode.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapFileEncode.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/CMapFileEncode.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -27,13 +27,13 @@
 import daieditor.gameobject.GameObject;
 import daieditor.map.MapArchObject;
 import daieditor.map.MapModel;
-import daieditor.map.MapSquare;
 import java.awt.Point;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Formatter;
 import net.sf.gridarta.Size2D;
+import net.sf.gridarta.map.MapSquare;
 import net.sf.gridarta.io.IOUtils;
 
 /**
@@ -83,7 +83,7 @@
                 } // y
             } // x
 
-            for (final MapSquare square : mapModel) {
+            for (final MapSquare<GameObject> square : mapModel) {
                 final int x = square.getMapX();
                 final int y = square.getMapY();
                 for (final GameObject node : square) {

Modified: trunk/daimonin/src/daieditor/CMapTileList.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapTileList.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/CMapTileList.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -27,7 +27,6 @@
 
 import daieditor.gameobject.GameObject;
 import daieditor.map.MapControl;
-import daieditor.map.MapSquare;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -54,6 +53,7 @@
 import javax.swing.event.ListSelectionListener;
 import net.sf.gridarta.gui.map.MapCursorEvent;
 import net.sf.gridarta.gui.map.MapCursorListener;
+import net.sf.gridarta.map.MapSquare;
 import net.sf.japi.swing.ActionFactory;
 import static net.sf.japi.swing.ActionFactory.getFactory;
 import net.sf.japi.swing.ActionMethod;
@@ -86,7 +86,7 @@
     private int listCounter;
 
     /** The currently selected MapSquare. */
-    private transient MapSquare currentSquare;
+    private transient MapSquare<GameObject> currentSquare;
 
     /** Build Panel */
     public CMapTileList(final CMainControl mainControl, final CMainView mainView) {

Modified: trunk/daimonin/src/daieditor/CMapViewBasic.java
===================================================================
--- trunk/daimonin/src/daieditor/CMapViewBasic.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/CMapViewBasic.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -31,7 +31,6 @@
 import daieditor.map.MapModel;
 import daieditor.map.MapModelEvent;
 import daieditor.map.MapModelListener;
-import daieditor.map.MapSquare;
 import daieditor.map.validation.ErrorCollector;
 import daieditor.map.validation.ErrorHandler;
 import daieditor.map.validation.ValidationError;
@@ -50,6 +49,7 @@
 import javax.swing.JScrollPane;
 import javax.swing.JViewport;
 import net.sf.gridarta.Size2D;
+import net.sf.gridarta.map.MapSquare;
 import net.sf.gridarta.gui.MapView;
 import net.sf.gridarta.gui.map.MapCursor;
 import net.sf.gridarta.gui.map.MapCursorEvent;
@@ -105,7 +105,7 @@
     private final MapView frame;
 
     /** The MapSquares that are known to contain errors. */
-    private Map<MapSquare, ValidationError> erraneousMapSquares = new HashMap<MapSquare, ValidationError>();
+    private Map<MapSquare<GameObject>, ValidationError> erraneousMapSquares = new HashMap<MapSquare<GameObject>, ValidationError>();
 
     /** The ArchObjects that are known to contain errors. */
     private Map<GameObject,ValidationError> erraneousArchObjects = new HashMap<GameObject,ValidationError>();
@@ -250,7 +250,7 @@
      * @return cursor square or <code>null</code> if no current cursor
      * @see #getCursorPosition()
      */
-    @Nullable public MapSquare getCursorSquare() {
+    @Nullable public MapSquare<GameObject> getCursorSquare() {
         try {
             return mapModel.getMapSquare(getCursorPosition());
         } catch (final ArrayIndexOutOfBoundsException e) {
@@ -288,8 +288,8 @@
      * Get the selected squares.
      * @return selected squares
      */
-    public List<MapSquare> getSelectedSquares() {
-        final List<MapSquare> selection = new ArrayList<MapSquare>();
+    public List<MapSquare<GameObject>> getSelectedSquares() {
+        final List<MapSquare<GameObject>> selection = new ArrayList<MapSquare<GameObject>>();
         final Size2D mapSize = mapModel.getMapSize();
         final Point pos = new Point();
         for (pos.x = 0; pos.x < mapSize.getWidth(); pos.x++) {
@@ -389,7 +389,7 @@
         erraneousArchObjects.clear();
         mapGrid.clearErrors();
         for (ValidationError validationError : errors.getErrors()) {
-            final MapSquare mapSquare = validationError.getMapSquare();
+            final MapSquare<GameObject> mapSquare = validationError.getMapSquare();
             final GameObject archObject = validationError.getGameObject();
             if (mapSquare != null) {
                 erraneousMapSquares.put(mapSquare, validationError);

Modified: trunk/daimonin/src/daieditor/CopyBuffer.java
===================================================================
--- trunk/daimonin/src/daieditor/CopyBuffer.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/CopyBuffer.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -29,12 +29,12 @@
 import daieditor.map.MapArchObject;
 import daieditor.map.MapControl;
 import daieditor.map.MapModel;
-import daieditor.map.MapSquare;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.gridarta.Size2D;
+import net.sf.gridarta.map.MapSquare;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -150,7 +150,7 @@
         final Point offset = selRec.getLocation();
         mapControl.getMapModel().beginTransaction();
         final List<GameObject> archesToDelete = new ArrayList<GameObject>();
-        for (final MapSquare square : mapControl.getMapViewFrame().getView().getSelectedSquares()) {
+        for (final MapSquare<GameObject> square : mapControl.getMapViewFrame().getView().getSelectedSquares()) {
             final int posx = square.getMapX();
             final int posy = square.getMapY();
             for (final GameObject arch : square) {
@@ -200,7 +200,7 @@
         mapControl.getMapModel().beginTransaction();
         final Point pos = new Point();
         assert copyMap != null;
-        for (final MapSquare square : copyMap) {
+        for (final MapSquare<GameObject> square : copyMap) {
             pos.setLocation(startp.x + square.getMapX(), startp.y + square.getMapY());
             // paste the archs if on the map:
             if (mapControl.isPointValid(pos)) {
@@ -214,7 +214,7 @@
         }
 
         assert copyMapCtrl != null;
-        for (final MapSquare square : copyMapCtrl.getMapModel()) {
+        for (final MapSquare<GameObject> square : copyMapCtrl.getMapModel()) {
             pos.setLocation(startp);
             pos.translate(square.getMapX(), square.getMapY());
             if (mapControl.isPointValid(pos)) { // paste the archs if on the map:
@@ -295,7 +295,7 @@
         final Point pos = new Point();
         for (pos.x = 0; pos.x < mapSize.getWidth(); pos.x++) {
             for (pos.y = 0; pos.y < mapSize.getHeight(); pos.y++) {
-                for (GameObject node : map.getMapSquare(pos)) {
+                for (final GameObject node : map.getMapSquare(pos)) {
                     // only non multi suckers
                     if (!node.isTail())
                     {
@@ -341,11 +341,11 @@
             return null;
         }
         final MapViewIFrame mapViewIFrame = mapControl.getMapViewFrame();
-        final Iterable<MapSquare> mapSquares;
+        final Iterable<MapSquare<GameObject>> mapSquares;
         if (mapViewIFrame == null) {
             mapSquares = mapControl.getAllSquares();
         } else {
-            final List<MapSquare> selectedMapSquares = mapViewIFrame.getView().getSelectedSquares();
+            final List<MapSquare<GameObject>> selectedMapSquares = mapViewIFrame.getView().getSelectedSquares();
             if (selectedMapSquares.size() == 0) {
                 mapSquares = mapControl.getAllSquares();
             } else {
@@ -353,7 +353,7 @@
             }
         }
         final List<GameObject> objects = new ArrayList<GameObject>(max);
-        for (final MapSquare mapSquare : mapSquares) {
+        for (final MapSquare<GameObject> mapSquare : mapSquares) {
             for (final GameObject node : mapSquare) {
                 if (!node.isTail()) {
                     objects.add(node);

Modified: trunk/daimonin/src/daieditor/ReplaceDialog.java
===================================================================
--- trunk/daimonin/src/daieditor/ReplaceDialog.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/ReplaceDialog.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -27,7 +27,6 @@
 
 import daieditor.gameobject.GameObject;
 import daieditor.map.MapControl;
-import daieditor.map.MapSquare;
 import java.awt.FlowLayout;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -47,6 +46,7 @@
 import static javax.swing.WindowConstants.HIDE_ON_CLOSE;
 import net.sf.japi.swing.ActionFactory;
 import static net.sf.japi.swing.ActionFactory.getFactory;
+import net.sf.gridarta.map.MapSquare;
 
 /**
  * This dialog manages the replace action.
@@ -313,8 +313,8 @@
         assert mapViewIFrame != null;
         int replaceCount = 0;
         final int replaceListSize = replaceList == null ? 0 : replaceList.size();
-        for (MapSquare square : entireMap ? mapControl.getMapModel() : mapViewIFrame.getView().getSelectedSquares()) {
-            for (GameObject node : square) {
+        for (final MapSquare<GameObject> square : entireMap ? mapControl.getMapModel() : mapViewIFrame.getView().getSelectedSquares()) {
+            for (final GameObject node : square) {
                 if (!node.isMulti()
                         && (matchCriteria == MATCH_ARCH_NAME && node.getArchetypeName() != null && node.getArchetypeName().equalsIgnoreCase(matchString)
                         || matchCriteria == MATCH_OBJ_NAME && node.getBestName().equalsIgnoreCase(matchString))) {

Modified: trunk/daimonin/src/daieditor/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObject.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/gameobject/GameObject.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -34,12 +34,13 @@
 import daieditor.ScriptArchData;
 import daieditor.gameobject.anim.AnimationObject;
 import daieditor.gameobject.anim.AnimationObjects;
-import daieditor.map.MapSquare;
 import java.io.Serializable;
 import javax.swing.ImageIcon;
 import javax.swing.JList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import net.sf.gridarta.gameobject.GameObjectContainer;
+import net.sf.gridarta.map.MapSquare;
 
 /**
  * The <code>GameObject</code> class handles the Daimonin GameObjects.
@@ -54,7 +55,7 @@
  * normal arches.
  * @todo this class is not always the best place for multipart object handling, see also {@link GameObjectContainer} for issues about this
  */
-public final class GameObject /*extends NamedObject*/ extends GameObjectContainer implements Cloneable, net.sf.gridarta.gameobject.GameObject, Serializable {
+public final class GameObject /*extends NamedObject*/ extends net.sf.gridarta.gameobject.GameObject<GameObject> implements Cloneable, Serializable {
 
     /** Serial Version. */
     private static final long serialVersionUID = 1L;
@@ -164,7 +165,7 @@
      *  <li>A MapSquare, which means that this GameObject is top level on that MapSquare.</li>
      * </ul>
      */
-    private GameObjectContainer container;
+    private GameObjectContainer<GameObject> container;
 
     private int archType;               // CF object type of the arch
 
@@ -202,11 +203,6 @@
         this.archetype = archetype;
     }
 
-    /** {@inheritDoc} */
-    public void setArchetype(final net.sf.gridarta.gameobject.GameObject archetype) {
-        this.archetype = (GameObject) archetype;
-    }
-
     /** Set this to default arch. */
     public void setIsArchetype() {
         this.archetype = this;
@@ -431,32 +427,18 @@
         return isInContainer() ? ((GameObject) container).getTopContainer() : this;
     }
 
-    /**
-     * Sets container of this GameObject.
-     * There are two possibilities for the container:
-     * <ul>
-     *  <li>Another GameObject, which means this object is in the inventory of that GameObject.</li>
-     *  <li>A MapSquare, which means that this GameObject is top level on that MapSquare.</li>
-     * </ul>
-     * @param container container of this GameObject.
-     */
-    public void setContainer(final GameObjectContainer container) {
+    /** {@inheritDoc} */
+    public void setContainer(final GameObjectContainer<GameObject> container) {
         this.container = container;
     }
 
-    /**
-     * Check whether this GameObject is in a Container (in Daimonin sense,
-     * which means being in a MapSquare isn't, but being in an GameObject is).
-     * @return <code>true</code> if this GameObject has a Container and the
-     * Container is an GameObject, otherwise (no Container or Container is not
-     * an GameObject) false
-     */
+    /** {@inheritDoc} */
     public boolean isInContainer() {
         return container != null && container instanceof GameObject;
     }
 
     /** {@inheritDoc} */
-    @Override public MapSquare getMapSquare() {
+    @Override public MapSquare<GameObject> getMapSquare() {
         return container != null ? container.getMapSquare() : null;
     }
 

Deleted: trunk/daimonin/src/daieditor/gameobject/GameObjectContainer.java
===================================================================
--- trunk/daimonin/src/daieditor/gameobject/GameObjectContainer.java	2006-10-07 11:38:41 UTC (rev 483)
+++ trunk/daimonin/src/daieditor/gameobject/GameObjectContainer.java	2006-10-07 13:41:41 UTC (rev 484)
@@ -1,427 +0,0 @@
-/*
- * Daimonin Java Editor.
- * Copyright (C) 2005  Christian Hujer
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-package daieditor.gameobject;
-
-import daieditor.map.MapSquare;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Base class for classes that contain GameObjects as children in the sense of containment.
- * The interface serves 2 main purposes:
- * <ul>
- * <li>{@link GameObject} extends this class for containing other GameObjects, like inventory contents e.g. of a bag or attached events.</li>
- * <li>{@link MapSquare} extends this class to list the tiles on a MapSquare.</li>
- * </ul>
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- * @todo: In case of MapSquares, this class is most likely bogus regarding multipart objects. This needs to be fixed.
- */
-@SuppressWarnings({"ClassReferencesSubclass"})
-public abstract class GameObjectContainer implements Iterable<GameObject>, Serializable {
-
-    /** Serial Version. */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The contents of this container.
-     * @note the order of this container is bottom to top.
-     */
-    @NotNull private List<GameObject> contents;
-
-    /** Iterable implementation for recursice traversal. */
-    @NotNull private transient Iterable<GameObject> recursive;
-
-    /** Iterable implementation for reverse traversal. */
-    @NotNull private transient Iterable<GameObject> reverse;
-
-    /** Create a new GameObjectContainer. */
-    protected GameObjectContainer() {
-        initData();
-    }
-
-    /**
-     * Initialize the fields.
-     * This is needed because there are two ways of object construction,
-     * <ul>
-     * <li>regular object construction via constructor invocation and</li>
-     * <li>cloning of objects via {@link #clone()}.</li>
-     * </ul>
-     */
-    private void initData() {
-        contents = new ArrayList<GameObject>();
-        recursive = new Iterable<GameObject>() {
-            /** {@inheritDoc} */
-            public Iterator<GameObject> iterator() {
-                return new RecursiveGameObjectIterator(GameObjectContainer.this);
-            }
-        };
-        reverse = new Iterable<GameObject>() {
-            /** {@inheritDoc} */
-            public Iterator<GameObject> iterator() {
-                return new ReverseIterator<GameObject>(contents);
-            }
-        }; // Iterable<GameObject> reverse
-    }
-
-    /**
-     * {@inheritDoc}
-     * The Iterator returned does not recurse, it only contains objects on the first level.
-     * The Iterator returned is transparent, that means modifying the iterator's collection actually modifies the underlying GameObjectContainer.
-     */
-    @NotNull public final Iterator<GameObject> iterator() {
-        // Do not return contents.iterator() directly because otherwise the remove() operation will not properly unlink the removed GameObject from its container.
-        return new Iterator<GameObject>() {
-
-            /** The basic iterator. */
-            private Iterator<GameObject> delegate = contents.iterator();
-            private GameObject current;
-
-            /** {@inheritDoc} */
-            public boolean hasNext() {
-                return delegate.hasNext();
-            }
-
-            /** {@inheritDoc} */
-            public GameObject next() {
-                return current = delegate.next();
-            }
-
-            /** {@inheritDoc} */
-            public void remove() {
-                // keep this in sync with GameObjectContainer#remove(GameObject)
-                // we can't simply invoke GameObjectContainer#remove(current) because that would result in a ConcurrentModificationException.
-                delegate.remove();
-                current.setContainer(null);
-                squareChanged();
-            }
-        };
-    }
-
-    /**
-     * Return an object that is the reverse representation.
-     * Invoke this method if you want to iterate over the contained GameObjects in reverse order.
-     * @return reverse representation
-     */
-    @NotNull public final Iterable<GameObject> reverse() {
-        return reverse;
-    }
-
-    /**
-     * Return an object that is a recursive representation.
-     * Invoke this method if you want to iterate over the contained GameObjects recursively.
-     * @return recursive representation
-     */
-    @NotNull public final Iterable<GameObject> recursive() {
-        return recursive;
-    }
-
-    /**
-     * Check whether this square is empty.
-     * @return <code>true</code> if this square is empty, otherwise <code>false</code>
-     */
-    public boolean isEmpty() {
-        return contents.isEmpty();
-    }
-
-    /**
-     * Return the first GameObject contained in this container.
-     * @return first GameObject contained or <code>null</code> if {@link #isEmpty()} returns <code>true</code>
-     */
-    @Nullable public final GameObject getFirst() {
-        return contents.isEmpty() ? null : contents.get(0);
-    }
-
-    /**
-     * Return the last GameObject contained in this container.
-     * You should not invoke this method to iterate over GameObjects, such invocation is regarded deprecated.
-     * @return last GameObject contained or <code>null</code> if {@link #isEmpty()} returns <code>true</code>
-     */
-    @Nullable public final GameObject getLast() {
-        return contents.isEmpty() ? null : contents.get(contents.size() - 1);
-    }
-
-    /**
-     * Remove a GameObject from this container.
-     * @param gameObject GameObject to remove
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    final void remove(@NotNull final GameObject gameObject) {
-        // keep this in sync with iterator()
-        if (!contents.remove(gameObject)) {
-            throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-        }
-        gameObject.setContainer(null);
-        squareChanged();
-    }
-
-    /** Remove all GameObjects from this container. */
-    public final void removeAll() {
-        if (contents.size() <= 0) {
-            return;
-        }
-
-        for (final GameObject gameObject : contents) {
-            gameObject.setContainer(null);
-        }
-        contents.clear();
-        squareChanged();
-    }
-
-    /**
-     * Move an item to top.
-     * @param gameObject item to move to top
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveTop(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex != contents.size() - 1) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Move an item up.
-     * @param gameObject item to move up
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveUp(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex < contents.size() - 1) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(oldIndex + 1, gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Move an item down.
-     * @param gameObject item to move down
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveDown(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex > 0) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(gameObject + " wasn't inside container " + this);
-            }
-            contents.add(oldIndex - 1, gameObject);
-            squareChanged();
-        }
-    }
-
-    /**
-     * Move an item to bottom.
-     * @param gameObject item to move to bottom
-     * @throws IllegalArgumentException if <var>gameObject</var> isn't in this container
-     */
-    public final void moveBottom(@NotNull final GameObject gameObject) {
-        final int oldIndex = contents.indexOf(gameObject);
-        if (oldIndex != 0) {
-            if (!contents.remove(gameObject)) {
-                throw new IllegalArgumentException(ga...
 
[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 361)

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