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

[Gridarta-commit] SF.net SVN: gridarta:[8385] trunk/atrinik

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

Revision: 8385
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8385&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:55:48 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Add support for archetypes with default inventories.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
    trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java
    trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java

Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog	2010-06-13 11:52:55 UTC (rev 8384)
+++ trunk/atrinik/ChangeLog	2010-06-13 11:55:48 UTC (rev 8385)
@@ -1,5 +1,7 @@
 2010-06-13  Andreas Kirschbaum
 
+	* Add support for archetypes with default inventories.
+
 	* Fix cursor position after mouse-clicks into script editor.
 
 	* Release 0.8.

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java	2010-06-13 11:52:55 UTC (rev 8384)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java	2010-06-13 11:55:48 UTC (rev 8385)
@@ -410,7 +410,7 @@
         } catch (final IOException ex) {
             errorView.addWarning(ErrorViewCategory.ARCHDEF_FILE_INVALID, IGUIConstants.ARCHDEF_FILE + ": " + ex.getMessage());
         }
-        return new ArchetypeParser(animationObjects, archetypeSet, gameObjectFactory, multiPositionData);
+        return new ArchetypeParser(gameObjectParser, animationObjects, archetypeSet, gameObjectFactory, multiPositionData);
     }
 
     /**

Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java	2010-06-13 11:52:55 UTC (rev 8384)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java	2010-06-13 11:55:48 UTC (rev 8385)
@@ -20,6 +20,7 @@
 package net.sf.gridarta.var.atrinik.model.archetype;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.util.List;
 import net.sf.gridarta.model.anim.AnimationObjects;
 import net.sf.gridarta.model.archetype.AbstractArchetypeParser;
@@ -28,6 +29,7 @@
 import net.sf.gridarta.model.errorview.ErrorViewCollector;
 import net.sf.gridarta.model.gameobject.GameObjectFactory;
 import net.sf.gridarta.model.gameobject.MultiPositionData;
+import net.sf.gridarta.model.io.GameObjectParser;
 import net.sf.gridarta.var.atrinik.model.gameobject.GameObject;
 import net.sf.gridarta.var.atrinik.model.maparchobject.MapArchObject;
 import net.sf.japi.swing.action.ActionBuilder;
@@ -52,6 +54,11 @@
     private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
 
     /**
+     * The game object parser instance.
+     */
+    private final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser;
+
+    /**
      * The {@link MultiPositionData} instance to query for multi-part objects.
      */
     @NotNull
@@ -64,14 +71,16 @@
 
     /**
      * Creates an ArchetypeParser.
+     * @param gameObjectParser the game object parser instance to use
      * @param animationObjects the animation objects instance to use
      * @param archetypeSet the archetype set
      * @param gameObjectFactory the factory for creating game objects
      * @param multiPositionData the multi position data to query for multi-part
      * objects
      */
-    public ArchetypeParser(@NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final MultiPositionData multiPositionData) {
+    public ArchetypeParser(@NotNull final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final MultiPositionData multiPositionData) {
         super(new DefaultArchetypeBuilder(gameObjectFactory), animationObjects, archetypeSet);
+        this.gameObjectParser = gameObjectParser;
         this.multiPositionData = multiPositionData;
     }
 
@@ -95,7 +104,14 @@
      * {@inheritDoc}
      */
     @Override
-    protected boolean processLine(@NotNull final BufferedReader in, @NotNull final String line, @NotNull final String line2, @NotNull final DefaultArchetypeBuilder archetypeBuilder, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final List<GameObject> invObjects) {
+    protected boolean processLine(@NotNull final BufferedReader in, @NotNull final String line, @NotNull final String line2, @NotNull final DefaultArchetypeBuilder archetypeBuilder, @NotNull final ErrorViewCollector errorViewCollector, @NotNull final List<GameObject> invObjects) throws IOException {
+        if (line.startsWith("arch ")) {
+            final GameObject invObject = gameObjectParser.load(in, line, invObjects);
+            assert invObject != null;
+            archetypeBuilder.addLast(invObject);
+            return true;
+        }
+
         if (line.startsWith("mpart_id ")) {
             // shape ID for multi-parts
             try {

Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java
===================================================================
--- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java	2010-06-13 11:52:55 UTC (rev 8384)
+++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java	2010-06-13 11:55:48 UTC (rev 8385)
@@ -28,16 +28,20 @@
 import net.sf.gridarta.model.archetype.AbstractArchetypeParserTest;
 import net.sf.gridarta.model.archetype.UndefinedArchetypeException;
 import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
+import net.sf.gridarta.model.baseobject.BaseObject;
 import net.sf.gridarta.model.face.ArchFaceProvider;
 import net.sf.gridarta.model.face.DefaultFaceObjects;
 import net.sf.gridarta.model.face.FaceObjectProviders;
 import net.sf.gridarta.model.face.FaceObjects;
 import net.sf.gridarta.model.gameobject.IsoMapSquareInfo;
 import net.sf.gridarta.model.gameobject.MultiPositionData;
+import net.sf.gridarta.model.io.GameObjectParser;
+import net.sf.gridarta.model.match.GameObjectMatchers;
 import net.sf.gridarta.utils.GUIUtils;
 import net.sf.gridarta.utils.SystemIcons;
 import net.sf.gridarta.var.atrinik.model.gameobject.DefaultGameObjectFactory;
 import net.sf.gridarta.var.atrinik.model.gameobject.GameObject;
+import net.sf.gridarta.var.atrinik.model.io.DefaultGameObjectParser;
 import net.sf.gridarta.var.atrinik.model.maparchobject.MapArchObject;
 import net.sf.japi.swing.action.ActionBuilder;
 import net.sf.japi.swing.action.ActionBuilderFactory;
@@ -84,6 +88,21 @@
     }
 
     /**
+     * Checks that inventory game objects are recognized.
+     * @throws IOException if the test fails
+     * @throws UndefinedArchetypeException if the test fails
+     */
+    @Test
+    public void testInventoryGameObjects() throws IOException, UndefinedArchetypeException {
+        check("Object arch1\n" + "end\n" + "Object arch2\n" + "arch arch1\n" + "name name1\n" + "end\n" + "end\n", false, false, 2);
+        final Archetype arch2 = getArchetypeSet().getArchetype("arch2");
+        Assert.assertEquals(1, arch2.countInvObjects());
+        final GameObject inv = arch2.iterator().next();
+        Assert.assertEquals("arch1", inv.getArchetypeName());
+        Assert.assertEquals("name1", inv.getAttributeString(BaseObject.NAME));
+    }
+
+    /**
      * Initializes the test.
      */
     @BeforeClass
@@ -112,8 +131,10 @@
         assert archetypeSet != null;
         final IsoMapSquareInfo isoMapSquareInfo = new IsoMapSquareInfo(1, 1, 1, 1);
         final MultiPositionData multiPositionData = new MultiPositionData(isoMapSquareInfo);
+        final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers();
+        final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser = new DefaultGameObjectParser(gameObjectFactory, gameObjectMatchers);
         assert archetypeSet != null;
-        return new ArchetypeParser(animationObjects, archetypeSet, gameObjectFactory, multiPositionData);
+        return new ArchetypeParser(gameObjectParser, animationObjects, archetypeSet, gameObjectFactory, multiPositionData);
     }
 
     /**


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

[Gridarta-commit] SF.net SVN: gridarta:[8384] trunk/crossfire/src/test/net/sf/gridarta/var/ crossfire/model

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

Revision: 8384
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8384&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:52:55 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Add regression test.

Added Paths:
-----------
    trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/
    trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java

Added: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java
===================================================================
--- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java	                        (rev 0)
+++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java	2010-06-13 11:52:55 UTC (rev 8384)
@@ -0,0 +1,124 @@
+/*
+ * 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.var.crossfire.model.archetype;
+
+import java.io.IOException;
+import java.util.regex.Pattern;
+import net.sf.gridarta.model.anim.AnimationObjects;
+import net.sf.gridarta.model.anim.DefaultAnimationObjects;
+import net.sf.gridarta.model.archetype.AbstractArchetypeBuilder;
+import net.sf.gridarta.model.archetype.AbstractArchetypeParser;
+import net.sf.gridarta.model.archetype.AbstractArchetypeParserTest;
+import net.sf.gridarta.model.archetype.UndefinedArchetypeException;
+import net.sf.gridarta.model.baseobject.BaseObject;
+import net.sf.gridarta.model.face.ArchFaceProvider;
+import net.sf.gridarta.model.face.DefaultFaceObjects;
+import net.sf.gridarta.model.face.FaceObjectProviders;
+import net.sf.gridarta.model.face.FaceObjects;
+import net.sf.gridarta.model.io.GameObjectParser;
+import net.sf.gridarta.model.match.GameObjectMatchers;
+import net.sf.gridarta.utils.GUIUtils;
+import net.sf.gridarta.utils.SystemIcons;
+import net.sf.gridarta.var.crossfire.model.gameobject.DefaultGameObjectFactory;
+import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
+import net.sf.gridarta.var.crossfire.model.io.DefaultGameObjectParser;
+import net.sf.gridarta.var.crossfire.model.maparchobject.MapArchObject;
+import net.sf.gridarta.var.crossfire.model.smoothface.SmoothFaces;
+import net.sf.japi.swing.action.ActionBuilder;
+import net.sf.japi.swing.action.ActionBuilderFactory;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link ArchetypeParser}.
+ * @author Andreas Kirschbaum
+ */
+public class ArchetypeParserTest extends AbstractArchetypeParserTest<GameObject, MapArchObject, Archetype> {
+
+    /**
+     * The loaded archetypes.
+     */
+    @Nullable
+    private ArchetypeSet archetypeSet = null;
+
+    /**
+     * Checks that inventory game objects are recognized.
+     * @throws IOException if the test fails
+     * @throws UndefinedArchetypeException if the test fails
+     */
+    @Test
+    public void testInventoryGameObjects() throws IOException, UndefinedArchetypeException {
+        check("Object arch1\n" + "end\n" + "Object arch2\n" + "arch arch1\n" + "name name1\n" + "end\n" + "end\n", false, false, 2);
+        final Archetype arch2 = getArchetypeSet().getArchetype("arch2");
+        Assert.assertEquals(1, arch2.countInvObjects());
+        final GameObject inv = arch2.iterator().next();
+        Assert.assertEquals("arch1", inv.getArchetypeName());
+        Assert.assertEquals("name1", inv.getAttributeString(BaseObject.NAME));
+    }
+
+    /**
+     * Initializes the test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
+        actionBuilder.addParent(ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta.var.crossfire"));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype, ? extends AbstractArchetypeBuilder<GameObject, MapArchObject, Archetype>> newArchetypeParser() {
+        final ArchFaceProvider archFaceProvider = new ArchFaceProvider();
+        final FaceObjects faceObjects = new DefaultFaceObjects("png", "facetree", Pattern.compile(".*"), "facetree.output", archFaceProvider);
+        final GUIUtils guiUtils = new GUIUtils();
+        final SystemIcons systemIcons = new SystemIcons(guiUtils);
+        final FaceObjectProviders faceObjectProviders = new FaceObjectProviders(0, faceObjects, systemIcons);
+        final AnimationObjects animationObjects = new DefaultAnimationObjects("animtree");
+        final DefaultGameObjectFactory gameObjectFactory = new DefaultGameObjectFactory(faceObjectProviders, animationObjects);
+        final DefaultArchetypeFactory archetypeFactory = new DefaultArchetypeFactory(faceObjectProviders, animationObjects);
+        final GameObjectMatchers gameObjectMatchers = new GameObjectMatchers();
+        final GameObjectParser<GameObject, MapArchObject, Archetype> gameObjectParser = new DefaultGameObjectParser(gameObjectFactory, gameObjectMatchers);
+        archetypeSet = new ArchetypeSet("images", archetypeFactory, gameObjectParser, faceObjectProviders);
+        archetypeSet.setLoadedFromArchive(true);
+        assert archetypeSet != null;
+        final SmoothFaces smoothFaces = new SmoothFaces(faceObjects);
+        assert archetypeSet != null;
+        return new ArchetypeParser(gameObjectParser, animationObjects, archetypeSet, gameObjectFactory, smoothFaces);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @NotNull
+    @Override
+    protected ArchetypeSet getArchetypeSet() {
+        if (archetypeSet == null) {
+            throw new IllegalStateException();
+        }
+        return archetypeSet;
+    }
+
+} // class ArchetypeParserTest


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


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

[Gridarta-commit] SF.net SVN: gridarta:[8383] trunk/model/src/app/net/sf/gridarta/model/face/ ArchFaceProvider.java

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

Revision: 8383
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8383&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:33:12 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Suppress warning.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/face/ArchFaceProvider.java

Modified: trunk/model/src/app/net/sf/gridarta/model/face/ArchFaceProvider.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/ArchFaceProvider.java	2010-06-13 11:31:43 UTC (rev 8382)
+++ trunk/model/src/app/net/sf/gridarta/model/face/ArchFaceProvider.java	2010-06-13 11:33:12 UTC (rev 8383)
@@ -87,11 +87,14 @@
             return null;
         }
 
-        final byte[] buf = new byte[(int) length];
+        // It has been checked that the value will fit into an int.
+        //noinspection NumericCastThatLosesPrecision
+        final int intLength = (int) length;
+        final byte[] buf = new byte[intLength];
         try {
             final FileInputStream fis = new FileInputStream(file);
             try {
-                if (fis.read(buf) != (int) length) {
+                if (fis.read(buf) != intLength) {
                     return null;
                 }
             } finally {


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

[Gridarta-commit] SF.net SVN: gridarta:[8382] trunk/model/src/app/net/sf/gridarta/model

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

Revision: 8382
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8382&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:31:43 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Explicitly initialize fields.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java
    trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java
    trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java

Modified: trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java	2010-06-13 11:29:06 UTC (rev 8381)
+++ trunk/model/src/app/net/sf/gridarta/model/data/NamedTreeNode.java	2010-06-13 11:31:43 UTC (rev 8382)
@@ -58,7 +58,7 @@
      * @serial
      */
     @Nullable
-    private NamedTreeNode<E>[] childNodeArray;
+    private NamedTreeNode<E>[] childNodeArray = null;
 
     /**
      * The parent node, which may be <code>null</code> for the root node.

Modified: trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java	2010-06-13 11:29:06 UTC (rev 8381)
+++ trunk/model/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java	2010-06-13 11:31:43 UTC (rev 8382)
@@ -42,7 +42,7 @@
     /**
      * The image width.
      */
-    private int width;
+    private int width = 0;
 
     /**
      * The destination image's pixels.

Modified: trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java	2010-06-13 11:29:06 UTC (rev 8381)
+++ trunk/model/src/app/net/sf/gridarta/model/match/ViewGameObjectMatcherManager.java	2010-06-13 11:31:43 UTC (rev 8382)
@@ -155,7 +155,7 @@
         /**
          * Selected state.
          */
-        private boolean selected;
+        private boolean selected = false;
 
         /**
          * A {@link MutableOrGameObjectMatcher} to add / remove {@link


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

[Gridarta-commit] SF.net SVN: gridarta:[8381] trunk

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

Revision: 8381
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8381&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:29:06 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Clean up code for choosing the default image directory.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
    trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java
    trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator2.java

Modified: trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java	2010-06-13 11:21:42 UTC (rev 8380)
+++ trunk/model/src/app/net/sf/gridarta/model/settings/DefaultGlobalSettings.java	2010-06-13 11:29:06 UTC (rev 8381)
@@ -230,6 +230,7 @@
         mapsDirectory = new File(preferences.get(MAP_DIRECTORY_KEY, mapsDirectoryDefault));
         mediaDirectory = new File(preferences.get(MEDIA_DIRECTORY_KEY, mediaDirectoryDefault));
         imageSet = preferences.get(IMAGE_SET_KEY, imageSetDefault);
+        imageDirectory = mapsDirectory;
         configSource = configSourceFactory.getConfigSource(preferences.get(CONFIG_SOURCE_KEY, ""));
         final int documentationVersion = ActionBuilderUtils.getInt(ACTION_BUILDER, "docuVersion", 0);
         if (documentationVersion > 0 && preferences.getInt(DOCUMENTATION_VERSION_KEY, 0) < documentationVersion) {

Modified: trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java	2010-06-13 11:21:42 UTC (rev 8380)
+++ trunk/model/src/app/net/sf/gridarta/model/settings/GlobalSettings.java	2010-06-13 11:29:06 UTC (rev 8381)
@@ -74,7 +74,8 @@
     void setMapsDirectory(@NotNull File mapsDirectory);
 
     /**
-     * Sets the directory to save created image to.
+     * Sets the directory to save created image to. It defaults to {@link
+     * #getMapsDirectory()} and is not retained across editor restarts.
      * @param imageDirectory the image directory
      */
     void setImageDirectory(@NotNull File imageDirectory);

Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator2.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator2.java	2010-06-13 11:21:42 UTC (rev 8380)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator2.java	2010-06-13 11:29:06 UTC (rev 8381)
@@ -77,10 +77,6 @@
      * @param component the parent component to use
      */
     public void createImage(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Component component) {
-        if (globalSettings.getImageDirectory() == null) {
-            globalSettings.setImageDirectory(globalSettings.getMapsDirectory());
-        }
-
         final File mapFile = mapModel.getMapFile();
         final File file = new File(globalSettings.getImageDirectory(), mapFile == null ? "image" : mapFile.getName() + ".png");
         final JFileChooser fileChooser = new JFileChooser(globalSettings.getImageDirectory());


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

[Gridarta-commit] SF.net SVN: gridarta:[8380] trunk/model/src/app/net/sf/gridarta/model/map/ validation/errors/MapValidationError.java

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

Revision: 8380
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8380&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:21:42 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Make MapValidationError abstract.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/map/validation/errors/MapValidationError.java

Modified: trunk/model/src/app/net/sf/gridarta/model/map/validation/errors/MapValidationError.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/validation/errors/MapValidationError.java	2010-06-13 11:14:14 UTC (rev 8379)
+++ trunk/model/src/app/net/sf/gridarta/model/map/validation/errors/MapValidationError.java	2010-06-13 11:21:42 UTC (rev 8380)
@@ -30,8 +30,9 @@
  * directly, you'd probably want to extend the class or one of its subclasses
  * like {@link SquareValidationError} or {@link GameObjectValidationError}.
  * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
+ * @noinspection AbstractClassWithoutAbstractMethods
  */
-public class MapValidationError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends ValidationError<G, A, R> {
+public abstract class MapValidationError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends ValidationError<G, A, R> {
 
     /**
      * The serial version UID.
@@ -42,7 +43,7 @@
      * Create a MapValidationError.
      * @param mapModel the map on which the error occurred
      */
-    public MapValidationError(@NotNull final MapModel<G, A, R> mapModel) {
+    protected MapValidationError(@NotNull final MapModel<G, A, R> mapModel) {
         super(mapModel);
     }
 


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

[Gridarta-commit] SF.net SVN: gridarta:[8379] trunk

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

Revision: 8379
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8379&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:14:14 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Move ErrorEntry into correct module and package.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java

Added Paths:
-----------
    trunk/src/app/net/sf/gridarta/gui/errorview/ErrorEntry.java

Removed Paths:
-------------
    trunk/model/src/app/net/sf/gridarta/model/errorview/ErrorEntry.java

Deleted: trunk/model/src/app/net/sf/gridarta/model/errorview/ErrorEntry.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/errorview/ErrorEntry.java	2010-06-13 11:12:28 UTC (rev 8378)
+++ trunk/model/src/app/net/sf/gridarta/model/errorview/ErrorEntry.java	2010-06-13 11:14:14 UTC (rev 8379)
@@ -1,61 +0,0 @@
-/*
- * 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.errorview;
-
-import javax.swing.tree.DefaultMutableTreeNode;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.MutableTreeNode;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * An entry in a {@link net.sf.gridarta.gui.errorview.DefaultErrorView}.
- * @author Andreas Kirschbaum
- */
-public class ErrorEntry extends DefaultMutableTreeNode {
-
-    /**
-     * The serial version UID.
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The {@link DefaultTreeModel} this instance belongs to.
-     */
-    @NotNull
-    private final DefaultTreeModel treeModel;
-
-    /**
-     * Creates a new instance.
-     * @param treeModel the tree model this instance belongs to
-     * @param name the name
-     * @param allowsChildren whether this node allows children
-     */
-    public ErrorEntry(@NotNull final DefaultTreeModel treeModel, @NotNull final String name, final boolean allowsChildren) {
-        super(name, allowsChildren);
-        this.treeModel = treeModel;
-    }
-
-    @Override
-    public void add(@NotNull final MutableTreeNode newChild) {
-        super.add(newChild);
-        treeModel.nodesWereInserted(this, new int[] { getChildCount() - 1, });
-    }
-
-} // class ErrorEntry

Modified: trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java	2010-06-13 11:12:28 UTC (rev 8378)
+++ trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java	2010-06-13 11:14:14 UTC (rev 8379)
@@ -33,7 +33,6 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
-import net.sf.gridarta.model.errorview.ErrorEntry;
 import net.sf.gridarta.model.errorview.ErrorView;
 import net.sf.gridarta.model.errorview.ErrorViewCategory;
 import net.sf.japi.swing.action.ActionBuilder;

Copied: trunk/src/app/net/sf/gridarta/gui/errorview/ErrorEntry.java (from rev 8364, trunk/model/src/app/net/sf/gridarta/model/errorview/ErrorEntry.java)
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/ErrorEntry.java	                        (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/errorview/ErrorEntry.java	2010-06-13 11:14:14 UTC (rev 8379)
@@ -0,0 +1,61 @@
+/*
+ * Gridarta MMORPG map editor for Crossfire, Daimonin and similar games.
+ * Copyright (C) 2000-2010 The Gridarta Developers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+package net.sf.gridarta.gui.errorview;
+
+import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.MutableTreeNode;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * An entry in a {@link net.sf.gridarta.gui.errorview.DefaultErrorView}.
+ * @author Andreas Kirschbaum
+ */
+public class ErrorEntry extends DefaultMutableTreeNode {
+
+    /**
+     * The serial version UID.
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * The {@link DefaultTreeModel} this instance belongs to.
+     */
+    @NotNull
+    private final DefaultTreeModel treeModel;
+
+    /**
+     * Creates a new instance.
+     * @param treeModel the tree model this instance belongs to
+     * @param name the name
+     * @param allowsChildren whether this node allows children
+     */
+    public ErrorEntry(@NotNull final DefaultTreeModel treeModel, @NotNull final String name, final boolean allowsChildren) {
+        super(name, allowsChildren);
+        this.treeModel = treeModel;
+    }
+
+    @Override
+    public void add(@NotNull final MutableTreeNode newChild) {
+        super.add(newChild);
+        treeModel.nodesWereInserted(this, new int[] { getChildCount() - 1, });
+    }
+
+} // class ErrorEntry


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


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

[Gridarta-commit] SF.net SVN: gridarta:[8378] trunk/model/src/app/net/sf/gridarta/model

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

Revision: 8378
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8378&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:12:28 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Fix Javadoc issues.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
    trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGrid.java

Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java	2010-06-13 11:08:05 UTC (rev 8377)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java	2010-06-13 11:12:28 UTC (rev 8378)
@@ -131,11 +131,6 @@
      * Find and return the type-structure (<code>ArchetypeType</code>) that
      * matches for the given arch. This is not only a comparison between type
      * numbers - special type-attributes must also be dealt with. <p/>
-     * IMPORTANT: A similar-but-different version of this code is used in {@link
-     * net.sf.gridarta.gui.gameobjectattributesdialog.GameObjectAttributesDialog}.
-     * Hence, if modifying this method, the appropriate parts in
-     * <code>GameObjectAttributesDialog</code> must also be updated and
-     * vice-versa.
      * @param baseObject the arch to find the type for
      * @return the <code>ArchetypeType</code> which belongs to this arch, or the
      *         first (misc) type if no match is found.

Modified: trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGrid.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGrid.java	2010-06-13 11:08:05 UTC (rev 8377)
+++ trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGrid.java	2010-06-13 11:12:28 UTC (rev 8378)
@@ -28,14 +28,14 @@
 
 /**
  * 2D-Grid containing flags for selection, pre-selection, cursor, warnings and
- * errors. This class provides methods to modify these flags. Normally a {@link
- * net.sf.gridarta.gui.mapcursor.MapCursor} is used to access them. Selection
- * flags are not changed directly. First pre-selection flags have to be set with
- * {@link #preSelect(Point, Point)}, then {@link #select(Point, Point,
- * SelectionMode)} will change the selection flags according to {@link
- * SelectionMode}. This allows visualisation of the dragging process when
- * selecting an area. <p/> Every change of the grid size or flags fires a {@link
- * MapGridEvent} and informs all registered {@link MapGridListener}s.
+ * errors. This class provides methods to modify these flags. Normally a map
+ * cursor  is used to access them. Selection flags are not changed directly.
+ * First pre-selection flags have to be set with {@link #preSelect(Point,
+ * Point)}, then {@link #select(Point, Point, SelectionMode)} will change the
+ * selection flags according to {@link SelectionMode}. This allows visualisation
+ * of the dragging process when selecting an area. <p/> Every change of the grid
+ * size or flags fires a {@link MapGridEvent} and informs all registered {@link
+ * MapGridListener}s.
  * @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
  * @author Andreas Kirschbaum
  */


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

[Gridarta-commit] SF.net SVN: gridarta:[8377] trunk/model/src/app/net/sf/gridarta/model/ mapcursor/MapCursor.java

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

Revision: 8377
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8377&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:08:05 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Remove redundant warning suppression.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java

Modified: trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java	2010-06-13 11:07:12 UTC (rev 8376)
+++ trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java	2010-06-13 11:08:05 UTC (rev 8377)
@@ -316,7 +316,6 @@
      * Moves the cursor one square relative to current position.
      * @param dir the direction
      * @return <code>true</code> if cursor really moved
-     * @noinspection TypeMayBeWeakened
      */
     public boolean goTo(@NotNull final Direction dir) {
         if (onMap) {


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

[Gridarta-commit] SF.net SVN: gridarta:[8376] trunk/model/src/app/net/sf/gridarta/model/ artifact/ArtifactParser.java

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

Revision: 8376
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8376&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:07:12 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Do not ignore caught exception.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java

Modified: trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java	2010-06-13 11:05:54 UTC (rev 8375)
+++ trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java	2010-06-13 11:07:12 UTC (rev 8376)
@@ -253,7 +253,7 @@
                                 }
                             }
                         } catch (final UndefinedArchetypeException ex) {
-                            errorViewCollector.addWarning(ErrorViewCategory.ARTIFACT_ENTRY_INVALID, "line " + lineCount + ", Object '" + defArchName + "' / '" + name + "' / '" + objTitle + "' references undefined defArch");
+                            errorViewCollector.addWarning(ErrorViewCategory.ARTIFACT_ENTRY_INVALID, "line " + lineCount + ", Object '" + defArchName + "' / '" + name + "' / '" + objTitle + "' references undefined archetype '" + ex.getMessage() + "'");
                         }
                     }
                     name = null;


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

[Gridarta-commit] SF.net SVN: gridarta:[8375] trunk/model/src/app/net/sf/gridarta/model/ autojoin/AutojoinListsParser.java

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

Revision: 8375
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8375&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:05:54 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Add TODO comment.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java

Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 11:03:01 UTC (rev 8374)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 11:05:54 UTC (rev 8375)
@@ -118,7 +118,7 @@
      * @throws IOException if an I/O error occurs
      */
     private void loadList(@NotNull final URL url, @NotNull final BufferedReader bufferedReader) throws IOException {
-        boolean sectionFlag = false;  // true while section (start ... end) read
+        boolean sectionFlag = false;  // true while section (start ... end) read; XXX: replace flag with control flow
         final List<R> archetypes = new ArrayList<R>(AutojoinList.SIZE);
         boolean skipList = true;
         while (true) {


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

[Gridarta-commit] SF.net SVN: gridarta:[8374] trunk/model/src/app/net/sf/gridarta/model/ autojoin/AutojoinListsParser.java

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

Revision: 8374
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8374&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:03:01 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Extrace code into function.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java

Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 11:00:37 UTC (rev 8373)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 11:03:01 UTC (rev 8374)
@@ -93,56 +93,7 @@
                     try {
                         final BufferedReader stream = new BufferedReader(reader);
                         try {
-                            // read the file
-                            boolean sectionFlag = false;  // true while section (start ... end) read
-                            final List<R> archetypes = new ArrayList<R>(AutojoinList.SIZE);
-                            boolean skipList = true;
-                            while (true) {
-                                final String line2 = stream.readLine();
-                                if (line2 == null) {
-                                    break;
-                                }
-                                if (!line2.startsWith("#") && line2.length() > 0) {
-                                    final String line = line2.trim();  // remove whitespace at both ends
-
-                                    if (sectionFlag) {
-                                        // we are inside a section
-                                        if (line.equals("end")) {
-                                            if (!skipList) {
-                                                try {
-                                                    final AutojoinList<G, A, R> autojoinList = new AutojoinList<G, A, R>(archetypes);
-                                                    autojoinLists.addAutojoinList(autojoinList);
-                                                } catch (final IllegalAutojoinListException ex) {
-                                                    errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": " + ex.getMessage());
-                                                }
-                                            }
-                                            sectionFlag = false;
-                                        } else {
-                                            try {
-                                                final R archetype = archetypeSet.getArchetype(line);
-                                                if (archetype.isMulti()) {
-                                                    errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": list contains multi-part game object: archetype '" + line + "'");
-                                                    skipList = true;
-                                                } else {
-                                                    archetypes.add(archetype);
-                                                }
-                                            } catch (final UndefinedArchetypeException ex) {
-                                                if (archetypeSet.getArchetypeCount() >= 1) {
-                                                    errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": Autojoin list references undefined archetype: archetype '" + ex.getMessage() + "'");
-                                                    skipList = true;
-                                                }
-                                            }
-                                        }
-                                    } else {
-                                        // we are outside a section
-                                        if (line.equals("start")) {
-                                            sectionFlag = true;
-                                            archetypes.clear();
-                                            skipList = false;
-                                        }
-                                    }
-                                }
-                            }
+                            loadList(url, stream);
                         } finally {
                             stream.close();
                         }
@@ -160,4 +111,62 @@
         }
     }
 
+    /**
+     * Loads all the autojoin lists from the data file.
+     * @param url the source location for error messages
+     * @param bufferedReader the reader to read from
+     * @throws IOException if an I/O error occurs
+     */
+    private void loadList(@NotNull final URL url, @NotNull final BufferedReader bufferedReader) throws IOException {
+        boolean sectionFlag = false;  // true while section (start ... end) read
+        final List<R> archetypes = new ArrayList<R>(AutojoinList.SIZE);
+        boolean skipList = true;
+        while (true) {
+            final String line2 = bufferedReader.readLine();
+            if (line2 == null) {
+                break;
+            }
+            if (!line2.startsWith("#") && line2.length() > 0) {
+                final String line = line2.trim();  // remove whitespace at both ends
+
+                if (sectionFlag) {
+                    // we are inside a section
+                    if (line.equals("end")) {
+                        if (!skipList) {
+                            try {
+                                final AutojoinList<G, A, R> autojoinList = new AutojoinList<G, A, R>(archetypes);
+                                autojoinLists.addAutojoinList(autojoinList);
+                            } catch (final IllegalAutojoinListException ex) {
+                                errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": " + ex.getMessage());
+                            }
+                        }
+                        sectionFlag = false;
+                    } else {
+                        try {
+                            final R archetype = archetypeSet.getArchetype(line);
+                            if (archetype.isMulti()) {
+                                errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": list contains multi-part game object: archetype '" + line + "'");
+                                skipList = true;
+                            } else {
+                                archetypes.add(archetype);
+                            }
+                        } catch (final UndefinedArchetypeException ex) {
+                            if (archetypeSet.getArchetypeCount() >= 1) {
+                                errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": Autojoin list references undefined archetype: archetype '" + ex.getMessage() + "'");
+                                skipList = true;
+                            }
+                        }
+                    }
+                } else {
+                    // we are outside a section
+                    if (line.equals("start")) {
+                        sectionFlag = true;
+                        archetypes.clear();
+                        skipList = false;
+                    }
+                }
+            }
+        }
+    }
+
 } // class AutojoinListsParser


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

[Gridarta-commit] SF.net SVN: gridarta:[8373] trunk/model/src/app/net/sf/gridarta/model/ autojoin/AutojoinListsParser.java

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

Revision: 8373
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8373&view=rev
Author:   akirschbaum
Date:     2010-06-13 11:00:37 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Fix Javadoc issues.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java

Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 10:59:17 UTC (rev 8372)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 11:00:37 UTC (rev 8373)
@@ -39,12 +39,15 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Loader for{@link AutojoinLists} instances from files.
+ * Loader for {@link AutojoinLists} instances from files.
  * @author Andreas Kirschbaum
  */
 public class AutojoinListsParser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
 
-    private static final String FILENAME = "autojoin.txt";  // file with autojoin lists
+    /**
+     * The file defining autojoin lists.
+     */
+    private static final String FILENAME = "autojoin.txt";
 
     /**
      * The {@link ErrorView} for reporting errors.
@@ -77,9 +80,8 @@
     }
 
     /**
-     * Load all the autojoin lists from the data file. The links from the
-     * default arches to their appropriate AutojoinLists also get set here.
-     * @param baseDir the configuration directory to load autojoin info from.
+     * Loads all the autojoin lists from the data file.
+     * @param baseDir the base directory to load autojoin info from
      */
     public void loadList(@NotNull final File baseDir) {
         try {


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

[Gridarta-commit] SF.net SVN: gridarta:[8372] trunk/model/src/app/net/sf/gridarta/model/ autojoin/AutojoinListsParser.java

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

Revision: 8372
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8372&view=rev
Author:   akirschbaum
Date:     2010-06-13 10:59:17 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Do not ignore caught exception.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java

Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 10:58:37 UTC (rev 8371)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 10:59:17 UTC (rev 8372)
@@ -126,7 +126,7 @@
                                                 }
                                             } catch (final UndefinedArchetypeException ex) {
                                                 if (archetypeSet.getArchetypeCount() >= 1) {
-                                                    errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": Autojoin list references undefined archetype: archetype '" + line + "'");
+                                                    errorView.addWarning(ErrorViewCategory.AUTOJOIN_ENTRY_INVALID, url + ": Autojoin list references undefined archetype: archetype '" + ex.getMessage() + "'");
                                                     skipList = true;
                                                 }
                                             }


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

[Gridarta-commit] SF.net SVN: gridarta:[8371] trunk/model/src/app/net/sf/gridarta/model/ filter/NamedFilterConfig.java

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

Revision: 8371
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8371&view=rev
Author:   akirschbaum
Date:     2010-06-13 10:58:37 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Do not log pointless stack traces.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java

Modified: trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java	2010-06-13 10:57:31 UTC (rev 8370)
+++ trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java	2010-06-13 10:58:37 UTC (rev 8371)
@@ -84,7 +84,7 @@
                         oldConfig.removeConfigChangeListener(filterConfigListener);
                     }
                     if (log.isDebugEnabled()) {
-                        log.debug(this + " removing config for " + filterName, new Exception());
+                        log.debug(this + " removing config for " + filterName);
                     }
                     map.remove(filterName);
                     break;
@@ -93,7 +93,7 @@
                     final FilterConfig<?, ?> newConfig = filter.createConfig();
                     newConfig.addConfigChangeListener(filterConfigListener);
                     if (log.isDebugEnabled()) {
-                        log.debug(this + " adding config for " + filterName, new Exception());
+                        log.debug(this + " adding config for " + filterName);
                     }
                     map.put(filterName, newConfig);
                     break;


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

[Gridarta-commit] SF.net SVN: gridarta:[8370] trunk/model/src/app/net/sf/gridarta/model/ filter/NamedFilterConfig.java

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

Revision: 8370
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8370&view=rev
Author:   akirschbaum
Date:     2010-06-13 10:57:31 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Remove NamedFilterConfig.namedFilterListener.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java

Modified: trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java	2010-06-13 10:54:04 UTC (rev 8369)
+++ trunk/model/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java	2010-06-13 10:57:31 UTC (rev 8370)
@@ -66,44 +66,42 @@
 
     };
 
-    @NotNull
-    private final NamedFilterListener namedFilterListener = new NamedFilterListener() {
-
-        /** {@inheritDoc} */
-        @Override
-        public void nameFilterChanged(@NotNull final NamedFilterChangeType type, @NotNull final String filterName, @NotNull final Filter<?, ?> filter) {
-            switch (type) {
-            case REMOVE:
-                final FilterConfig<?, ?> oldConfig = map.get(filterName);
-                if (oldConfig != null) {
-                    oldConfig.removeConfigChangeListener(filterConfigListener);
-                }
-                if (log.isDebugEnabled()) {
-                    log.debug(this + " removing config for " + filterName, new Exception());
-                }
-                map.remove(filterName);
-                break;
-
-            case ADD:
-                final FilterConfig<?, ?> newConfig = filter.createConfig();
-                newConfig.addConfigChangeListener(filterConfigListener);
-                if (log.isDebugEnabled()) {
-                    log.debug(this + " adding config for " + filterName, new Exception());
-                }
-                map.put(filterName, newConfig);
-                break;
-            }
-            fireEvent(FilterConfigChangeType.CHANGE, NamedFilterConfig.this);
-        }
-
-    };
-
     /**
      * Creates a new instance.
      * @param owner the filter this filter config belongs to
      */
     public NamedFilterConfig(@NotNull final NamedFilter owner) {
         super(owner);
+
+        final NamedFilterListener namedFilterListener = new NamedFilterListener() {
+
+            @Override
+            public void nameFilterChanged(@NotNull final NamedFilterChangeType type, @NotNull final String filterName, @NotNull final Filter<?, ?> filter) {
+                switch (type) {
+                case REMOVE:
+                    final FilterConfig<?, ?> oldConfig = map.get(filterName);
+                    if (oldConfig != null) {
+                        oldConfig.removeConfigChangeListener(filterConfigListener);
+                    }
+                    if (log.isDebugEnabled()) {
+                        log.debug(this + " removing config for " + filterName, new Exception());
+                    }
+                    map.remove(filterName);
+                    break;
+
+                case ADD:
+                    final FilterConfig<?, ?> newConfig = filter.createConfig();
+                    newConfig.addConfigChangeListener(filterConfigListener);
+                    if (log.isDebugEnabled()) {
+                        log.debug(this + " adding config for " + filterName, new Exception());
+                    }
+                    map.put(filterName, newConfig);
+                    break;
+                }
+                fireEvent(FilterConfigChangeType.CHANGE, NamedFilterConfig.this);
+            }
+
+        };
         owner.addFilterListener(namedFilterListener);
     }
 


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

[Gridarta-commit] SF.net SVN: gridarta:[8369] trunk/model/src/app/net/sf/gridarta/model

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

Revision: 8369
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8369&view=rev
Author:   akirschbaum
Date:     2010-06-13 10:54:04 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Remove nested assignments.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java
    trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java

Modified: trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java	2010-06-13 10:48:28 UTC (rev 8368)
+++ trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java	2010-06-13 10:54:04 UTC (rev 8369)
@@ -196,11 +196,14 @@
         @Nullable String defArchName = null;
         int lineCount = 0;
 
-        String thisLine;
         @Nullable String editorPath = null;
-        while ((thisLine = in.readLine()) != null) {
+        while (true) {
+            final String thisLine2 = in.readLine();
+            if (thisLine2 == null) {
+                break;
+            }
             lineCount++;
-            thisLine = thisLine.trim();
+            final String thisLine = thisLine2.trim();
             // ignore white space lines or '#' comment lines
             if (!thisLine.startsWith("#") && thisLine.length() != 0) {
                 if (thisLine.startsWith("artifact ")) {
@@ -242,7 +245,11 @@
                                 // note: in the parser is a small part where we handle the title setting
                                 // and the reverse type setting for type == -1 (unique items marker in artifacts file)
                             } else {
-                                while ((thisLine = in.readLine()) != null && !thisLine.equals("end")) {
+                                while (true) {
+                                    final String thisLine3 = in.readLine();
+                                    if (thisLine3 == null || thisLine3.equals("end")) {
+                                        break;
+                                    }
                                 }
                             }
                         } catch (final UndefinedArchetypeException ex) {

Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 10:48:28 UTC (rev 8368)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java	2010-06-13 10:54:04 UTC (rev 8369)
@@ -95,10 +95,13 @@
                             boolean sectionFlag = false;  // true while section (start ... end) read
                             final List<R> archetypes = new ArrayList<R>(AutojoinList.SIZE);
                             boolean skipList = true;
-                            String line;
-                            while ((line = stream.readLine()) != null) {
-                                if (!line.startsWith("#") && line.length() > 0) {
-                                    line = line.trim();  // remove whitespace at both ends
+                            while (true) {
+                                final String line2 = stream.readLine();
+                                if (line2 == null) {
+                                    break;
+                                }
+                                if (!line2.startsWith("#") && line2.length() > 0) {
+                                    final String line = line2.trim();  // remove whitespace at both ends
 
                                     if (sectionFlag) {
                                         // we are inside a section


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

[Gridarta-commit] SF.net SVN: gridarta:[8368] trunk/model/src/app/net/sf/gridarta/model

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

Revision: 8368
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8368&view=rev
Author:   akirschbaum
Date:     2010-06-13 10:48:28 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Suppress warnings.

Modified Paths:
--------------
    trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
    trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java

Modified: trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java	2010-06-13 10:46:11 UTC (rev 8367)
+++ trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java	2010-06-13 10:48:28 UTC (rev 8368)
@@ -162,6 +162,9 @@
         archetype.setMultiY(multiY);
     }
 
+    /**
+     * @noinspection TypeMayBeWeakened
+     */
     @NotNull
     protected R getArchetype() {
         return archetype;

Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java	2010-06-13 10:46:11 UTC (rev 8367)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java	2010-06-13 10:48:28 UTC (rev 8368)
@@ -233,6 +233,7 @@
      * regarded deprecated.
      * @return last GameObject contained or <code>null</code> if {@link
      *         #isEmpty()} returns <code>true</code>
+     * @noinspection TypeMayBeWeakened
      */
     @Nullable
     public G getLast() {
@@ -455,6 +456,7 @@
      * @throws IllegalArgumentException if <var>gameObject</var> already is
      * inside another container or <var>previousGameObject</var> isn't inside
      * this container
+     * @noinspection TypeMayBeWeakened
      */
     public void insertAfter(@Nullable final G previousGameObject, @NotNull final G gameObject) {
         if (gameObject.isInContainer()) {


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

[Gridarta-commit] SF.net SVN: gridarta:[8367] trunk/crossfire

[<kbu...@us...>]

Revision: 8367
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8367&view=rev
Author:   kbulgrien
Date:     2010-06-13 10:46:11 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Improve grammar in various tip-of-the-day texts

Modified Paths:
--------------
    trunk/crossfire/ChangeLog
    trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-06-13 10:39:00 UTC (rev 8366)
+++ trunk/crossfire/ChangeLog	2010-06-13 10:46:11 UTC (rev 8367)
@@ -1,3 +1,7 @@
+2010-06-13  Kevin Bulgrien
+
+	* Improve grammar in various tip-of-the-day texts.
+
 2010-06-13  Andreas Kirschbaum
 
 	* Fix cursor position after mouse-clicks into script editor.

Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties	2010-06-13 10:39:00 UTC (rev 8366)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/tod.properties	2010-06-13 10:46:11 UTC (rev 8367)
@@ -22,18 +22,18 @@
 #
 # Tip Of The Day
 
-tod.text.1=<html>You can as well cycle through the tips using the arrow keys<br>(Arrow left / Arrow right)
+tod.text.1=<html>You can cycle through the tips using the arrow keys<br>(Arrow left / Arrow right)
 tod.text.2=<html>This Tip Of The Day window is non-modal.<p>That means the window may stay open while using the editor.
-tod.text.3=<html>You can online update the editor to get the latest version.<p>Menu: <code>Help -> Update</code>.<br>Keyboard: <kbd>Ctrl-U</kbd>.
+tod.text.3=<html>You can update the editor online to get the latest version.<p>Menu: <code>Help -> Update</code>.<br>Keyboard: <kbd>Ctrl-U</kbd>.
 tod.text.4=<html>You can quickly cycle through open windows.<p>Menu: <code>View->Previous / Next Window</code>.<br>Keyboard: <kbd>Shift-Page Up</kbd> / <kbd>Shift-Page Down</kbd>.
 tod.text.5=<html>How to use the mouse?<ul><li>To <em>select</em> squares, use the left mouse button.<li>To <em>paint</em> (insert arches), use the right mouse button.<li>To <em>delete</em>, use the middle mouse button or hold Ctrl and use the right mouse button.</ul>
 tod.text.6=<html>You can select all squares of a map at once.<p>Menu: <code>Edit -> Select All</code><br>Keyboard: <kbd>Ctrl-A</kbd>.
 tod.text.7=<html>The 10 most recently opened maps are quickly accessible.<p>Menu: <code>File -> Recent -> ...</code><br>Keyboard: <kbd>Alt-n</kbd> with n being a digit (1..9, 0)
 tod.text.8=<html>How can you speed up the editor?<ul><li>Load arches from the collection<li>Use Linux<li>Use the latest Java version available</ul>
 tod.text.9=<html>The editor does not load all images at startup.<p>Instead, it loads images as needed.<p>This is called "lazy image loading".
-tod.text.10=<html>The zoom feature knows different zoom resolutions.<p>This is a nice feature especially for map artists that want to publish previews.
-tod.text.11=<html>Many features have tooltips to help you.<p>Just hover the mouse over the thing you want to know about for a while.
+tod.text.10=<html>The zoom feature knows different zoom resolutions.<p>This is a nice feature, especially when map artists want to publish previews.
+tod.text.11=<html>Many features have tooltips to help you.<p>Just hover the mouse pointer over the thing you want to know about.
 tod.text.12=<html>To attach a map to other maps, you must save it first.
 tod.text.13=<html>Beware when editing large maps. You might run out of memory.<br>Be sure to increase the heap size (-Xmx parameter) of Gridarta''s Virtual Machine when editing large maps (e.g. 240\xD7240).
-tod.text.14=<html>It''s amazing how much archetypes you could find using "Search archetype".<p>Menu: <code>Archetypes -> Find archetype</code>.
+tod.text.14=<html>It''s amazing how many archetypes you could find using "Search archetype".<p>Menu: <code>Archetypes -> Find archetype</code>.
 tod.text.15=<html>You can quickly switch to the game object text editor with <code>CTRl-ALT-E</code>. Press these keys again to close it.


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

[Gridarta-commit] SF.net SVN: gridarta:[8366] trunk

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

Revision: 8366
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8366&view=rev
Author:   akirschbaum
Date:     2010-06-13 10:39:00 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Fix cursor position after mouse-clicks into script editor.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog
    trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java

Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog	2010-06-13 09:32:51 UTC (rev 8365)
+++ trunk/atrinik/ChangeLog	2010-06-13 10:39:00 UTC (rev 8366)
@@ -1,5 +1,7 @@
 2010-06-13  Andreas Kirschbaum
 
+	* Fix cursor position after mouse-clicks into script editor.
+
 	* Release 0.8.
 
 2010-06-10  Andreas Kirschbaum

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-06-13 09:32:51 UTC (rev 8365)
+++ trunk/crossfire/ChangeLog	2010-06-13 10:39:00 UTC (rev 8366)
@@ -1,5 +1,7 @@
 2010-06-13  Andreas Kirschbaum
 
+	* Fix cursor position after mouse-clicks into script editor.
+
 	* Release 0.8.
 
 2010-06-12  Andreas Kirschbaum

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-06-13 09:32:51 UTC (rev 8365)
+++ trunk/daimonin/ChangeLog	2010-06-13 10:39:00 UTC (rev 8366)
@@ -1,5 +1,7 @@
 2010-06-13  Andreas Kirschbaum
 
+	* Fix cursor position after mouse-clicks into script editor.
+
 	* Release 0.8.
 
 2010-06-10  Andreas Kirschbaum

Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java	2010-06-13 09:32:51 UTC (rev 8365)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java	2010-06-13 10:39:00 UTC (rev 8366)
@@ -1666,7 +1666,7 @@
 
             switch (e.getClickCount()) {
             case 1:
-                doSingleClick(e, line);
+                doSingleClick(e, dot);
                 break;
             case 2:
                 doDoubleClick(line, offset, dot);


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

[Gridarta-commit] SF.net SVN: gridarta:[8365] trunk

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

Revision: 8365
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8365&view=rev
Author:   akirschbaum
Date:     2010-06-13 09:32:51 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Add ChangeLog entry for release 0.8.

Modified Paths:
--------------
    trunk/atrinik/ChangeLog
    trunk/crossfire/ChangeLog
    trunk/daimonin/ChangeLog

Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog	2010-06-13 06:39:16 UTC (rev 8364)
+++ trunk/atrinik/ChangeLog	2010-06-13 09:32:51 UTC (rev 8365)
@@ -1,3 +1,7 @@
+2010-06-13  Andreas Kirschbaum
+
+	* Release 0.8.
+
 2010-06-10  Andreas Kirschbaum
 
 	* Fix path names in face and animation chooser.

Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog	2010-06-13 06:39:16 UTC (rev 8364)
+++ trunk/crossfire/ChangeLog	2010-06-13 09:32:51 UTC (rev 8365)
@@ -1,3 +1,7 @@
+2010-06-13  Andreas Kirschbaum
+
+	* Release 0.8.
+
 2010-06-12  Andreas Kirschbaum
 
 	* Collect resources.

Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog	2010-06-13 06:39:16 UTC (rev 8364)
+++ trunk/daimonin/ChangeLog	2010-06-13 09:32:51 UTC (rev 8365)
@@ -1,3 +1,7 @@
+2010-06-13  Andreas Kirschbaum
+
+	* Release 0.8.
+
 2010-06-10  Andreas Kirschbaum
 
 	* Fix path names in face and animation chooser.


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

[Gridarta-commit] SF.net SVN: gridarta:[8364] tags/0.8

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

Revision: 8364
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8364&view=rev
Author:   akirschbaum
Date:     2010-06-13 06:39:16 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Release 0.8.

Modified Paths:
--------------
    tags/0.8/atrinik/ChangeLog
    tags/0.8/atrinik/build.xml
    tags/0.8/crossfire/ChangeLog
    tags/0.8/crossfire/build.xml
    tags/0.8/daimonin/ChangeLog
    tags/0.8/daimonin/build.xml

Modified: tags/0.8/atrinik/ChangeLog
===================================================================
--- tags/0.8/atrinik/ChangeLog	2010-06-13 06:36:13 UTC (rev 8363)
+++ tags/0.8/atrinik/ChangeLog	2010-06-13 06:39:16 UTC (rev 8364)
@@ -1,3 +1,7 @@
+2010-06-13  Andreas Kirschbaum
+
+	* Release 0.8.
+
 2010-06-10  Andreas Kirschbaum
 
 	* Fix path names in face and animation chooser.

Modified: tags/0.8/atrinik/build.xml
===================================================================
--- tags/0.8/atrinik/build.xml	2010-06-13 06:36:13 UTC (rev 8363)
+++ tags/0.8/atrinik/build.xml	2010-06-13 06:39:16 UTC (rev 8364)
@@ -69,7 +69,7 @@
         </tstamp>
         <exec executable="svnversion" outputproperty="build.svnversion" failifexecutionfails="false"/>
         <property name="build.svnversion" value="unknown"/>
-        <property name="build.version" value="Gridzilla"/>
+        <property name="build.version" value="0.8"/>
         <property name="build.number" value="${build.version} (revision ${build.svnversion})"/>
         <echoproperties destfile="build.properties">
             <propertyset negate="true">

Modified: tags/0.8/crossfire/ChangeLog
===================================================================
--- tags/0.8/crossfire/ChangeLog	2010-06-13 06:36:13 UTC (rev 8363)
+++ tags/0.8/crossfire/ChangeLog	2010-06-13 06:39:16 UTC (rev 8364)
@@ -1,3 +1,7 @@
+2010-06-13  Andreas Kirschbaum
+
+	* Release 0.8.
+
 2010-06-12  Andreas Kirschbaum
 
 	* Collect resources.

Modified: tags/0.8/crossfire/build.xml
===================================================================
--- tags/0.8/crossfire/build.xml	2010-06-13 06:36:13 UTC (rev 8363)
+++ tags/0.8/crossfire/build.xml	2010-06-13 06:39:16 UTC (rev 8364)
@@ -66,7 +66,7 @@
         </tstamp>
         <exec executable="svnversion" outputproperty="build.svnversion" failifexecutionfails="false"/>
         <property name="build.svnversion" value="unknown"/>
-        <property name="build.version" value="Gridzilla"/>
+        <property name="build.version" value="0.8"/>
         <property name="build.number" value="${build.version} (revision ${build.svnversion})"/>
         <echoproperties destfile="build.properties">
             <propertyset>

Modified: tags/0.8/daimonin/ChangeLog
===================================================================
--- tags/0.8/daimonin/ChangeLog	2010-06-13 06:36:13 UTC (rev 8363)
+++ tags/0.8/daimonin/ChangeLog	2010-06-13 06:39:16 UTC (rev 8364)
@@ -1,3 +1,7 @@
+2010-06-13  Andreas Kirschbaum
+
+	* Release 0.8.
+
 2010-06-10  Andreas Kirschbaum
 
 	* Fix path names in face and animation chooser.

Modified: tags/0.8/daimonin/build.xml
===================================================================
--- tags/0.8/daimonin/build.xml	2010-06-13 06:36:13 UTC (rev 8363)
+++ tags/0.8/daimonin/build.xml	2010-06-13 06:39:16 UTC (rev 8364)
@@ -69,7 +69,7 @@
         </tstamp>
         <exec executable="svnversion" outputproperty="build.svnversion" failifexecutionfails="false"/>
         <property name="build.svnversion" value="unknown"/>
-        <property name="build.version" value="Gridzilla"/>
+        <property name="build.version" value="0.8"/>
         <property name="build.number" value="${build.version} (revision ${build.svnversion})"/>
         <echoproperties destfile="build.properties">
             <propertyset negate="true">


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

[Gridarta-commit] SF.net SVN: gridarta:[8363] tags/0.8/

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

Revision: 8363
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8363&view=rev
Author:   akirschbaum
Date:     2010-06-13 06:36:13 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Create tag 0.8.

Added Paths:
-----------
    tags/0.8/


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

[Gridarta-commit] SF.net SVN: gridarta:[8362] branches/0.8

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

Revision: 8362
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8362&view=rev
Author:   akirschbaum
Date:     2010-06-12 20:05:27 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
Remove incorrect assertion.

Modified Paths:
--------------
    branches/0.8/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java

Property Changed:
----------------
    branches/0.8/
    branches/0.8/crossfire/src/app/net/sf/gridarta/var/crossfire/
    branches/0.8/daimonin/src/app/net/sf/gridarta/var/daimonin/
    branches/0.8/daimonin/src/test/net/sf/gridarta/var/daimonin/
    branches/0.8/lib/bsh-LICENSE
    branches/0.8/lib/bsh-classgen-2.0b4.jar
    branches/0.8/lib/bsh-commands-2.0b4.jar
    branches/0.8/lib/bsh-core-2.0b4.jar
    branches/0.8/lib/bsh-util-2.0b4.jar
    branches/0.8/lib/jdom.jar
    branches/0.8/lib/jdom.jar-LICENSE
    branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
    branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
    branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
    branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
    branches/0.8/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
    branches/0.8/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
    branches/0.8/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
    branches/0.8/resource/icons/CreateImageSmallIcon.gif
    branches/0.8/resource/icons/Dir1.gif
    branches/0.8/resource/icons/Dir2.gif
    branches/0.8/resource/icons/Dir3.gif
    branches/0.8/resource/icons/Dir4.gif
    branches/0.8/resource/icons/Dir5.gif
    branches/0.8/resource/icons/Dir6.gif
    branches/0.8/resource/icons/Dir7.gif
    branches/0.8/resource/icons/Dir8.gif
    branches/0.8/resource/icons/EditPluginSmallIcon.gif
    branches/0.8/resource/icons/EmptySmallIcon.gif
    branches/0.8/resource/icons/ImportPluginSmallIcon.gif
    branches/0.8/resource/icons/SaveMapAsSmallIcon.gif
    branches/0.8/resource/icons/auto_run_small_icon.gif
    branches/0.8/resource/icons/close_tab_small_icon.gif
    branches/0.8/resource/icons/development/Application24.gif
    branches/0.8/resource/icons/development/Host16.gif
    branches/0.8/resource/icons/development/Host24.gif
    branches/0.8/resource/icons/development/Jar16.gif
    branches/0.8/resource/icons/development/Server16.gif
    branches/0.8/resource/icons/development/Server24.gif
    branches/0.8/resource/icons/filter_small_icon.gif
    branches/0.8/resource/icons/general/About16.gif
    branches/0.8/resource/icons/general/Copy16.gif
    branches/0.8/resource/icons/general/Cut16.gif
    branches/0.8/resource/icons/general/Delete16.gif
    branches/0.8/resource/icons/general/Edit16.gif
    branches/0.8/resource/icons/general/Help16.gif
    branches/0.8/resource/icons/general/History16.gif
    branches/0.8/resource/icons/general/New16.gif
    branches/0.8/resource/icons/general/Open16.gif
    branches/0.8/resource/icons/general/Paste16.gif
    branches/0.8/resource/icons/general/Preferences16.gif
    branches/0.8/resource/icons/general/Preferences24.gif
    branches/0.8/resource/icons/general/Properties16.gif
    branches/0.8/resource/icons/general/Redo16.gif
    branches/0.8/resource/icons/general/Refresh16.gif
    branches/0.8/resource/icons/general/Remove16.gif
    branches/0.8/resource/icons/general/Replace16.gif
    branches/0.8/resource/icons/general/Save16.gif
    branches/0.8/resource/icons/general/Save24.gif
    branches/0.8/resource/icons/general/SaveAs16.gif
    branches/0.8/resource/icons/general/Search16.gif
    branches/0.8/resource/icons/general/TipOfTheDay16.gif
    branches/0.8/resource/icons/general/Undo16.gif
    branches/0.8/resource/icons/general/Zoom16.gif
    branches/0.8/resource/icons/media/
    branches/0.8/resource/icons/run_plugin_small_icon.gif
    branches/0.8/resource/log4j.properties
    branches/0.8/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java
    branches/0.8/src/app/net/sf/gridarta/gui/filter/
    branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBitmask.java
    branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
    branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
    branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java
    branches/0.8/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
    branches/0.8/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
    branches/0.8/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
    branches/0.8/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java
    branches/0.8/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
    branches/0.8/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java
    branches/0.8/src/app/net/sf/gridarta/gui/prefs/AppPreferences.java
    branches/0.8/src/app/net/sf/gridarta/gui/prefs/DevPreferences.java
    branches/0.8/src/app/net/sf/gridarta/gui/prefs/GUIPreferences.java
    branches/0.8/src/app/net/sf/gridarta/gui/prefs/NetPreferences.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ClosingIcon.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptController.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptEditor.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptManager.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/StackLayout.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java
    branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java
    branches/0.8/src/app/net/sf/gridarta/gui/utils/MenuUtils.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/Loader.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFile.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolder.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java
    branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderTreeListener.java
    branches/0.8/src/app/net/sf/gridarta/script/BshThread.java
    branches/0.8/src/app/net/sf/gridarta/script/Script.java
    branches/0.8/src/app/net/sf/gridarta/script/ScriptExecException.java
    branches/0.8/src/app/net/sf/gridarta/script/ScriptModel.java
    branches/0.8/src/app/net/sf/gridarta/script/ScriptModelListener.java
    branches/0.8/src/app/net/sf/gridarta/script/ScriptParameters.java
    branches/0.8/src/app/net/sf/gridarta/script/ScriptRunMode.java
    branches/0.8/src/app/net/sf/gridarta/script/parameter/
    branches/0.8/utils/src/app/net/sf/gridarta/utils/ConfigFileUtils.java
    branches/0.8/utils/src/app/net/sf/gridarta/utils/GUIUtils.java
    branches/0.8/utils/src/app/net/sf/gridarta/utils/IOUtils.java
    branches/0.8/utils/src/app/net/sf/gridarta/utils/ProcessRunner.java
    branches/0.8/utils/src/app/net/sf/gridarta/utils/WrappingStringBuilder.java
    branches/0.8/utils/src/app/net/sf/gridarta/utils/XmlHelper.java
    branches/0.8/utils/src/test/net/sf/gridarta/utils/WrappingStringBuilderTest.java


Property changes on: branches/0.8
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update:5966-5991
/trunk:2-5965
   + /streams/cher-japi-update:5966-5991
/trunk:2-5965,8361


Property changes on: branches/0.8/crossfire/src/app/net/sf/gridarta/var/crossfire
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
   + /streams/cher-japi-update/crossfire/src/app/net/sf/gridarta/var/crossfire:5966-5991
/trunk/crossfire/src/app/net/sf/gridarta/var/crossfire:8361


Property changes on: branches/0.8/daimonin/src/app/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
   + /streams/cher-japi-update/daimonin/src/app/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/app/net/sf/gridarta/var/daimonin:8361


Property changes on: branches/0.8/daimonin/src/test/net/sf/gridarta/var/daimonin
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
   + /streams/cher-japi-update/daimonin/src/test/net/sf/gridarta/var/daimonin:5966-5991
/trunk/daimonin/src/test/net/sf/gridarta/var/daimonin:8361


Property changes on: branches/0.8/lib/bsh-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
   + /streams/cher-japi-update/lib/bsh-LICENSE:5966-5991
/trunk/lib/bsh-LICENSE:8361


Property changes on: branches/0.8/lib/bsh-classgen-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
   + /streams/cher-japi-update/lib/bsh-classgen-2.0b4.jar:5966-5991
/trunk/lib/bsh-classgen-2.0b4.jar:8361


Property changes on: branches/0.8/lib/bsh-commands-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
   + /streams/cher-japi-update/lib/bsh-commands-2.0b4.jar:5966-5991
/trunk/lib/bsh-commands-2.0b4.jar:8361


Property changes on: branches/0.8/lib/bsh-core-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
   + /streams/cher-japi-update/lib/bsh-core-2.0b4.jar:5966-5991
/trunk/lib/bsh-core-2.0b4.jar:8361


Property changes on: branches/0.8/lib/bsh-util-2.0b4.jar
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
   + /streams/cher-japi-update/lib/bsh-util-2.0b4.jar:5966-5991
/trunk/lib/bsh-util-2.0b4.jar:8361


Property changes on: branches/0.8/lib/jdom.jar
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/jdom.jar:5966-5991
   + /streams/cher-japi-update/lib/jdom.jar:5966-5991
/trunk/lib/jdom.jar:8361


Property changes on: branches/0.8/lib/jdom.jar-LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
   + /streams/cher-japi-update/lib/jdom.jar-LICENSE:5966-5991
/trunk/lib/jdom.jar-LICENSE:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeAttribute.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeAttribute.java:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeType.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/ArchetypeTypeSet.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeTypeSet.java:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/archtype/CAttribBitmask.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/archetypetype/AttributeBitmask.java:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinList.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/autojoin/AutojoinLists.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java:8361


Property changes on: branches/0.8/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gameobject/DefaultGameObject.java:5966-5991
/trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java:8361


Property changes on: branches/0.8/resource/icons/CreateImageSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/CreateImageSmallIcon.gif:5966-5991
/trunk/resource/icons/CreateImageSmallIcon.gif:8361


Property changes on: branches/0.8/resource/icons/Dir1.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir1.gif:5966-5991
/trunk/resource/icons/Dir1.gif:8361


Property changes on: branches/0.8/resource/icons/Dir2.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir2.gif:5966-5991
/trunk/resource/icons/Dir2.gif:8361


Property changes on: branches/0.8/resource/icons/Dir3.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir3.gif:5966-5991
/trunk/resource/icons/Dir3.gif:8361


Property changes on: branches/0.8/resource/icons/Dir4.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir4.gif:5966-5991
/trunk/resource/icons/Dir4.gif:8361


Property changes on: branches/0.8/resource/icons/Dir5.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir5.gif:5966-5991
/trunk/resource/icons/Dir5.gif:8361


Property changes on: branches/0.8/resource/icons/Dir6.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir6.gif:5966-5991
/trunk/resource/icons/Dir6.gif:8361


Property changes on: branches/0.8/resource/icons/Dir7.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir7.gif:5966-5991
/trunk/resource/icons/Dir7.gif:8361


Property changes on: branches/0.8/resource/icons/Dir8.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/Dir8.gif:5966-5991
/trunk/resource/icons/Dir8.gif:8361


Property changes on: branches/0.8/resource/icons/EditPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/EditPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/EditPluginSmallIcon.gif:8361


Property changes on: branches/0.8/resource/icons/EmptySmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/EmptySmallIcon.gif:5966-5991
/trunk/resource/icons/EmptySmallIcon.gif:8361


Property changes on: branches/0.8/resource/icons/ImportPluginSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/ImportPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/ImportPluginSmallIcon.gif:8361


Property changes on: branches/0.8/resource/icons/SaveMapAsSmallIcon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/SaveLevelAsSmallIcon.gif:5966-5991
/trunk/resource/icons/SaveMapAsSmallIcon.gif:8361


Property changes on: branches/0.8/resource/icons/auto_run_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/AutorunSmallIcon.gif:5966-5991
/trunk/resource/icons/auto_run_small_icon.gif:8361


Property changes on: branches/0.8/resource/icons/close_tab_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/CloseTabSmallIcon.gif:5966-5991
/trunk/resource/icons/close_tab_small_icon.gif:8361


Property changes on: branches/0.8/resource/icons/development/Application24.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/development/Application24.gif:5966-5991
/trunk/resource/icons/development/Application24.gif:8361


Property changes on: branches/0.8/resource/icons/development/Host16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/development/Host16.gif:5966-5991
/trunk/resource/icons/development/Host16.gif:8361


Property changes on: branches/0.8/resource/icons/development/Host24.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/development/Host24.gif:5966-5991
/trunk/resource/icons/development/Host24.gif:8361


Property changes on: branches/0.8/resource/icons/development/Jar16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/development/Jar16.gif:5966-5991
/trunk/resource/icons/development/Jar16.gif:8361


Property changes on: branches/0.8/resource/icons/development/Server16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/development/Server16.gif:5966-5991
/trunk/resource/icons/development/Server16.gif:8361


Property changes on: branches/0.8/resource/icons/development/Server24.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/development/Server24.gif:5966-5991
/trunk/resource/icons/development/Server24.gif:8361


Property changes on: branches/0.8/resource/icons/filter_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/FilterSmallIcon.gif:5966-5991
/trunk/resource/icons/filter_small_icon.gif:8361


Property changes on: branches/0.8/resource/icons/general/About16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/About16.gif:5966-5991
/trunk/resource/icons/general/About16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Copy16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Copy16.gif:5966-5991
/trunk/resource/icons/general/Copy16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Cut16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Cut16.gif:5966-5991
/trunk/resource/icons/general/Cut16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Delete16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Delete16.gif:5966-5991
/trunk/resource/icons/general/Delete16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Edit16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Edit16.gif:5966-5991
/trunk/resource/icons/general/Edit16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Help16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Help16.gif:5966-5991
/trunk/resource/icons/general/Help16.gif:8361


Property changes on: branches/0.8/resource/icons/general/History16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/History16.gif:5966-5991
/trunk/resource/icons/general/History16.gif:8361


Property changes on: branches/0.8/resource/icons/general/New16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/New16.gif:5966-5991
/trunk/resource/icons/general/New16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Open16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Open16.gif:5966-5991
/trunk/resource/icons/general/Open16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Paste16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Paste16.gif:5966-5991
/trunk/resource/icons/general/Paste16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Preferences16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Preferences16.gif:5966-5991
/trunk/resource/icons/general/Preferences16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Preferences24.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Preferences24.gif:5966-5991
/trunk/resource/icons/general/Preferences24.gif:8361


Property changes on: branches/0.8/resource/icons/general/Properties16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Properties16.gif:5966-5991
/trunk/resource/icons/general/Properties16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Redo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Redo16.gif:5966-5991
/trunk/resource/icons/general/Redo16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Refresh16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Refresh16.gif:5966-5991
/trunk/resource/icons/general/Refresh16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Remove16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Remove16.gif:5966-5991
/trunk/resource/icons/general/Remove16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Replace16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Replace16.gif:5966-5991
/trunk/resource/icons/general/Replace16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Save16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Save16.gif:5966-5991
/trunk/resource/icons/general/Save16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Save24.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Save24.gif:5966-5991
/trunk/resource/icons/general/Save24.gif:8361


Property changes on: branches/0.8/resource/icons/general/SaveAs16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/SaveAs16.gif:5966-5991
/trunk/resource/icons/general/SaveAs16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Search16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Search16.gif:5966-5991
/trunk/resource/icons/general/Search16.gif:8361


Property changes on: branches/0.8/resource/icons/general/TipOfTheDay16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/TipOfTheDay16.gif:5966-5991
/trunk/resource/icons/general/TipOfTheDay16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Undo16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Undo16.gif:5966-5991
/trunk/resource/icons/general/Undo16.gif:8361


Property changes on: branches/0.8/resource/icons/general/Zoom16.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/general/Zoom16.gif:5966-5991
/trunk/resource/icons/general/Zoom16.gif:8361


Property changes on: branches/0.8/resource/icons/media
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/media:5966-5991
   + /streams/cher-japi-update/resource/icons/media:5966-5991
/trunk/resource/icons/media:8361


Property changes on: branches/0.8/resource/icons/run_plugin_small_icon.gif
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
   + /streams/cher-japi-update/resource/icons/RunPluginSmallIcon.gif:5966-5991
/trunk/resource/icons/run_plugin_small_icon.gif:8361


Property changes on: branches/0.8/resource/log4j.properties
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
   + /streams/cher-japi-update/crossfire/resource/log4j.properties:5966-5991
/trunk/resource/log4j.properties:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/filter
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/filter:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/filter:5966-5991
/trunk/src/app/net/sf/gridarta/gui/filter:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBitmask.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribBitmask.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBitmask.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/map/DefaultMapActions.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/ObjectChoiceDisplay.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/prefs/AppPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/AppPrefs.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/AppPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/prefs/AppPreferences.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/prefs/DevPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/DevPrefs.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/DevPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/prefs/DevPreferences.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/prefs/GUIPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/GUIPrefs.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/GUIPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/prefs/GUIPreferences.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/prefs/NetPreferences.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/prefs/NetPreferences.java:8361

Modified: branches/0.8/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java
===================================================================
--- branches/0.8/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java	2010-06-12 19:47:25 UTC (rev 8361)
+++ branches/0.8/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java	2010-06-12 20:05:27 UTC (rev 8362)
@@ -236,7 +236,6 @@
         } else {
             imageSet = convertImageSet(null);
         }
-        assert mediaField != null;
         if (!PathManager.getAbsolutePath(archField.getText()).equals(globalSettings.getArchDirectory().getPath()) || !PathManager.getAbsolutePath(mapField.getText()).equals(globalSettings.getMapsDirectory().getPath())) {
             return true;
         }


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/CloseableTabbedPane.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ClosingIcon.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ClosingIcon.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptController.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/script/ScriptController.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/script/ScriptController.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ScriptEditor.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptManager.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManager.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManager.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ScriptManager.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ScriptView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/ScriptViewPane.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/StackLayout.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/StackLayout.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/StackLayout.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/StackLayout.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/gui/utils/MenuUtils.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/gui/utils/MenuUtils.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/gui/utils/MenuUtils.java:5966-5991
/trunk/src/app/net/sf/gridarta/gui/utils/MenuUtils.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/DuplicateMapFolderException.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/DuplicatePickmapException.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/InvalidNameException.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/Loader.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/Loader.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/Loader.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/Loader.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFile.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFile.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFile.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/MapFile.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/MapFileNameComparator.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolder.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolder.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolder.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/MapFolder.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java:5966-5991
/trunk/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java:8361


Property changes on: branches/0.8/src/app/net/sf/gridarta/mapfiles/MapFolderTreeListener.java
___________________________________________________________________
Modified: svn:mergeinfo
   - /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTreeListener.java:5966-5991
   + /streams/cher-japi-update/src/app/net/sf/gridarta/mapfiles/MapFolderTreeL...
 
[truncated message content]

[Gridarta-commit] SF.net SVN: gridarta:[8361] trunk/src/app/net/sf/gridarta/gui/prefs/ ResPreferences.java

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

Revision: 8361
          http://gridarta.svn.sourceforge.net/gridarta/?rev=8361&view=rev
Author:   akirschbaum
Date:     2010-06-12 19:47:25 +0000 (Sat, 12 Jun 2010)

Log Message:
-----------
Remove incorrect assertion.

Modified Paths:
--------------
    trunk/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java

Modified: trunk/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java	2010-06-12 17:56:24 UTC (rev 8360)
+++ trunk/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java	2010-06-12 19:47:25 UTC (rev 8361)
@@ -236,7 +236,6 @@
         } else {
             imageSet = convertImageSet(null);
         }
-        assert mediaField != null;
         if (!PathManager.getAbsolutePath(archField.getText()).equals(globalSettings.getArchDirectory().getPath()) || !PathManager.getAbsolutePath(mapField.getText()).equals(globalSettings.getMapsDirectory().getPath())) {
             return true;
         }


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