Thread: [Gridarta-commit] SF.net SVN: gridarta:[8800] trunk (Page 60)

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

Revision: 8800
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8800&view=rev
Author:   akirschbaum
Date:     2010-11-17 19:39:35 +0000 (Wed, 17 Nov 2010)

Log Message:
-----------
Implement File|Goto Map... which opens maps by map name.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
    trunk/daimonin/ChangeLog
    trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
    trunk/gridarta.ipr
    trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
    trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java
    trunk/model/src/test/net/sf/gridarta/model/mapcontrol/TestMapControlCreator.java
    trunk/model/src/test/net/sf/gridarta/model/settings/TestGlobalSettings.java
    trunk/resource/log4j.properties
    trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
    trunk/src/app/net/sf/gridarta/messages.properties

Added Paths:
-----------
    trunk/model/src/app/net/sf/gridarta/model/index/
    trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
    trunk/model/src/app/net/sf/gridarta/model/index/Index.java
    trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java
    trunk/model/src/app/net/sf/gridarta/model/index/MapsIndex.java
    trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java
    trunk/model/src/test/net/sf/gridarta/model/index/
    trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexTest.java
    trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexerTest.java
    trunk/src/app/net/sf/gridarta/gui/gomapdialog/
    trunk/src/app/net/sf/gridarta/gui/gomapdialog/GoMapDialog.java
    trunk/src/app/net/sf/gridarta/gui/gomapdialog/GoMapDialogManager.java
    trunk/src/app/net/sf/gridarta/gui/gomapdialog/MapListCellRenderer.java
    trunk/utils/src/app/net/sf/gridarta/utils/DelayedChangeListener.java
    trunk/utils/src/app/net/sf/gridarta/utils/DelayedChangeManager.java
    trunk/utils/src/app/net/sf/gridarta/utils/Xtea.java
    trunk/utils/src/test/net/sf/gridarta/utils/XteaTest.java

Modified: trunk/atrinik/ChangeLog
===================================================================

--- trunk/atrinik/ChangeLog	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/atrinik/ChangeLog	2010-11-17 19:39:35 UTC (rev 8800)
@@ -1,3 +1,7 @@
+2010-11-17  Andreas Kirschbaum
+
+	* Implement File|Goto Map... which opens maps by map name.
+
 2010-11-07  Andreas Kirschbaum
 
 	* Force non-GUI mode when using --script.

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/action.properties	2010-11-17 19:39:35 UTC (rev 8800)
@@ -25,7 +25,7 @@
 ########
 # Menus
 main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
 edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/crossfire/ChangeLog	2010-11-17 19:39:35 UTC (rev 8800)
@@ -1,3 +1,7 @@
+2010-11-17  Andreas Kirschbaum
+
+	* Implement File|Goto Map... which opens maps by map name.
+
 2010-11-07  Andreas Kirschbaum
 
 	* Force non-GUI mode when using --script.

Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/action.properties	2010-11-17 19:39:35 UTC (rev 8800)
@@ -25,7 +25,7 @@
 ########
 # Menus
 main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
 edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap tileShow - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/daimonin/ChangeLog	2010-11-17 19:39:35 UTC (rev 8800)
@@ -1,3 +1,7 @@
+2010-11-17  Andreas Kirschbaum
+
+	* Implement File|Goto Map... which opens maps by map name.
+
 2010-11-07  Andreas Kirschbaum
 
 	* Force non-GUI mode when using --script.

Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/action.properties	2010-11-17 19:39:35 UTC (rev 8800)
@@ -25,7 +25,7 @@
 ########
 # Menus
 main.menubar=file edit map archetypes pickmaps resources tools analyze view bookmarks plugins window help
-file.menu=newMap openFile recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
+file.menu=newMap openFile goMap recent closeMap - saveMap saveMapAs saveAllMaps - closeAllMaps revertMap createImage - options shortcuts - exit
 edit.menu=undo redo - clear cut copy paste pasteTiled - shift - replace fillAuto fillAbove fillBelow randFillAuto randFillAbove randFillBelow floodFill - selectAll expandEmptySelection growSelection shrinkSelection
 map.menu=autoJoin - enterExit nextExit prevExit enterNorthMap enterEastMap enterSouthMap enterWestMap enterNorthEastMap enterSouthEastMap enterSouthWestMap enterNorthWestMap - mapCreateView mapProperties shrinkMapSize deleteUnknownObjects - gameObjectTextEditor
 archetypes.menu=displayGameObjectNames displayArchetypeNames displayIconsOnly - findArchetypes

Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/gridarta.ipr	2010-11-17 19:39:35 UTC (rev 8800)
@@ -1400,6 +1400,7 @@
         <w>xnoagent</w>
         <w>xrunhprof</w>
         <w>xrunjdwp</w>
+        <w>xtea</w>
         <w>yoyodyne</w>
         <w>zergus</w>
       </words>

Added: trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java	                        (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,369 @@
+/*
+ * 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.model.index;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import net.sf.gridarta.utils.EventListenerList2;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Abstract base class for {@link Index} implementations.
+ * @author Andreas Kirschbaum
+ * @param <V> the value's type
+ */
+public class AbstractIndex<V extends Serializable> implements Index<V> {
+
+    /**
+     * Objects used to synchronize accesses to other fields.
+     * @serial
+     */
+    @NotNull
+    private final Object sync = new Object();
+
+    /**
+     * The registered listeners.
+     */
+    @NotNull
+    private final EventListenerList2<IndexListener<V>> indexListeners = new EventListenerList2<IndexListener<V>>(IndexListener.class);
+
+    /**
+     * Maps value to timestamp.
+     * @serial
+     */
+    @NotNull
+    private Map<V, Long> timestamps = new HashMap<V, Long>();
+
+    /**
+     * Maps value to name.
+     * @serial
+     */
+    @NotNull
+    private Map<V, String> names = new HashMap<V, String>();
+
+    /**
+     * Pending values.
+     * @serial
+     */
+    @NotNull
+    private Set<V> pending = new HashSet<V>();
+
+    /**
+     * Whether the state ({@link #timestamps} or {@link #names}) was modified
+     * since last save.
+     */
+    private boolean modified = false;
+
+    /**
+     * Whether a transaction is active.
+     */
+    private boolean transaction = false;
+
+    /**
+     * The values to delete at the end of the current transaction. Empty if no
+     * transaction is active.
+     * @serial
+     */
+    @NotNull
+    private final Collection<V> transactionDelete = new HashSet<V>();
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int size() {
+        return timestamps.size();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    public Collection<V> findPartialName(@NotNull final String name) {
+        synchronized (sync) {
+            final String nameLowerCase = name.toLowerCase();
+            final Collection<V> result = new HashSet<V>();
+            for (final Map.Entry<V, String> e : names.entrySet()) {
+                if (e.getValue().toLowerCase().contains(nameLowerCase)) {
+                    result.add(e.getKey());
+                }
+            }
+            return result;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void beginUpdate() {
+        synchronized (sync) {
+            transaction = true;
+            transactionDelete.clear();
+            transactionDelete.addAll(timestamps.keySet());
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void endUpdate() {
+        synchronized (sync) {
+            if (!transaction) {
+                throw new IllegalStateException();
+            }
+            transaction = false;
+
+            final Collection<V> tmp = new ArrayList<V>(transactionDelete);
+            transactionDelete.clear();
+            if (!tmp.isEmpty()) {
+                modified = true;
+                for (final V value : tmp) {
+                    timestamps.remove(value);
+                    pending.remove(value);
+                    names.remove(value);
+                }
+                for (final V value : tmp) {
+                    for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                        listener.valueRemoved(value);
+                        listener.nameChanged();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void add(@NotNull final V value, final long timestamp) {
+        synchronized (sync) {
+            final Long oldTimestamp = timestamps.put(value, timestamp);
+            final boolean notifyPending;
+            final boolean notifyAdded;
+            if (oldTimestamp == null || oldTimestamp != timestamp) {
+                notifyPending = pending.add(value) && pending.size() == 1;
+                notifyAdded = oldTimestamp == null;
+                modified = true;
+            } else {
+                notifyPending = false;
+                notifyAdded = false;
+            }
+            transactionDelete.remove(value);
+            if (notifyAdded) {
+                for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                    listener.valueAdded(value);
+                }
+            }
+            if (notifyPending) {
+                for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                    listener.pendingChanged();
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void remove(@NotNull final V value) {
+        synchronized (sync) {
+            if (timestamps.remove(value) == null) {
+                return;
+            }
+            modified = true;
+            pending.remove(value);
+            names.remove(value);
+            for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                listener.valueRemoved(value);
+                listener.nameChanged();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setPending(@NotNull final V value) {
+        synchronized (sync) {
+            final boolean notifyPending = pending.add(value) && pending.size() == 1;
+            if (!timestamps.containsKey(value)) {
+                modified = true;
+                timestamps.put(value, 0L);
+                for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                    listener.valueAdded(value);
+                }
+            }
+            if (notifyPending) {
+                for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                    listener.pendingChanged();
+                }
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setName(@NotNull final V value, final long timestamp, @NotNull final String name) {
+        synchronized (sync) {
+            timestamps.put(value, timestamp);
+            final String oldName = names.put(value, name);
+            if (oldName != null && oldName.equals(name)) {
+                return;
+            }
+            modified = true;
+            for (final IndexListener<V> listener : indexListeners.getListeners()) {
+                listener.nameChanged();
+            }
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nullable
+    @Override
+    public String getName(@NotNull final V value) {
+        synchronized (sync) {
+            return names.get(value);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nullable
+    @Override
+    public V removePending() {
+        synchronized (sync) {
+            final Iterator<V> it = pending.iterator();
+            if (!it.hasNext()) {
+                return null;
+            }
+
+            final V result = it.next();
+            it.remove();
+            return result;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean isModified() {
+        synchronized (sync) {
+            return modified;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void addIndexListener(@NotNull final IndexListener<V> listener) {
+        indexListeners.add(listener);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void removeIndexListener(@NotNull final IndexListener<V> listener) {
+        indexListeners.remove(listener);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void save(@NotNull final ObjectOutputStream objectOutputStream) throws IOException {
+        objectOutputStream.writeObject(timestamps);
+        objectOutputStream.writeObject(names);
+        modified = false;
+    }
+
+    /**
+     * {@inheritDoc}
+     * @noinspection unchecked
+     */
+    @Override
+    @SuppressWarnings({ "unchecked" })
+    public void load(@NotNull final ObjectInputStream objectInputStream) throws IOException {
+        final Map<V, Long> tmpTimestamps;
+        final Map<V, String> tmpNames;
+        try {
+            tmpTimestamps = (Map<V, Long>) objectInputStream.readObject();
+            tmpNames = (Map<V, String>) objectInputStream.readObject();
+        } catch (final ClassNotFoundException ex) {
+            throw new IOException(ex.getMessage(), ex);
+        }
+        if (transaction) {
+            throw new IOException("cannot restore state within active transaction");
+        }
+
+        // drop excess elements from tmpNames to force a consistent state
+        tmpNames.keySet().retainAll(tmpTimestamps.keySet());
+
+        clear();
+        timestamps.putAll(tmpTimestamps);
+        names.putAll(tmpNames);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void clear() {
+        timestamps.clear();
+        names.clear();
+        pending.clear();
+        transactionDelete.clear();
+        modified = false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void indexingFinished() {
+        for (final IndexListener<V> listener : indexListeners.getListeners()) {
+            listener.indexingFinished();
+        }
+    }
+
+} // class AbstractIndex


Property changes on: trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Added: trunk/model/src/app/net/sf/gridarta/model/index/Index.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/Index.java	                        (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/index/Index.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,161 @@
+/*
+ * 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.model.index;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * An index of values. Values are associated with a timestamp and zero or one
+ * name. The timestamp is used to mark values as pending whenever they have
+ * changed. Pending values may be retrieved for re-indexing.
+ * <p/>
+ * Values may be looked up by partial names.
+ * <p/>
+ * All methods are synchronized: concurrent access from multiple threads is
+ * supported.
+ * @author Andreas Kirschbaum
+ * @param <V> the value's type
+ */
+public interface Index<V> {
+
+    /**
+     * Returns the number of values in this cache.
+     * @return the number of values
+     */
+    int size();
+
+    /**
+     * Returns all matching values for a (possibly partial) key name.
+     * @param name the partial name to look up
+     * @return the matching values
+     */
+    @NotNull
+    Collection<V> findPartialName(@NotNull String name);
+
+    /**
+     * Starts an update. Updates do not nest. This function and {@link
+     * #endUpdate()} should be called from only a single thread.
+     */
+    void beginUpdate();
+
+    /**
+     * Ends an update. Removes all values from the index that were not {@link
+     * #add(Object, long) added} since the last call to {@link #beginUpdate()}.
+     * Must not be called unless a directly preceding call to
+     * <code>beginUpdate()</code> was made.
+     */
+    void endUpdate();
+
+    /**
+     * Adds a value to the cache. Newly added values and existing values for
+     * which the new timestamp does not match the old timestamp are marked as
+     * pending.
+     * @param value the value to add
+     * @param timestamp a timestamp associated with the value
+     */
+    void add(@NotNull V value, long timestamp);
+
+    /**
+     * Removes a value from the cache. Does nothing if the values does not
+     * exist.
+     * @param value the value to remove
+     */
+    void remove(@NotNull V value);
+
+    /**
+     * Marks a value as pending. The value is added if it does not exist.
+     * @param value the value to mark pending
+     */
+    void setPending(@NotNull V value);
+
+    /**
+     * Associates a value with a name. Adds the value if it does not exist.
+     * @param value the value to associate with a name
+     * @param timestamp the value's timestamp
+     * @param name the name associated with the value
+     */
+    void setName(@NotNull V value, long timestamp, @NotNull String name);
+
+    /**
+     * Returns the name associated with a value.
+     * @param value the value
+     * @return the name or <code>null</code> if the value does not exist or has
+     *         no associated name
+     */
+    @Nullable
+    String getName(@NotNull V value);
+
+    /**
+     * Returns one pending value.
+     * @return a pending value or <code>null</code> if no pending values exist
+     */
+    @Nullable
+    V removePending();
+
+    /**
+     * Returns whether the state was modified since last save.
+     * @return whether the state was modified
+     */
+    boolean isModified();
+
+    /**
+     * Adds an {@link IndexListener} to be notified of changes.
+     * @param listener the index listener to add
+     */
+    void addIndexListener(@NotNull IndexListener<V> listener);
+
+    /**
+     * Removes an {@link IndexListener} to be notified of changes.
+     * @param listener the index listener to remove
+     */
+    void removeIndexListener(@NotNull IndexListener<V> listener);
+
+    /**
+     * Saves the state to an {@link ObjectOutputStream}. Pending maps are not
+     * saved.
+     * @param objectOutputStream the object output stream to write to
+     * @throws IOException if an I/O error occurs
+     */
+    void save(@NotNull ObjectOutputStream objectOutputStream) throws IOException;
+
+    /**
+     * Restores the state from an {@link ObjectInputStream}. The previous state
+     * is overwritten.
+     * @param objectInputStream the input stream to read from
+     * @throws IOException if an I/O error occurs
+     */
+    void load(@NotNull ObjectInputStream objectInputStream) throws IOException;
+
+    /**
+     * Clears all values from the index.
+     */
+    void clear();
+
+    /**
+     * Should be called after indexing has finished.
+     */
+    void indexingFinished();
+
+} // interface Index


Property changes on: trunk/model/src/app/net/sf/gridarta/model/index/Index.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Added: trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java	                        (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,59 @@
+/*
+ * 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.model.index;
+
+import java.util.EventListener;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Interface for listeners interested in {@link Index} related events.
+ * @param <V> the index's value's type
+ * @author Andreas Kirschbaum
+ */
+public interface IndexListener<V> extends EventListener {
+
+    /**
+     * A new value has been added to the index.
+     * @param value the value
+     */
+    void valueAdded(@NotNull V value);
+
+    /**
+     * A value has been removed from the index.
+     * @param value the value
+     */
+    void valueRemoved(@NotNull V value);
+
+    /**
+     * A name mapping has changed.
+     */
+    void nameChanged();
+
+    /**
+     * At least one pending value has become available.
+     */
+    void pendingChanged();
+
+    /**
+     * Called after indexing has finished.
+     */
+    void indexingFinished();
+
+} // interface IndexListener


Property changes on: trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Added: trunk/model/src/app/net/sf/gridarta/model/index/MapsIndex.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/MapsIndex.java	                        (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/index/MapsIndex.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,30 @@
+/*
+ * 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.model.index;
+
+import java.io.File;
+
+/**
+ * Indexes maps by map name. Allows searching for maps by partial map name.
+ * @author Andreas Kirschbaum
+ */
+public class MapsIndex extends AbstractIndex<File> {
+
+} // class MapsIndex


Property changes on: trunk/model/src/app/net/sf/gridarta/model/index/MapsIndex.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Added: trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java	                        (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,585 @@
+/*
+ * 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.model.index;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.concurrent.Semaphore;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.model.mapcontrol.DefaultMapControl;
+import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapcontrol.MapControlListener;
+import net.sf.gridarta.model.mapmanager.MapManager;
+import net.sf.gridarta.model.mapmanager.MapManagerListener;
+import net.sf.gridarta.model.settings.GlobalSettings;
+import net.sf.gridarta.model.settings.GlobalSettingsListener;
+import net.sf.gridarta.utils.ConfigFileUtils;
+import net.sf.gridarta.utils.Xtea;
+import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Maintains a {@link MapsIndex} for the maps directory. Changed maps are
+ * tracked and the index is updated.
+ * @author Andreas Kirschbaum
+ */
+public class MapsIndexer<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+
+    /**
+     * The Logger for printing log messages.
+     */
+    @NotNull
+    private static final Category log = Logger.getLogger(MapsIndexer.class);
+
+    /**
+     * A pending map may exist in {@link #mapsIndex} if a permit is available.
+     */
+    @NotNull
+    private final Semaphore mapsIndexSemaphore = new Semaphore(1);
+
+    /**
+     * The {@link MapsIndex} being updated.
+     */
+    @NotNull
+    private final MapsIndex mapsIndex;
+
+    /**
+     * The {@link MapManager} for loading map files.
+     */
+    @NotNull
+    private final MapManager<G, A, R> mapManager;
+
+    /**
+     * The {@link GlobalSettings} instance.
+     */
+    @NotNull
+    private final GlobalSettings globalSettings;
+
+    /**
+     * The object for synchronizing access to {@link #mapsDirectory} and {@link
+     * #newMapsDirectory}.
+     */
+    @NotNull
+    private final Object syncMapsDirectory = new Object();
+
+    /**
+     * The currently indexed maps directory.
+     */
+    @Nullable
+    private File mapsDirectory = null;
+
+    /**
+     * The maps directory to index. If <code>null</code>, {@link #mapsDirectory}
+     * is valid.
+     */
+    @Nullable
+    private File newMapsDirectory = null;
+
+    /**
+     * The object for synchronizing access to {@link #state}.
+     */
+    @NotNull
+    private final Object syncState = new Object();
+
+    /**
+     * The indexer state.
+     */
+    @NotNull
+    private State state = State.INIT;
+
+    /**
+     * Indexer states.
+     */
+    private enum State {
+
+        /**
+         * Indexer has been created but is not yet running.
+         */
+        INIT,
+
+        /**
+         * Indexer is scanning the maps directory searching for files differing
+         * to the current index.
+         */
+        SCAN,
+
+        /**
+         * Indexer is indexing maps differing from the current index.
+         */
+        INDEX,
+
+        /**
+         * Indexer is idle; the current index is up-to-date.
+         */
+        IDLE
+
+    }
+
+    /**
+     * The {@link MapManagerListener} attached to {@link #mapManager} to detect
+     * current map changes.
+     */
+    private final MapManagerListener<G, A, R> mapManagerListener = new MapManagerListener<G, A, R>() {
+
+        @Override
+        public void currentMapChanged(@Nullable final MapControl<G, A, R> mapControl) {
+            // ignore
+        }
+
+        @Override
+        public void mapCreated(@NotNull final MapControl<G, A, R> mapControl, final boolean interactive) {
+            if (!mapControl.isPickmap()) {
+                mapControl.addMapControlListener(mapControlListener);
+            }
+        }
+
+        @Override
+        public void mapClosing(@NotNull final MapControl<G, A, R> mapControl) {
+            // ignore
+        }
+
+        @Override
+        public void mapClosed(@NotNull final MapControl<G, A, R> mapControl) {
+            if (!mapControl.isPickmap()) {
+                mapControl.removeMapControlListener(mapControlListener);
+            }
+        }
+
+    };
+
+    /**
+     * The {@link MapControlListener} attached to all opened maps.
+     */
+    @NotNull
+    private final MapControlListener<G, A, R> mapControlListener = new MapControlListener<G, A, R>() {
+
+        @Override
+        public void saved(@NotNull final DefaultMapControl<G, A, R> mapControl) {
+            final File file = mapControl.getMapModel().getMapFile();
+            if (file != null) {
+                mapsIndex.setPending(file);
+            }
+        }
+
+    };
+
+    /**
+     * The {@link GlobalSettingsListener} attached to {@link #globalSettings}
+     * for tracking changed maps directories.
+     */
+    @NotNull
+    private final GlobalSettingsListener globalSettingsListener = new GlobalSettingsListener() {
+
+        @Override
+        public void showMainToolbarChanged(final boolean visible) {
+            // ignore
+        }
+
+        @Override
+        public void mapsDirectoryChanged(@NotNull final File mapsDirectory) {
+            synchronized (syncMapsDirectory) {
+                newMapsDirectory = globalSettings.getMapsDirectory();
+            }
+        }
+
+    };
+
+    /**
+     * The {@link IndexListener} attached to {@link #mapsIndex} to detect newly
+     * added pending maps.
+     */
+    @NotNull
+    private final IndexListener<File> indexListener = new IndexListener<File>() {
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void valueAdded(@NotNull final File value) {
+            // ignore
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void valueRemoved(@NotNull final File value) {
+            // ignore
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void nameChanged() {
+            // ignore
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void pendingChanged() {
+            mapsIndexSemaphore.release();
+        }
+
+        @Override
+        public void indexingFinished() {
+            // ignore
+        }
+
+    };
+
+    /**
+     * The {@link Runnable} scanning the maps directory and updating the index.
+     */
+    @NotNull
+    private final Runnable runnable = new Runnable() {
+
+        @Override
+        public void run() {
+            while (!Thread.currentThread().isInterrupted()) {
+                updateMapsDirectory();
+                indexPendingMaps();
+                if (state == State.IDLE) {
+                    try {
+                        mapsIndexSemaphore.acquire();
+                    } catch (final InterruptedException ignored) {
+                        Thread.currentThread().interrupt();
+                        break;
+                    }
+                }
+            }
+        }
+
+    };
+
+    /**
+     * The {@link Thread} executing {@link #runnable}.
+     */
+    @NotNull
+    private final Thread thread = new Thread(runnable, "indexer");
+
+    /**
+     * Creates a new instance.
+     * @param mapsIndex the maps index to update
+     * @param mapManager the map manager for loading map files
+     * @param globalSettings the global settings instance; defines the indexed
+     * maps directory
+     */
+    public MapsIndexer(@NotNull final MapsIndex mapsIndex, @NotNull final MapManager<G, A, R> mapManager, @NotNull final GlobalSettings globalSettings) {
+        this.mapsIndex = mapsIndex;
+        this.mapManager = mapManager;
+        this.globalSettings = globalSettings;
+        reportStateChange();
+    }
+
+    /**
+     * Starts indexing. Must not be called more than once.
+     */
+    public void start() {
+        globalSettings.addGlobalSettingsListener(globalSettingsListener);
+        mapManager.addMapManagerListener(mapManagerListener);
+        synchronized (syncMapsDirectory) {
+            newMapsDirectory = globalSettings.getMapsDirectory();
+        }
+        mapsIndex.addIndexListener(indexListener);
+        thread.start();
+    }
+
+    /**
+     * Stops indexing. Must not be called more than once or before {@link
+     * #start()} has been called.
+     * @throws InterruptedException if the current thread was interrupted
+     */
+    public void stop() throws InterruptedException {
+        try {
+            thread.interrupt();
+            thread.join();
+        } finally {
+            globalSettings.removeGlobalSettingsListener(globalSettingsListener);
+            mapManager.removeMapManagerListener(mapManagerListener);
+            for (final MapControl<G, A, R> mapControl : mapManager.getOpenedMaps()) {
+                if (!mapControl.isPickmap()) {
+                    mapControl.removeMapControlListener(mapControlListener);
+                }
+            }
+            mapsIndex.removeIndexListener(indexListener);
+        }
+
+        synchronized (syncMapsDirectory) {
+            saveMapsIndex();
+        }
+    }
+
+    /**
+     * Blocks the calling thread until all pending maps have been indexed.
+     * @throws InterruptedException if the current thread was interrupted during
+     * wait
+     */
+    public void waitForIdle() throws InterruptedException {
+        synchronized (syncState) {
+            while (state != State.IDLE) {
+                syncState.wait(1000);
+            }
+        }
+    }
+
+    /**
+     * Checks whether {@link #newMapsDirectory} has been set and updates {@link
+     * #mapsDirectory} accordingly.
+     */
+    private void updateMapsDirectory() {
+        final File tmpMapsDirectory;
+        synchronized (syncMapsDirectory) {
+            if (newMapsDirectory == null || (mapsDirectory != null && mapsDirectory.equals(newMapsDirectory))) {
+                return;
+            }
+
+            setState(State.SCAN);
+
+            saveMapsIndex();
+
+            tmpMapsDirectory = newMapsDirectory;
+            assert tmpMapsDirectory != null;
+            mapsDirectory = tmpMapsDirectory;
+            newMapsDirectory = null;
+
+            loadMapsIndex();
+        }
+        mapsIndex.beginUpdate();
+        scanMapsDirectoryInt(tmpMapsDirectory, "");
+        mapsIndex.endUpdate();
+    }
+
+    /**
+     * Saves {@link #mapsIndex} to its cache file if modified.
+     */
+    private void saveMapsIndex() {
+        assert Thread.holdsLock(syncMapsDirectory);
+        if (mapsDirectory == null) {
+            return;
+        }
+
+        if (!globalSettings.saveIndices()) {
+            return;
+        }
+
+        if (!mapsIndex.isModified()) {
+            return;
+        }
+
+        assert mapsDirectory != null;
+        final File cacheFile = getCacheFile(mapsDirectory);
+        try {
+            final OutputStream outputStream = new FileOutputStream(cacheFile);
+            try {
+                final ObjectOutputStream objectOutputStream = new ObjectOutputStream(outputStream);
+                try {
+                    mapsIndex.save(objectOutputStream);
+                } finally {
+                    objectOutputStream.close();
+                }
+            } finally {
+                outputStream.close();
+            }
+            if (log.isInfoEnabled()) {
+                log.info(cacheFile + ": saved " + mapsIndex.size() + " entries");
+            }
+        } catch (final IOException ex) {
+            log.warn(cacheFile + ": cannot save cache file: " + ex.getMessage());
+        }
+    }
+
+    /**
+     * Loads {@link #mapsIndex} from its cache file.
+     */
+    private void loadMapsIndex() {
+        assert Thread.holdsLock(syncMapsDirectory);
+        assert mapsDirectory != null;
+        final File cacheFile = getCacheFile(mapsDirectory);
+        try {
+            final InputStream inputStream = new FileInputStream(cacheFile);
+            try {
+                final ObjectInputStream objectInputStream = new ObjectInputStream(inputStream);
+                try {
+                    mapsIndex.load(objectInputStream);
+                } finally {
+                    objectInputStream.close();
+                }
+            } finally {
+                inputStream.close();
+            }
+            if (log.isInfoEnabled()) {
+                log.info(cacheFile + ": loaded " + mapsIndex.size() + " entries");
+            }
+        } catch (final FileNotFoundException ex) {
+            if (log.isDebugEnabled()) {
+                log.debug(cacheFile + ": cache file does not exist: " + ex.getMessage());
+            }
+            mapsIndex.clear();
+        } catch (final IOException ex) {
+            log.warn(cacheFile + ": cannot load cache file: " + ex.getMessage());
+            mapsIndex.clear();
+        }
+    }
+
+    /**
+     * Scans a directory for files. Adds all files found to {@link #mapsIndex}.
+     * @param dir the directory to scan
+     * @param mapPath the map path corresponding to <code>dir</code>
+     */
+    private void scanMapsDirectoryInt(@NotNull final File dir, @NotNull final String mapPath) {
+        final File[] files = dir.listFiles();
+        if (files == null) {
+            return;
+        }
+
+        for (final File file : files) {
+            if (file.isFile()) {
+                mapsIndex.add(file, file.lastModified());
+            } else if (file.isDirectory() && !file.getName().equalsIgnoreCase(".svn") && !file.getName().equalsIgnoreCase(".dedit")) {
+                scanMapsDirectoryInt(file, mapPath + "/" + file.getName());
+            }
+        }
+    }
+
+    /**
+     * Indexes one pending map from {@link #mapsIndex}. Does nothing if no
+     * pending map exists.
+     */
+    private void indexPendingMaps() {
+        final File file = mapsIndex.removePending();
+        if (file == null) {
+            setState(State.IDLE);
+            return;
+        }
+
+        setState(State.INDEX);
+        final long timestamp = file.lastModified();
+        final MapControl<G, A, R> mapControl;
+        try {
+            mapControl = mapManager.openMapFile(file, false);
+        } catch (final IOException ex) {
+            if (log.isInfoEnabled()) {
+                log.info(file + ": load failed:" + ex.getMessage());
+            }
+            return;
+        }
+        try {
+            final String mapName = mapControl.getMapModel().getMapArchObject().getMapName();
+            if (log.isDebugEnabled()) {
+                log.debug(file + ": indexing as '" + mapName + "'");
+            }
+            mapsIndex.setName(file, timestamp, mapName);
+        } finally {
+            mapManager.release(mapControl);
+        }
+    }
+
+    /**
+     * Returns the cache file for a given maps directory.
+     * @param mapsDirectory the maps directory
+     * @return the cache file
+     */
+    @NotNull
+    private static File getCacheFile(@NotNull final File mapsDirectory) {
+        final byte[] key = new byte[16];
+        final Xtea xtea = new Xtea(key);
+        final byte[] data;
+        try {
+            data = mapsDirectory.getAbsoluteFile().toString().getBytes("UTF-8");
+        } catch (final UnsupportedEncodingException ex) {
+            throw new AssertionError(ex); // UTF-8 must be supported
+        }
+        final byte[] hash = new byte[8];
+        final byte[] in = new byte[8];
+        final byte[] out = new byte[8];
+        int i;
+        for (i = 0; i + 8 < data.length; i++) {
+            System.arraycopy(data, i, in, 0, 8);
+            xtea.encrypt(in, out);
+            for (int j = 0; j < 8; j++) {
+                hash[j] ^= out[j];
+            }
+        }
+        final int len = data.length % 8;
+        System.arraycopy(data, i, in, 0, len);
+        in[len] = (byte) 1;
+        Arrays.fill(in, len + 1, 8, (byte) 0);
+        xtea.encrypt(in, out);
+        for (int j = 0; j < 8; j++) {
+            hash[j] ^= out[j];
+        }
+
+        final StringBuilder sb = new StringBuilder("index/maps/");
+        for (int j = 0; j < 8; j++) {
+            sb.append(String.format("%02x", hash[j] & 0xff));
+        }
+        sb.append(mapsDirectory.getName());
+        final File file = ConfigFileUtils.getHomeFile(sb.toString());
+        final File dir = file.getParentFile();
+        if (dir != null && !dir.exists() && !dir.mkdirs()) {
+            log.warn("cannot create directory: " + dir);
+        }
+        return file;
+    }
+
+    /**
+     * Sets a new value to {@link #state}. Logs changed values.
+     * @param state the new state
+     */
+    private void setState(@NotNull final State state) {
+        synchronized (syncState) {
+            if (this.state == state) {
+                return;
+            }
+
+            this.state = state;
+            reportStateChange();
+            syncState.notifyAll();
+        }
+    }
+
+    /**
+     * Logs a changed value of {@link #state}.
+     */
+    private void reportStateChange() {
+        if (log.isDebugEnabled()) {
+            log.debug("state=" + state);
+        }
+
+        mapsIndex.indexingFinished();
+    }
+
+} // class MapsIndexer


Property changes on: trunk/model/src/app/net/sf/gridarta/model/index/MapsIndexer.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Modified: trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -530,4 +530,12 @@
         preferences.put(PREFERENCES_USER_NAME, userName);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean saveIndices() {
+        return true;
+    }
+
 } // class DefaultGlobalSettings

Modified: trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java	2010-11-17 18:25:31 UTC (rev 8799)
+++ trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -231,4 +231,10 @@
      */
     void removeGlobalSettingsListener(@NotNull GlobalSettingsListener listener);
 
+    /**
+     * Returns whether indices should be saved to disk.
+     * @return whether indices should be saved to disk
+     */
+    boolean saveIndices();
+
 } // interface GlobalSettings

Added: trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexTest.java	                        (rev 0)
+++ trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexTest.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,256 @@
+/*
+ * 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.model.index;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.TreeSet;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link MapsIndex}.
+ * @author Andreas Kirschbaum
+ */
+public class MapsIndexTest {
+
+    /**
+     * Checks that values are correctly marked as pending.
+     */
+    @Test
+    public void test1() {
+        final Index<File> index = new MapsIndex();
+        index.add(new File("a"), 1);
+        index.add(new File("b"), 1);
+        index.add(new File("c"), 1);
+        Assert.assertEquals("a,b,c", getPending(index));
+        Assert.assertEquals("", getPending(index));
+        index.add(new File("d"), 1);
+        Assert.assertEquals("d", getPending(index));
+        index.add(new File("b"), 1);
+        index.add(new File("d"), 1);
+        Assert.assertEquals("", getPending(index));
+        index.add(new File("b"), 2);
+        index.add(new File("d"), 2);
+        Assert.assertEquals("b,d", getPending(index));
+        index.setPending(new File("a"));
+        Assert.assertEquals("a", getPending(index));
+        index.setPending(new File("a"));
+        index.add(new File("b"), 3);
+        index.add(new File("c"), 3);
+        index.remove(new File("b"));
+        Assert.assertEquals("a,c", getPending(index));
+    }
+
+    /**
+     * Checks that {@link Index#findPartialName(String)} works as expected.
+     */
+    @Test
+    public void testFind1() {
+        final Index<File> index = new MapsIndex();
+        Assert.assertEquals("", findPartialName(index, "a"));
+        index.add(new File("abc"), 1);
+        index.setName(new File("abc"), 1, "abC");
+        Assert.assertEquals("abc", findPartialName(index, "a"));
+        Assert.assertEquals("abc", findPartialName(index, "b"));
+        Assert.assertEquals("", findPartialName(index, "x"));
+        index.add(new File("bcd"), 1);
+        index.setName(new File("bcd"), 1, "BcD");
+        Assert.assertEquals("abc", findPartialName(index, "a"));
+        Assert.assertEquals("abc,bcd", findPartialName(index, "b"));
+        Assert.assertEquals("abc,bcd", findPartialName(index, "Bc"));
+        Assert.assertEquals("", findPartialName(index, "x"));
+    }
+
+    /**
+     * Checks that {@link Index#beginUpdate()} and {@link Index#endUpdate()}
+     * works as expected.
+     */
+    @Test
+    public void testTransaction() {
+        final Index<File> index = new MapsIndex();
+        index.add(new File("a"), 1);
+        index.add(new File("b"), 1);
+        index.add(new File("c"), 1);
+        index.setName(new File("a"), 2, "a");
+        index.setName(new File("b"), 2, "a");
+        index.setName(new File("c"), 2, "a");
+        index.beginUpdate();
+        index.add(new File("b"), 1);
+        index.add(new File("c"), 2);
+        index.add(new File("d"), 2);
+        index.endUpdate();
+        index.setName(new File("b"), 2, "a");
+        index.setName(new File("c"), 2, "a");
+        index.setName(new File("d"), 2, "a");
+        Assert.assertEquals("b,c,d", findPartialName(index, "a"));
+    }
+
+    /**
+     * Checks that listeners are notified.
+     */
+    @Test
+    public void testListener() {
+        final Index<File> index = new MapsIndex();
+        final Listener listener = new Listener();
+        index.addIndexListener(listener);
+
+        index.add(new File("a"), 1);
+        Assert.assertEquals("add a\n" + "pending changed\n", listener.getAndClearEvents());
+
+        index.add(new File("a"), 1);
+        Assert.assertEquals("", listener.getAndClearEvents());
+
+        index.add(new File("a"), 2);
+        Assert.assertEquals("", listener.getAndClearEvents());
+
+        index.add(new File("b"), 2);
+        index.add(new File("c"), 2);
+        Assert.assertEquals("add b\n" + "add c\n", listener.getAndClearEvents());
+
+        index.remove(new File("b"));
+        Assert.assertEquals("del b\n" + "name changed\n", listener.getAndClearEvents());
+
+        index.setName(new File("a"), 2, "name1");
+        index.setName(new File("b"), 2, "name2");
+        index.setName(new File("c"), 2, "name3");
+        Assert.assertEquals("name changed\n" + "name changed\n" + "name changed\n", listener.getAndClearEvents());
+    }
+
+    /**
+     * Returns all pending values of a {@link MapsIndex}. Afterwards the pending
+     * entries have been removed from the index.
+     * @param index the index
+     * @return the pending values
+     */
+    @NotNull
+    private static String getPending(@NotNull final Index<File> index) {
+        final Collection<File> pendingFiles = new HashSet<File>();
+        for (; ;) {
+            final File pendingFile = index.removePending();
+            if (pendingFile == null) {
+                break;
+            }
+            pendingFiles.add(pendingFile);
+        }
+        return format(pendingFiles);
+    }
+
+    /**
+     * Calls {@link Index#findPartialName(String)} on the given {@link Index}
+     * and name and returns a string representation of the result.
+     * @param index the index
+     * @param name the name
+     * @return the string representation
+     */
+    @NotNull
+    private static String findPartialName(@NotNull final Index<File> index, @NotNull final String name) {
+        return format(index.findPartialName(name));
+    }
+
+    /**
+     * Returns a text representation of a {@link Collection}.
+     * @param files the collection
+     * @return the text representation
+     */
+    @NotNull
+    private static String format(@NotNull final Collection<File> files) {
+        final TreeSet<File> tmp = new TreeSet<File>(files);
+        final StringBuilder sb = new StringBuilder();
+        final Iterator<File> it = tmp.iterator();
+        if (it.hasNext()) {
+            sb.append(it.next());
+            while (it.hasNext()) {
+                sb.append(',');
+                sb.append(it.next());
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * An {@link IndexListener} that records a text representation of all
+     * generated events.
+     */
+    private static class Listener implements IndexListener<File> {
+
+        /**
+         * The recorded events in text representation.
+         */
+        @NotNull
+        private final StringBuilder stringBuilder = new StringBuilder();
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void valueAdded(@NotNull final File value) {
+            stringBuilder.append("add ").append(value).append("\n");
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void valueRemoved(@NotNull final File value) {
+            stringBuilder.append("del ").append(value).append("\n");
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void nameChanged() {
+            stringBuilder.append("name changed\n");
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void pendingChanged() {
+            stringBuilder.append("pending changed\n");
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public void indexingFinished() {
+            stringBuilder.append("indexing finished");
+        }
+
+        /**
+         * Returns the accumulated events.
+         * @return the events
+         */
+        @NotNull
+        public String getAndClearEvents() {
+            final String result = stringBuilder.toString();
+            stringBuilder.setLength(0);
+            return result;
+        }
+
+    }
+
+} // class MapsIndexTest


Property changes on: trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + LF

Added: trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexerTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexerTest.java	                        (rev 0)
+++ trunk/model/src/test/net/sf/gridarta/model/index/MapsIndexerTest.java	2010-11-17 19:39:35 UTC (rev 8800)
@@ -0,0 +1,179 @@
+/*
+ * 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.model.index;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import net.sf.gridarta.model.archetype.TestArchetype;
+import net.sf.gridarta.model.gameobject.TestGameObject;
+import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapcontrol.DefaultMapControl;
+import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
+import net.sf.gridarta.model.mapmanager.MapManager;
+import net.sf.gridarta.model.mapmodel....
 
[truncated message content]

Thread: [Gridarta-commit] SF.net SVN: gridarta:[8800] trunk (Page 60)

gridarta-commit