Menu
▾
▴
gridarta-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
| 2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
| 2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
| 2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
| 2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
| 2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
| 2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
|
From: <aki...@us...> - 2010-06-30 06:09:32
|
Revision: 8560
http://gridarta.svn.sourceforge.net/gridarta/?rev=8560&view=rev
Author: akirschbaum
Date: 2010-06-30 06:09:26 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
Merge duplicated code.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java 2010-06-30 06:08:40 UTC (rev 8559)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java 2010-06-30 06:09:26 UTC (rev 8560)
@@ -121,11 +121,12 @@
}
private int joinInsert(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Point point, @NotNull final AutojoinList<G, A, R> autojoinList, final int dx, final int dy, final int dir, final int reverseDir) {
- if (!mapModel.getMapArchObject().isPointValid(new Point(point.x + dx, point.y + dy))) {
+ final Point tmp = new Point(point.x + dx, point.y + dy);
+ if (!mapModel.getMapArchObject().isPointValid(tmp)) {
return 0;
}
- final GameObject<G, A, R> gameObject = findGameObjectOfAutojoinList(mapModel, new Point(point.x + dx, point.y + dy), autojoinList);
+ final GameObject<G, A, R> gameObject = findGameObjectOfAutojoinList(mapModel, tmp, autojoinList);
if (gameObject == null) {
return 0;
}
@@ -164,11 +165,12 @@
}
private void joinDelete(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Point point, @NotNull final AutojoinList<G, A, R> autojoinList, final int dx, final int dy, final int dir) {
- if (!mapModel.getMapArchObject().isPointValid(new Point(point.x + dx, point.y + dy))) {
+ final Point tmp = new Point(point.x + dx, point.y + dy);
+ if (!mapModel.getMapArchObject().isPointValid(tmp)) {
return;
}
- final GameObject<G, A, R> gameObject = findGameObjectOfAutojoinList(mapModel, new Point(point.x + dx, point.y + dy), autojoinList);
+ final GameObject<G, A, R> gameObject = findGameObjectOfAutojoinList(mapModel, tmp, autojoinList);
if (gameObject == null) {
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-30 06:08:47
|
Revision: 8559
http://gridarta.svn.sourceforge.net/gridarta/?rev=8559&view=rev
Author: akirschbaum
Date: 2010-06-30 06:08:40 +0000 (Wed, 30 Jun 2010)
Log Message:
-----------
Whitespace change.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java 2010-06-29 05:31:54 UTC (rev 8558)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java 2010-06-30 06:08:40 UTC (rev 8559)
@@ -66,7 +66,7 @@
* @param autojoinList the autojoin list to add
* @throws IllegalAutojoinListException if the autojoin list cannot be added
*/
- public void addAutojoinList(@NotNull final AutojoinList<G, A, R> autojoinList) throws IllegalAutojoinListException{
+ public void addAutojoinList(@NotNull final AutojoinList<G, A, R> autojoinList) throws IllegalAutojoinListException {
for (int i = 0; i < AutojoinList.SIZE; i++) {
final Archetype<G, A, R> archetype = autojoinList.getArchetype(i);
if (autojoinLists.containsKey(archetype)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-29 05:32:01
|
Revision: 8558
http://gridarta.svn.sourceforge.net/gridarta/?rev=8558&view=rev
Author: akirschbaum
Date: 2010-06-29 05:31:54 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Check for inconsistently defined autojoin lists.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
Added Paths:
-----------
trunk/model/src/test/net/sf/gridarta/model/autojoin/AutojoinListsTest.java
Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java 2010-06-28 19:20:47 UTC (rev 8557)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java 2010-06-29 05:31:54 UTC (rev 8558)
@@ -21,7 +21,9 @@
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.IdentityHashMap;
import java.util.List;
+import java.util.Map;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
@@ -84,6 +86,18 @@
throw new IllegalAutojoinListException("autojoin list with less than " + SIZE + " valid entries");
}
+ final Map<R, R> tmp = new IdentityHashMap<R, R>();
+ for (final R archetype : newArchetypes) {
+ if (archetype == null) {
+ throw new IllegalArgumentException();
+ }
+
+ // Must not check for duplicate archetypes as Daimonin uses this.
+ //if (tmp.put(archetype, archetype) != null) {
+ // throw new IllegalAutojoinListException("autojoin list contains duplicate archetype '" + archetype.getArchetypeName() + "'");
+ //}
+ }
+
newArchetypes.trimToSize();
this.archetypes = newArchetypes;
}
Modified: trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java 2010-06-28 19:20:47 UTC (rev 8557)
+++ trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java 2010-06-29 05:31:54 UTC (rev 8558)
@@ -64,9 +64,17 @@
/**
* Adds a new autojoin list.
* @param autojoinList the autojoin list to add
+ * @throws IllegalAutojoinListException if the autojoin list cannot be added
*/
- public void addAutojoinList(@NotNull final AutojoinList<G, A, R> autojoinList) {
+ public void addAutojoinList(@NotNull final AutojoinList<G, A, R> autojoinList) throws IllegalAutojoinListException{
for (int i = 0; i < AutojoinList.SIZE; i++) {
+ final Archetype<G, A, R> archetype = autojoinList.getArchetype(i);
+ if (autojoinLists.containsKey(archetype)) {
+ throw new IllegalAutojoinListException("archetype '" + archetype.getArchetypeName() + "' contained in more than one autojoin list");
+ }
+ }
+
+ for (int i = 0; i < AutojoinList.SIZE; i++) {
autojoinLists.put(autojoinList.getArchetype(i), autojoinList);
}
}
Added: trunk/model/src/test/net/sf/gridarta/model/autojoin/AutojoinListsTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/autojoin/AutojoinListsTest.java (rev 0)
+++ trunk/model/src/test/net/sf/gridarta/model/autojoin/AutojoinListsTest.java 2010-06-29 05:31:54 UTC (rev 8558)
@@ -0,0 +1,185 @@
+/*
+ * 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.autojoin;
+
+import java.util.ArrayList;
+import java.util.List;
+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.ArchetypeFactory;
+import net.sf.gridarta.model.archetype.ArchetypeSet;
+import net.sf.gridarta.model.archetype.DuplicateArchetypeException;
+import net.sf.gridarta.model.archetype.TestArchetype;
+import net.sf.gridarta.model.archetype.TestArchetypeFactory;
+import net.sf.gridarta.model.archetype.TestArchetypeSet;
+import net.sf.gridarta.model.archetype.UndefinedArchetypeException;
+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.TestGameObject;
+import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapviewsettings.TestMapViewSettings;
+import net.sf.gridarta.utils.GUIUtils;
+import net.sf.gridarta.utils.SystemIcons;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link AutojoinLists}.
+ * @author Andreas Kirschbaum
+ */
+public class AutojoinListsTest {
+
+ /**
+ * Checks that a wrong number of archetypes is detected.
+ * @throws IllegalAutojoinListException if the test fails
+ */
+ @Test
+ public void testWrongCount() throws IllegalAutojoinListException {
+ final Creator creator = new Creator();
+ creator.newAutojoinListsFail("autojoin list with less than 16 valid entries");
+ creator.newAutojoinListsFail("autojoin list with less than 16 valid entries", "a0");
+ creator.newAutojoinListsFail("autojoin list with less than 16 valid entries", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14");
+ creator.newAutojoinLists("a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15");
+ creator.newAutojoinListsFail("autojoin list with more than 16 valid entries", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15", "a16");
+ }
+
+ /**
+ * Checks that duplicate archetypes are detected.
+ * @throws IllegalAutojoinListException if the test fails
+ */
+ @Test
+ public void testDuplicateArchetype1() throws IllegalAutojoinListException {
+ final Creator creator = new Creator();
+ //Check disabled for now as Daimonin uses this feature:
+ //creator.newAutojoinListsFail("autojoin list contains duplicate archetype 'a0'", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a0");
+ creator.newAutojoinLists("a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a0");
+ }
+
+ /**
+ * Checks that duplicate archetypes are detected.
+ * @throws IllegalAutojoinListException if the test fails
+ */
+ @Test
+ public void testDuplicateArchetype2() throws IllegalAutojoinListException {
+ final Creator creator = new Creator();
+ creator.newAutojoinLists("a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15");
+ creator.newAutojoinListsFail("archetype 'a4' contained in more than one autojoin list", "b0", "b1", "b2", "b3", "a4", "b5", "b6", "b7", "b8", "b9", "b10", "b11", "b12", "b13", "b14", "b15");
+ }
+
+ /**
+ * Creator for {@link AutojoinList} instances.
+ */
+ private static class Creator {
+
+ /**
+ * The {@link AutojoinLists} instance.
+ */
+ @NotNull
+ private final AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype> autojoinLists;
+
+ /**
+ * The {@link FaceObjectProviders} instance.
+ */
+ @NotNull
+ private final FaceObjectProviders faceObjectProviders;
+
+ /**
+ * The {@link AnimationObjects} instance.
+ */
+ @NotNull
+ private final AnimationObjects<TestGameObject, TestMapArchObject, TestArchetype> animationObjects;
+
+ /**
+ * The {@link ArchetypeSet} instance.
+ */
+ @NotNull
+ private final ArchetypeSet<TestGameObject, TestMapArchObject, TestArchetype> archetypeSet;
+
+ /**
+ * Creates a new instance.
+ */
+ private Creator() {
+ final ArchetypeFactory<TestGameObject, TestMapArchObject, TestArchetype> archetypeFactory = new TestArchetypeFactory();
+ final GUIUtils guiUtils = new GUIUtils();
+ final SystemIcons systemIcons = new SystemIcons(guiUtils);
+ final ArchFaceProvider archFaceProvider = new ArchFaceProvider();
+ final FaceObjects<TestGameObject, TestMapArchObject, TestArchetype> faceObjects = new DefaultFaceObjects<TestGameObject, TestMapArchObject, TestArchetype>("png", "facetree", Pattern.compile(""), "", archFaceProvider);
+ faceObjectProviders = new FaceObjectProviders(1, faceObjects, systemIcons);
+ archetypeSet = new TestArchetypeSet(archetypeFactory, "arch", faceObjectProviders);
+ animationObjects = new DefaultAnimationObjects<TestGameObject, TestMapArchObject, TestArchetype>("animtree");
+ final TestMapViewSettings mapViewSettings = new TestMapViewSettings();
+ autojoinLists = new AutojoinLists<TestGameObject, TestMapArchObject, TestArchetype>(mapViewSettings);
+ }
+
+ /**
+ * Creates a new {@link AutojoinLists} instance.
+ * @param archetypeNames the names of the archetypes
+ * @throws IllegalAutojoinListException if the autojoin lists instance
+ * cannot be created
+ */
+ public void newAutojoinLists(@NotNull final String... archetypeNames) throws IllegalAutojoinListException {
+ final List<TestArchetype> archetypes = new ArrayList<TestArchetype>();
+ for (final String archetypeName : archetypeNames) {
+ archetypes.add(getArchetype(archetypeName));
+ }
+ autojoinLists.addAutojoinList(new AutojoinList<TestGameObject, TestMapArchObject, TestArchetype>(archetypes));
+ }
+
+ /**
+ * Creates a new {@link AutojoinLists} instance and expects an error.
+ * @param expectedException the expected error message
+ * @param archetypeNames the archetype names
+ */
+ public void newAutojoinListsFail(@NotNull final String expectedException, @NotNull final String... archetypeNames) {
+ try {
+ newAutojoinLists(archetypeNames);
+ Assert.fail();
+ } catch (final IllegalAutojoinListException ex) {
+ Assert.assertEquals(expectedException, ex.getMessage());
+ }
+ }
+
+ /**
+ * Returns or creates an archetype by name.
+ * @param archetypeName the archetype name
+ * @return the archetype
+ */
+ @NotNull
+ private TestArchetype getArchetype(@NotNull final String archetypeName) {
+ try {
+ return archetypeSet.getArchetype(archetypeName);
+ } catch (final UndefinedArchetypeException ignored) {
+ final TestArchetype archetype = new TestArchetype(archetypeName, faceObjectProviders, animationObjects);
+ try {
+ archetypeSet.addArchetype(archetype);
+ } catch (final DuplicateArchetypeException ex) {
+ Assert.fail(ex.getMessage());
+ }
+ return archetype;
+ }
+ }
+
+ }
+
+} // class AutojoinListsTest
Property changes on: trunk/model/src/test/net/sf/gridarta/model/autojoin/AutojoinListsTest.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.
|
|
From: <aki...@us...> - 2010-06-28 19:20:53
|
Revision: 8557
http://gridarta.svn.sourceforge.net/gridarta/?rev=8557&view=rev
Author: akirschbaum
Date: 2010-06-28 19:20:47 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Release 0.8.1.
Modified Paths:
--------------
tags/0.8.1/atrinik/build.xml
tags/0.8.1/crossfire/build.xml
tags/0.8.1/daimonin/build.xml
Modified: tags/0.8.1/atrinik/build.xml
===================================================================
--- tags/0.8.1/atrinik/build.xml 2010-06-28 19:18:35 UTC (rev 8556)
+++ tags/0.8.1/atrinik/build.xml 2010-06-28 19:20:47 UTC (rev 8557)
@@ -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.1"/>
<property name="build.number" value="${build.version} (revision ${build.svnversion})"/>
<echoproperties destfile="build.properties">
<propertyset negate="true">
Modified: tags/0.8.1/crossfire/build.xml
===================================================================
--- tags/0.8.1/crossfire/build.xml 2010-06-28 19:18:35 UTC (rev 8556)
+++ tags/0.8.1/crossfire/build.xml 2010-06-28 19:20:47 UTC (rev 8557)
@@ -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.1"/>
<property name="build.number" value="${build.version} (revision ${build.svnversion})"/>
<echoproperties destfile="build.properties">
<propertyset>
Modified: tags/0.8.1/daimonin/build.xml
===================================================================
--- tags/0.8.1/daimonin/build.xml 2010-06-28 19:18:35 UTC (rev 8556)
+++ tags/0.8.1/daimonin/build.xml 2010-06-28 19:20:47 UTC (rev 8557)
@@ -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.1"/>
<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.
|
|
From: <aki...@us...> - 2010-06-28 19:18:42
|
Revision: 8556
http://gridarta.svn.sourceforge.net/gridarta/?rev=8556&view=rev
Author: akirschbaum
Date: 2010-06-28 19:18:35 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Create tag 0.8.1.
Added Paths:
-----------
tags/0.8.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 19:16:49
|
Revision: 8555
http://gridarta.svn.sourceforge.net/gridarta/?rev=8555&view=rev
Author: akirschbaum
Date: 2010-06-28 19:16:43 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Release 0.8.1.
Modified Paths:
--------------
branches/0.8/atrinik/ChangeLog
branches/0.8/crossfire/ChangeLog
branches/0.8/daimonin/ChangeLog
Modified: branches/0.8/atrinik/ChangeLog
===================================================================
--- branches/0.8/atrinik/ChangeLog 2010-06-28 08:18:16 UTC (rev 8554)
+++ branches/0.8/atrinik/ChangeLog 2010-06-28 19:16:43 UTC (rev 8555)
@@ -1,3 +1,7 @@
+2010-06-28 Andreas Kirschbaum
+
+ * Release 0.8.1
+
2010-06-14 Andreas Kirschbaum
* Do not crash if a treasurelist definition file cannot be found.
Modified: branches/0.8/crossfire/ChangeLog
===================================================================
--- branches/0.8/crossfire/ChangeLog 2010-06-28 08:18:16 UTC (rev 8554)
+++ branches/0.8/crossfire/ChangeLog 2010-06-28 19:16:43 UTC (rev 8555)
@@ -1,3 +1,7 @@
+2010-06-28 Andreas Kirschbaum
+
+ * Release 0.8.1
+
2010-06-14 Andreas Kirschbaum
* Do not crash if a treasurelist definition file cannot be found.
Modified: branches/0.8/daimonin/ChangeLog
===================================================================
--- branches/0.8/daimonin/ChangeLog 2010-06-28 08:18:16 UTC (rev 8554)
+++ branches/0.8/daimonin/ChangeLog 2010-06-28 19:16:43 UTC (rev 8555)
@@ -1,3 +1,7 @@
+2010-06-28 Andreas Kirschbaum
+
+ * Release 0.8.1
+
2010-06-14 Andreas Kirschbaum
* Do not crash if a treasurelist definition file cannot be found.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 08:18:32
|
Revision: 8554
http://gridarta.svn.sourceforge.net/gridarta/?rev=8554&view=rev
Author: akirschbaum
Date: 2010-06-28 08:18:16 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Reorganize package names.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java
trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/maparchobject/DefaultMapArchObjectFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/maparchobject/MapArchObject.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/mapcontrol/DefaultMapControlFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/settings/CollectedConfigSource.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/settings/FilesConfigSource.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/DefaultRendererFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/maparchobject/DefaultMapArchObjectFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/maparchobject/MapArchObject.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/mapcontrol/DefaultMapControlFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/settings/CollectedConfigSource.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/settings/FilesConfigSource.java
trunk/daimonin/src/test/net/sf/gridarta/var/daimonin/model/maparchobject/MapArchObjectTest.java
trunk/model/src/app/net/sf/gridarta/model/anim/AnimationObjects.java
trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObjects.java
trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java
trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java
trunk/model/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
trunk/model/src/app/net/sf/gridarta/model/archetype/Archetype.java
trunk/model/src/app/net/sf/gridarta/model/archetype/ArchetypeFactory.java
trunk/model/src/app/net/sf/gridarta/model/archetype/ArchetypeParser.java
trunk/model/src/app/net/sf/gridarta/model/archetype/ArchetypeSet.java
trunk/model/src/app/net/sf/gridarta/model/archetype/ArchetypeSetListener.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolder.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolderListener.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserModel.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserModelListener.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserPanel.java
trunk/model/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserPanelListener.java
trunk/model/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
trunk/model/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/BaseObject.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/BaseObjectVisitor.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/RecursiveGameObjectIterator.java
trunk/model/src/app/net/sf/gridarta/model/collectable/Collectable.java
trunk/model/src/app/net/sf/gridarta/model/configsource/ConfigSource.java
trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitMatcher.java
trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java
trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
trunk/model/src/app/net/sf/gridarta/model/face/FaceObjects.java
trunk/model/src/app/net/sf/gridarta/model/floodfill/FillUtils.java
trunk/model/src/app/net/sf/gridarta/model/floodfill/FloodFill.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractGameObject.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractGameObjectFactory.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/AbstractIsoGameObjectFactory.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/GameObject.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/GameObjectFactory.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiArchData.java
trunk/model/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
trunk/model/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java
trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapReader.java
trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapReaderFactory.java
trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapWriter.java
trunk/model/src/app/net/sf/gridarta/model/io/GameObjectParser.java
trunk/model/src/app/net/sf/gridarta/model/io/GameObjectParserFactory.java
trunk/model/src/app/net/sf/gridarta/model/io/MapArchObjectParser.java
trunk/model/src/app/net/sf/gridarta/model/io/MapArchObjectParserFactory.java
trunk/model/src/app/net/sf/gridarta/model/io/MapReader.java
trunk/model/src/app/net/sf/gridarta/model/io/MapReaderFactory.java
trunk/model/src/app/net/sf/gridarta/model/io/MapWriter.java
trunk/model/src/app/net/sf/gridarta/model/maparchobject/AbstractMapArchObject.java
trunk/model/src/app/net/sf/gridarta/model/maparchobject/MapArchObject.java
trunk/model/src/app/net/sf/gridarta/model/maparchobject/MapArchObjectFactory.java
trunk/model/src/app/net/sf/gridarta/model/maparchobject/MapArchObjectListener.java
trunk/model/src/app/net/sf/gridarta/model/mapcontrol/DefaultMapControl.java
trunk/model/src/app/net/sf/gridarta/model/mapcontrol/MapControl.java
trunk/model/src/app/net/sf/gridarta/model/mapcontrol/MapControlFactory.java
trunk/model/src/app/net/sf/gridarta/model/mapcontrol/MapControlListener.java
trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java
trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGrid.java
trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGridEvent.java
trunk/model/src/app/net/sf/gridarta/model/mapgrid/MapGridListener.java
trunk/model/src/app/net/sf/gridarta/model/mapgrid/SelectionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/AboveFloorInsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/AutoInsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/BelowFloorInsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/BottommostInsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/DefaultMapModel.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/InsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/InsertionModeSet.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/MapModel.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/MapModelListener.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/MapSquare.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/MapSquareGrid.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/MapSquareIterator.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/MapTransactionListener.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/SavedSquares.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/TopmostInsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mappathnormalizer/IOErrorException.java
trunk/model/src/app/net/sf/gridarta/model/mappathnormalizer/InvalidPathException.java
trunk/model/src/app/net/sf/gridarta/model/mappathnormalizer/MapPathNormalizer.java
trunk/model/src/app/net/sf/gridarta/model/mappathnormalizer/RelativePathOnUnsavedMapException.java
trunk/model/src/app/net/sf/gridarta/model/mappathnormalizer/SameMapException.java
trunk/model/src/app/net/sf/gridarta/model/resource/AbstractFilesResourcesReader.java
trunk/model/src/app/net/sf/gridarta/model/resource/AbstractResources.java
trunk/model/src/app/net/sf/gridarta/model/resource/AbstractResourcesReader.java
trunk/model/src/app/net/sf/gridarta/model/resource/CollectedResourcesWriter.java
trunk/model/src/app/net/sf/gridarta/model/scripts/AbstractScriptedEvent.java
trunk/model/src/app/net/sf/gridarta/model/scripts/AbstractScriptedEventFactory.java
trunk/model/src/app/net/sf/gridarta/model/scripts/DefaultScriptArchData.java
trunk/model/src/app/net/sf/gridarta/model/scripts/ScriptArchData.java
trunk/model/src/app/net/sf/gridarta/model/scripts/ScriptedEvent.java
trunk/model/src/app/net/sf/gridarta/model/scripts/ScriptedEventFactory.java
trunk/model/src/app/net/sf/gridarta/model/spells/ArchetypeSetSpellLoader.java
trunk/model/src/app/net/sf/gridarta/model/spells/GameObjectSpell.java
trunk/model/src/app/net/sf/gridarta/model/tiles/MapLink.java
trunk/model/src/app/net/sf/gridarta/model/tiles/TileLink.java
trunk/model/src/app/net/sf/gridarta/model/undo/UndoModel.java
trunk/model/src/app/net/sf/gridarta/model/undo/UndoState.java
trunk/model/src/app/net/sf/gridarta/model/validation/DefaultErrorCollector.java
trunk/model/src/app/net/sf/gridarta/model/validation/ErrorCollector.java
trunk/model/src/app/net/sf/gridarta/model/validation/ValidationErrorComparator.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/AttributeRangeError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedMobOrSpawnPointError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedSpawnPointError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedSquareError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ConnectedInsideContainerError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ConnectedPickableError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ConnectionError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ConnectionWithoutSinksError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ConnectionWithoutSourcesError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/CorrectableError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/CustomTypeError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/DoubleLayerError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/DoubleTypeError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/EmptySpawnPointError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentSensorSlayingError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ExitError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/GameObjectValidationError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/GameObjectsValidationError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/MapDifficultyError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/MapValidationError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/MobOutsideSpawnPointError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/PaidItemShopSquareError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ShopSquareError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/SlayingError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/SquareValidationError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/SquareWithoutFloorError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/SysObjectNotOnLayerZeroError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/TilePathsError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/UndefinedAnimError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/UndefinedArchetypeError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/UndefinedFaceError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/UnsetSlayingError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ValidationError.java
trunk/model/src/test/net/sf/gridarta/model/archetype/AbstractArchetypeParserTest.java
trunk/model/src/test/net/sf/gridarta/model/archetype/ArchetypeParserTest.java
trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetype.java
trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeBuilder.java
trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeFactory.java
trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeParser.java
trunk/model/src/test/net/sf/gridarta/model/archetype/TestArchetypeSet.java
trunk/model/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeTest.java
trunk/model/src/test/net/sf/gridarta/model/artifact/ArtifactParserTest.java
trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
trunk/model/src/test/net/sf/gridarta/model/gameobject/TestGameObject.java
trunk/model/src/test/net/sf/gridarta/model/gameobject/TestGameObjectFactory.java
trunk/model/src/test/net/sf/gridarta/model/io/TestGameObjectParser.java
trunk/model/src/test/net/sf/gridarta/model/io/TestMapArchObjectParser.java
trunk/model/src/test/net/sf/gridarta/model/io/TestMapArchObjectParserFactory.java
trunk/model/src/test/net/sf/gridarta/model/io/TestMapReaderFactory.java
trunk/model/src/test/net/sf/gridarta/model/maparchobject/TestMapArchObject.java
trunk/model/src/test/net/sf/gridarta/model/maparchobject/TestMapArchObjectFactory.java
trunk/model/src/test/net/sf/gridarta/model/mapcontrol/TestMapControlFactory.java
trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
trunk/model/src/test/net/sf/gridarta/model/mapgrid/MapGridTest.java
trunk/model/src/test/net/sf/gridarta/model/mapmodel/DefaultMapModelTest.java
trunk/model/src/test/net/sf/gridarta/model/match/NamedGameObjectMatcherTest.java
trunk/model/src/test/net/sf/gridarta/model/resource/AbstractFilesResourcesReaderTest.java
trunk/model/src/test/net/sf/gridarta/model/resource/TestFilesResourcesReader.java
trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java
trunk/src/app/net/sf/gridarta/actions/UndoActions.java
trunk/src/app/net/sf/gridarta/delayedmapmodel/DelayedMapModelListener.java
trunk/src/app/net/sf/gridarta/delayedmapmodel/DelayedMapModelListenerManager.java
trunk/src/app/net/sf/gridarta/exitconnector/ExitConnectorActions.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserControl.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserView.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeChooserViewListener.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeIconCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypeNameCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/DirectionPane.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayMode.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/DisplayNameCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/archetypetype/ArchetypeTypeChecks.java
trunk/src/app/net/sf/gridarta/gui/autovalidator/AutoValidator.java
trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkActions.java
trunk/src/app/net/sf/gridarta/gui/bookmarks/EditBookmarkDialog.java
trunk/src/app/net/sf/gridarta/gui/bookmarks/ManageBookmarksDialog.java
trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/ConnectionView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterControl.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyBuffer.java
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyMode.java
trunk/src/app/net/sf/gridarta/gui/exitconnector/ExitConnectorController.java
trunk/src/app/net/sf/gridarta/gui/filter/DefaultFilterControl.java
trunk/src/app/net/sf/gridarta/gui/filter/FilterControl.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialogManager.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribute.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeAnimationName.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBitmask.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBool.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBoolSpec.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeFaceName.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeFloat.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeInt.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeInvSpell.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeList.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeLong.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeMapPath.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeScriptFile.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeSpell.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeString.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeText.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeTreasure.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeZSpell.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GuiInfo.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/TypesBoxItemListener.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/AbstractGameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/EventsTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/FaceTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModel.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModelListener.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesTabListener.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/MsgTextTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/TextEditorTab.java
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialogManager.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTab.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/WarningsTab.java
trunk/src/app/net/sf/gridarta/gui/map/AbstractPerMapDialogManager.java
trunk/src/app/net/sf/gridarta/gui/map/MapFileActions.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpAdapter.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpEvent.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpListener.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapView.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewFactory.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewFactory.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManager.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewManagerListener.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViews.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewsListener.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewsManager.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractSimpleIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/GridMapSquarePainter.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator2.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/RendererFactory.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/ToolTipAppender.java
trunk/src/app/net/sf/gridarta/gui/map/tools/AbstractTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/BasicAbstractTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/InsertionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/Tool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolPalette.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
trunk/src/app/net/sf/gridarta/gui/map/tools/VoidTool.java
trunk/src/app/net/sf/gridarta/gui/map/viewaction/ViewActions.java
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowAction.java
trunk/src/app/net/sf/gridarta/gui/mapdesktop/WindowMenuManager.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeAction.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
trunk/src/app/net/sf/gridarta/gui/mapimagecache/MapImageCache.java
trunk/src/app/net/sf/gridarta/gui/mapimagecache/MapImageCacheListener.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/AbstractMapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/BookmarksMapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuEntry.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuManager.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mappropertiesdialog/MapPropertiesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListener.java
trunk/src/app/net/sf/gridarta/gui/mapuserlistener/MapUserListenerManager.java
trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java
trunk/src/app/net/sf/gridarta/gui/misc/RecentManager.java
trunk/src/app/net/sf/gridarta/gui/misc/ShiftProcessor.java
trunk/src/app/net/sf/gridarta/gui/misc/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewPickmapFolderDialog.java
trunk/src/app/net/sf/gridarta/gui/objectchooser/DefaultObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooserListener.java
trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooserTab.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserModel.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserModelListener.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ArchetypeNameMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/MatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ObjectNameMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptManager.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/BooleanParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/FilterParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/MapParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ParameterDescriptionEditor.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ParameterNameEditor.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ParameterTypeEditor.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/PluginParameterViewFactory.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java
trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
trunk/src/app/net/sf/gridarta/gui/scripts/ScriptArchDataUtils.java
trunk/src/app/net/sf/gridarta/gui/scripts/ScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapSquareSelection.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapSquareSelectionCache.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapSquareSelectionListener.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareActions.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareModel.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareModelListener.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/ShrinkMapSizeUtils.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/TreasureCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/undo/UndoControl.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/app/net/sf/gridarta/maincontrol/ImageCreatorFactory.java
trunk/src/app/net/sf/gridarta/mapfiles/Loader.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFile.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolder.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolderListener.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolderTreeListener.java
trunk/src/app/net/sf/gridarta/mapmanager/AbstractMapManager.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultMapManager.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultPickmapManager.java
trunk/src/app/net/sf/gridarta/mapmanager/FileControl.java
trunk/src/app/net/sf/gridarta/mapmanager/MapManager.java
trunk/src/app/net/sf/gridarta/mapmanager/MapManagerListener.java
trunk/src/app/net/sf/gridarta/script/BshThread.java
trunk/src/app/net/sf/gridarta/script/Script.java
trunk/src/app/net/sf/gridarta/script/ScriptExecutor.java
trunk/src/app/net/sf/gridarta/script/ScriptModel.java
trunk/src/app/net/sf/gridarta/script/ScriptModelListener.java
trunk/src/app/net/sf/gridarta/script/ScriptModelLoader.java
trunk/src/app/net/sf/gridarta/script/ScriptModelParser.java
trunk/src/app/net/sf/gridarta/script/parameter/AbstractPluginParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/ArchParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/BooleanParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/DoubleParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/FilterParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/IntegerParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/MapParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/PluginParameter.java
trunk/src/app/net/sf/gridarta/script/parameter/PluginParameterFactory.java
trunk/src/app/net/sf/gridarta/script/parameter/PluginParameterVisitor.java
trunk/src/app/net/sf/gridarta/script/parameter/StringParameter.java
trunk/src/app/net/sf/gridarta/validation/DelegatingMapValidator.java
trunk/src/app/net/sf/gridarta/validation/ErrorHandler.java
trunk/src/app/net/sf/gridarta/validation/GameObjectValidator.java
trunk/src/app/net/sf/gridarta/validation/MapValidator.java
trunk/src/app/net/sf/gridarta/validation/SquareValidator.java
trunk/src/app/net/sf/gridarta/validation/checks/AbstractShopSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/AttributeRangeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedMatrix.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedMobOrSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectedInsideContainerChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectedPickableChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectionChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/ConnectionUnknownError.java
trunk/src/app/net/sf/gridarta/validation/checks/CustomTypeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/DoubleLayerChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/DoubleTypeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/EmptySpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/Entry.java
trunk/src/app/net/sf/gridarta/validation/checks/ExitChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/MapDifficultyChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/MobOutsideSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/NonAbsoluteExitPathError.java
trunk/src/app/net/sf/gridarta/validation/checks/PaidItemShopSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/RangeEntry.java
trunk/src/app/net/sf/gridarta/validation/checks/ShopSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/SlayingChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/SquareWithoutFloorChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/SysObjectNotOnLayerZeroChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/TilePathsChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/Type.java
trunk/src/app/net/sf/gridarta/validation/checks/UndefinedArchetypeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/UndefinedFaceChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/UnsetSlayingChecker.java
trunk/src/test/net/sf/gridarta/exitconnector/ExitConnectorActionsTest.java
trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java
trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapView.java
trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewBasic.java
trunk/src/test/net/sf/gridarta/gui/map/mapview/TestMapViewFactory.java
trunk/src/test/net/sf/gridarta/gui/map/renderer/TestMapRenderer.java
trunk/src/test/net/sf/gridarta/gui/map/renderer/TestRendererFactory.java
trunk/src/test/net/sf/gridarta/gui/map/test/TestMapControlCreator.java
trunk/src/test/net/sf/gridarta/gui/mapmenu/MapMenuManagerTest.java
trunk/src/test/net/sf/gridarta/gui/selectedsquare/SelectedSquareActionsTest.java
trunk/src/test/net/sf/gridarta/mapmanager/DefaultMapManagerTest.java
trunk/src/test/net/sf/gridarta/mapmanager/TestFileControl.java
trunk/src/test/net/sf/gridarta/model/gameobject/GameObjectFactoryTest.java
trunk/test-mapvalidator/maps/editor/scripts/MapValidator
trunk/test-mapvalidator/regtest.conf
Added Paths:
-----------
trunk/model/src/app/net/sf/gridarta/model/maparchobject/
trunk/model/src/app/net/sf/gridarta/model/mapcontrol/
trunk/model/src/app/net/sf/gridarta/model/mapgrid/
trunk/model/src/app/net/sf/gridarta/model/mapmodel/
trunk/model/src/app/net/sf/gridarta/model/mappathnormalizer/
trunk/model/src/app/net/sf/gridarta/model/tiles/
trunk/model/src/app/net/sf/gridarta/model/validation/
trunk/model/src/test/net/sf/gridarta/model/maparchobject/
trunk/model/src/test/net/sf/gridarta/model/mapcontrol/
trunk/model/src/test/net/sf/gridarta/model/mapgrid/
trunk/model/src/test/net/sf/gridarta/model/mapmodel/
trunk/model/src/test/net/sf/gridarta/model/validation/
Removed Paths:
-------------
trunk/model/src/app/net/sf/gridarta/model/map/maparchobject/
trunk/model/src/app/net/sf/gridarta/model/map/mapcontrol/
trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/
trunk/model/src/app/net/sf/gridarta/model/map/mapmodel/
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/
trunk/model/src/app/net/sf/gridarta/model/map/tiles/
trunk/model/src/app/net/sf/gridarta/model/map/validation/
trunk/model/src/test/net/sf/gridarta/model/map/maparchobject/
trunk/model/src/test/net/sf/gridarta/model/map/mapcontrol/
trunk/model/src/test/net/sf/gridarta/model/map/mapgrid/
trunk/model/src/test/net/sf/gridarta/model/map/mapmodel/
trunk/model/src/test/net/sf/gridarta/model/map/validation/
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -28,8 +28,8 @@
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.map.mapgrid.MapGrid;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -24,8 +24,8 @@
import javax.swing.filechooser.FileFilter;
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.mapmanager.MapManager;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
import net.sf.gridarta.var.atrinik.model.gameobject.GameObject;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -52,8 +52,8 @@
import net.sf.gridarta.gui.utils.GUIConstants;
import net.sf.gridarta.gui.utils.TextComponentUtils;
import net.sf.gridarta.mapmanager.MapManager;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
@@ -403,7 +403,7 @@
* @return the map data panel
*/
@NotNull
- private Component createMapDataPanel(@NotNull final net.sf.gridarta.model.map.maparchobject.MapArchObject<MapArchObject> map) {
+ private Component createMapDataPanel(@NotNull final net.sf.gridarta.model.maparchobject.MapArchObject<MapArchObject> map) {
mapDescription.setText(map.getText());
mapDescription.setCaretPosition(0);
final JScrollPane scrollPane = new JScrollPane(mapDescription);
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-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -75,10 +75,10 @@
import net.sf.gridarta.model.io.MapWriter;
import net.sf.gridarta.model.io.PathManager;
import net.sf.gridarta.model.io.SubDirectoryCacheFiles;
-import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
-import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
-import net.sf.gridarta.model.map.mapmodel.InsertionMode;
-import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.maparchobject.MapArchObjectFactory;
+import net.sf.gridarta.model.mapcontrol.MapControlFactory;
+import net.sf.gridarta.model.mapmodel.InsertionMode;
+import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.GameObjectMatchers;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/DefaultMapArchObjectFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -19,7 +19,7 @@
package net.sf.gridarta.var.atrinik.model.maparchobject;
-import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
+import net.sf.gridarta.model.maparchobject.MapArchObjectFactory;
import net.sf.gridarta.model.settings.GlobalSettings;
import org.jetbrains.annotations.NotNull;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObject.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -19,7 +19,7 @@
package net.sf.gridarta.var.atrinik.model.maparchobject;
-import net.sf.gridarta.model.map.maparchobject.AbstractMapArchObject;
+import net.sf.gridarta.model.maparchobject.AbstractMapArchObject;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/mapcontrol/DefaultMapControlFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -25,12 +25,12 @@
import net.sf.gridarta.model.autojoin.AutojoinLists;
import net.sf.gridarta.model.gameobject.GameObjectFactory;
import net.sf.gridarta.model.io.MapWriter;
-import net.sf.gridarta.model.map.mapcontrol.DefaultMapControl;
-import net.sf.gridarta.model.map.mapcontrol.MapControl;
-import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
-import net.sf.gridarta.model.map.mapmodel.DefaultMapModel;
-import net.sf.gridarta.model.map.mapmodel.InsertionMode;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.mapcontrol.DefaultMapControl;
+import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapcontrol.MapControlFactory;
+import net.sf.gridarta.model.mapmodel.DefaultMapModel;
+import net.sf.gridarta.model.mapmodel.InsertionMode;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatchers;
import net.sf.gridarta.model.settings.GlobalSettings;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/CollectedConfigSource.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -23,7 +23,7 @@
import net.sf.gridarta.model.configsource.AbstractConfigSource;
import net.sf.gridarta.model.errorview.ErrorView;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.settings.GlobalSettings;
import org.jetbrains.annotations.NotNull;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/settings/FilesConfigSource.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -23,7 +23,7 @@
import net.sf.gridarta.model.configsource.AbstractConfigSource;
import net.sf.gridarta.model.errorview.ErrorView;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.resource.AbstractResources;
import net.sf.gridarta.model.settings.GlobalSettings;
import org.jetbrains.annotations.NotNull;
Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java
===================================================================
--- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -23,7 +23,7 @@
import java.io.IOException;
import java.io.StringReader;
import net.sf.gridarta.model.io.AbstractMapArchObjectParser;
-import net.sf.gridarta.model.map.maparchobject.AbstractMapArchObject;
+import net.sf.gridarta.model.maparchobject.AbstractMapArchObject;
import net.sf.gridarta.utils.Size2D;
import net.sf.gridarta.var.atrinik.model.io.MapArchObjectParser;
import org.junit.Assert;
@@ -37,7 +37,7 @@
/**
* Test for {@link net.sf.gridarta.model.io.AbstractMapArchObjectParser#load(BufferedReader,
- * net.sf.gridarta.model.map.maparchobject.MapArchObject)}.
+ * net.sf.gridarta.model.maparchobject.MapArchObject)}.
* @throws IOException (unexpected)
*/
@Test
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -32,15 +32,15 @@
import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.mapgrid.MapGrid;
-import net.sf.gridarta.model.map.mapgrid.MapGridEvent;
-import net.sf.gridarta.model.map.mapgrid.MapGridListener;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mapmodel.MapModelListener;
-import net.sf.gridarta.model.map.mapmodel.MapSquare;
-import net.sf.gridarta.model.map.validation.ErrorCollector;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapgrid.MapGridEvent;
+import net.sf.gridarta.model.mapgrid.MapGridListener;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapModelListener;
+import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.mapviewsettings.MapViewSettingsListener;
+import net.sf.gridarta.model.validation.ErrorCollector;
import net.sf.gridarta.utils.Size2D;
import net.sf.gridarta.var.crossfire.IGUIConstants;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -24,8 +24,8 @@
import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.mapgrid.MapGrid;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -37,9 +37,9 @@
import net.sf.gridarta.model.filter.FilterConfigChangeType;
import net.sf.gridarta.model.filter.FilterConfigListener;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.mapgrid.MapGrid;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mapmodel.MapSquare;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.gridarta.var.crossfire.IGUIConstants;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -27,9 +27,9 @@
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.mapgrid.MapGrid;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mapmodel.MapSquare;
+import net.sf.gridarta.model.mapgrid.MapGrid;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.CommonConstants;
import net.sf.gridarta.var.crossfire.IGUIConstants;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -27,7 +27,7 @@
import javax.swing.ImageIcon;
import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
import net.sf.gridarta.model.baseobject.BaseObject;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.utils.Size2D;
import net.sf.gridarta.utils.SystemIcons;
import net.sf.gridarta.var.crossfire.IGUIConstants;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -25,7 +25,7 @@
import net.sf.gridarta.model.data.NamedObject;
import net.sf.gridarta.model.face.FaceObject;
import net.sf.gridarta.model.face.FaceObjectProviders;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.var.crossfire.IGUIConstants;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -24,8 +24,8 @@
import javax.swing.filechooser.FileFilter;
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.mapmanager.MapManager;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -44,8 +44,8 @@
import net.sf.gridarta.gui.map.maptilepane.FlatMapTilePane;
import net.sf.gridarta.gui.utils.TextComponentUtils;
import net.sf.gridarta.mapmanager.MapManager;
-import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
@@ -544,7 +544,7 @@
* @return Newly created map text panel.
*/
@NotNull
- private Component createMapTextPanel(@NotNull final net.sf.gridarta.model.map.maparchobject.MapArchObject<MapArchObject> map) {
+ private Component createMapTextPanel(@NotNull final net.sf.gridarta.model.maparchobject.MapArchObject<MapArchObject> map) {
final Container panel = new JPanel(new BorderLayout(1, 1));
mapDescription.setText(map.getText());
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-06-28 08:18:16 UTC (rev 8554)
@@ -70,10 +70,10 @@
import net.sf.gridarta.mod...
[truncated message content] |
|
From: <aki...@us...> - 2010-06-28 08:01:37
|
Revision: 8553
http://gridarta.svn.sourceforge.net/gridarta/?rev=8553&view=rev
Author: akirschbaum
Date: 2010-06-28 08:01:28 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Rename package names.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/DefaultRendererFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGrid.java
trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGridEvent.java
trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGridListener.java
trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/SelectionMode.java
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/IOErrorException.java
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/InvalidPathException.java
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/MapPathNormalizer.java
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/RelativePathOnUnsavedMapException.java
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/SameMapException.java
trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java
trunk/model/src/test/net/sf/gridarta/model/map/mapgrid/MapGridTest.java
trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java
trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/GridMapSquarePainter.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/RendererFactory.java
trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/misc/ShiftProcessor.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java
trunk/src/test/net/sf/gridarta/gui/map/renderer/TestRendererFactory.java
Added Paths:
-----------
trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/
trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/
trunk/model/src/test/net/sf/gridarta/model/map/mapgrid/
Removed Paths:
-------------
trunk/model/src/app/net/sf/gridarta/model/map/grid/
trunk/model/src/app/net/sf/gridarta/model/map/normalizer/
trunk/model/src/test/net/sf/gridarta/model/map/grid/
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -28,7 +28,7 @@
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.map.grid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.SystemIcons;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -25,7 +25,7 @@
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.mapmanager.MapManager;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
import net.sf.gridarta.var.atrinik.model.gameobject.GameObject;
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -53,7 +53,7 @@
import net.sf.gridarta.gui.utils.TextComponentUtils;
import net.sf.gridarta.mapmanager.MapManager;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
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-28 07:52:25 UTC (rev 8552)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -78,7 +78,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.GameObjectMatchers;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -32,9 +32,9 @@
import net.sf.gridarta.gui.map.renderer.AbstractMapRenderer;
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.MapGridEvent;
-import net.sf.gridarta.model.map.grid.MapGridListener;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGridEvent;
+import net.sf.gridarta.model.map.mapgrid.MapGridListener;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapModelListener;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -24,7 +24,7 @@
import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.grid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.SystemIcons;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -37,7 +37,7 @@
import net.sf.gridarta.model.filter.FilterConfigChangeType;
import net.sf.gridarta.model.filter.FilterConfigListener;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.grid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatPickmapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -27,7 +27,7 @@
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.io.GameObjectParser;
-import net.sf.gridarta.model.map.grid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -25,7 +25,7 @@
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.mapmanager.MapManager;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -45,7 +45,7 @@
import net.sf.gridarta.gui.utils.TextComponentUtils;
import net.sf.gridarta.mapmanager.MapManager;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -73,7 +73,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.GameObjectMatchers;
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/DefaultRendererFactory.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/map/renderer/DefaultRendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -28,7 +28,7 @@
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.map.grid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.utils.SystemIcons;
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -25,7 +25,7 @@
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.mapmanager.MapManager;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.var.daimonin.model.archetype.Archetype;
import net.sf.gridarta.var.daimonin.model.gameobject.GameObject;
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -54,7 +54,7 @@
import net.sf.gridarta.gui.utils.TextComponentUtils;
import net.sf.gridarta.mapmanager.MapManager;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.settings.GlobalSettings;
import net.sf.gridarta.utils.ActionBuilderUtils;
import net.sf.gridarta.utils.Size2D;
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -78,7 +78,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.GameObjectMatchers;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGrid.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGrid.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGrid.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.grid;
+package net.sf.gridarta.model.map.mapgrid;
import java.awt.Point;
import java.awt.Rectangle;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGridEvent.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGridEvent.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGridEvent.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.grid;
+package net.sf.gridarta.model.map.mapgrid;
import java.util.EventObject;
import org.jetbrains.annotations.NotNull;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGridListener.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/grid/MapGridListener.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/MapGridListener.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.grid;
+package net.sf.gridarta.model.map.mapgrid;
import java.util.EventListener;
import org.jetbrains.annotations.NotNull;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/SelectionMode.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/grid/SelectionMode.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mapgrid/SelectionMode.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.grid;
+package net.sf.gridarta.model.map.mapgrid;
/**
* Modes that describe how squares get selected.
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/IOErrorException.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/normalizer/IOErrorException.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/IOErrorException.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.normalizer;
+package net.sf.gridarta.model.map.mappathnormalizer;
import java.io.File;
import java.io.IOException;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/InvalidPathException.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/normalizer/InvalidPathException.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/InvalidPathException.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.normalizer;
+package net.sf.gridarta.model.map.mappathnormalizer;
import java.io.File;
import org.jetbrains.annotations.NotNull;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/MapPathNormalizer.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/normalizer/MapPathNormalizer.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/MapPathNormalizer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.normalizer;
+package net.sf.gridarta.model.map.mappathnormalizer;
import java.io.File;
import java.io.IOException;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/RelativePathOnUnsavedMapException.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/normalizer/RelativePathOnUnsavedMapException.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/RelativePathOnUnsavedMapException.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.normalizer;
+package net.sf.gridarta.model.map.mappathnormalizer;
import org.jetbrains.annotations.NotNull;
Modified: trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/SameMapException.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/map/normalizer/SameMapException.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/app/net/sf/gridarta/model/map/mappathnormalizer/SameMapException.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.normalizer;
+package net.sf.gridarta.model.map.mappathnormalizer;
/**
* Exception thrown if the destination path points to the source map.
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-28 07:52:25 UTC (rev 8552)
+++ trunk/model/src/app/net/sf/gridarta/model/mapcursor/MapCursor.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -23,10 +23,10 @@
import java.awt.Point;
import java.awt.Rectangle;
import net.sf.gridarta.model.direction.Direction;
-import net.sf.gridarta.model.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.MapGridEvent;
-import net.sf.gridarta.model.map.grid.MapGridListener;
-import net.sf.gridarta.model.map.grid.SelectionMode;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGridEvent;
+import net.sf.gridarta.model.map.mapgrid.MapGridListener;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.utils.EventListenerList2;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Modified: trunk/model/src/test/net/sf/gridarta/model/map/mapgrid/MapGridTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/map/grid/MapGridTest.java 2010-06-27 20:03:32 UTC (rev 8524)
+++ trunk/model/src/test/net/sf/gridarta/model/map/mapgrid/MapGridTest.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.model.map.grid;
+package net.sf.gridarta.model.map.mapgrid;
import java.awt.Point;
import net.sf.gridarta.utils.Size2D;
Modified: trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/model/src/test/net/sf/gridarta/model/mapcursor/MapCursorTest.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -23,8 +23,8 @@
import java.awt.Point;
import junit.framework.JUnit4TestAdapter;
import net.sf.gridarta.model.direction.Direction;
-import net.sf.gridarta.model.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.SelectionMode;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.utils.Size2D;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
Modified: trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java
===================================================================
--- trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -29,11 +29,11 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.IOErrorException;
-import net.sf.gridarta.model.map.normalizer.InvalidPathException;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
-import net.sf.gridarta.model.map.normalizer.RelativePathOnUnsavedMapException;
-import net.sf.gridarta.model.map.normalizer.SameMapException;
+import net.sf.gridarta.model.map.mappathnormalizer.IOErrorException;
+import net.sf.gridarta.model.map.mappathnormalizer.InvalidPathException;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.RelativePathOnUnsavedMapException;
+import net.sf.gridarta.model.map.mappathnormalizer.SameMapException;
import net.sf.gridarta.model.map.tiles.MapLink;
import net.sf.gridarta.model.map.tiles.TileLink;
import net.sf.gridarta.utils.Size2D;
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/Control.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -29,9 +29,9 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import org.jetbrains.annotations.NotNull;
/**
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -49,11 +49,11 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.IOErrorException;
-import net.sf.gridarta.model.map.normalizer.InvalidPathException;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
-import net.sf.gridarta.model.map.normalizer.RelativePathOnUnsavedMapException;
-import net.sf.gridarta.model.map.normalizer.SameMapException;
+import net.sf.gridarta.model.map.mappathnormalizer.IOErrorException;
+import net.sf.gridarta.model.map.mappathnormalizer.InvalidPathException;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.RelativePathOnUnsavedMapException;
+import net.sf.gridarta.model.map.mappathnormalizer.SameMapException;
import net.sf.gridarta.model.mapcursor.MapCursor;
import net.sf.gridarta.model.mapcursor.MapCursorEvent;
import net.sf.gridarta.model.mapcursor.MapCursorListener;
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -42,7 +42,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.map.tiles.MapLink;
import net.sf.gridarta.model.map.tiles.TileLink;
import net.sf.gridarta.model.settings.GlobalSettings;
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/FlatMapTilePane.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -26,7 +26,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.map.tiles.MapLink;
import net.sf.gridarta.model.settings.GlobalSettings;
import org.jetbrains.annotations.NotNull;
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/IsoMapTilePane.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -27,7 +27,7 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.map.tiles.MapLink;
import net.sf.gridarta.model.settings.GlobalSettings;
import org.jetbrains.annotations.NotNull;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/AbstractMapViewBasic.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -25,8 +25,8 @@
import java.util.List;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapcursor.MapCursor;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/DefaultMapViewBasic.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -34,8 +34,8 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapModelListener;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -25,8 +25,8 @@
import net.sf.gridarta.gui.map.renderer.MapRenderer;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapcursor.MapCursor;
import org.jetbrains.annotations.NotNull;
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -35,10 +35,10 @@
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.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.MapGridEvent;
-import net.sf.gridarta.model.map.grid.MapGridListener;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGridEvent;
+import net.sf.gridarta.model.map.mapgrid.MapGridListener;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapModelListener;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/GridMapSquarePainter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/GridMapSquarePainter.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/GridMapSquarePainter.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -22,7 +22,7 @@
import java.awt.Graphics;
import java.awt.Image;
import java.awt.image.ImageObserver;
-import net.sf.gridarta.model.map.grid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.utils.SystemIcons;
import org.jetbrains.annotations.NotNull;
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -33,8 +33,8 @@
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.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -27,8 +27,8 @@
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.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.map.mapmodel.MapSquare;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/RendererFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/RendererFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/RendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -21,8 +21,8 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import org.jetbrains.annotations.NotNull;
Modified: trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/map/tools/SelectionTool.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -34,8 +34,8 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.floodfill.FillUtils;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
import net.sf.gridarta.model.mapcursor.MapCursor;
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -33,8 +33,8 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.direction.Direction;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.model.mapcursor.MapCursor;
import net.sf.gridarta.model.mapcursor.MapCursorEvent;
import net.sf.gridarta.model.mapcursor.MapCursorListener;
Modified: trunk/src/app/net/sf/gridarta/gui/misc/ShiftProcessor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/ShiftProcessor.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/gui/misc/ShiftProcessor.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -28,9 +28,9 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.direction.Direction;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -49,12 +49,12 @@
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.floodfill.FillUtils;
import net.sf.gridarta.model.gameobject.GameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
-import net.sf.gridarta.model.map.grid.MapGridEvent;
-import net.sf.gridarta.model.map.grid.MapGridListener;
-import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
+import net.sf.gridarta.model.map.mapgrid.MapGridEvent;
+import net.sf.gridarta.model.map.mapgrid.MapGridListener;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
import net.sf.gridarta.model.map.mapmodel.MapModel;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -59,7 +59,7 @@
import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatchers;
import net.sf.gridarta.model.resource.AbstractResources;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -147,7 +147,7 @@
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
import net.sf.gridarta.model.map.mapmodel.InsertionModeSet;
import net.sf.gridarta.model.map.mapmodel.MapModel;
-import net.sf.gridarta.model.map.normalizer.MapPathNormalizer;
+import net.sf.gridarta.model.map.mappathnormalizer.MapPathNormalizer;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.GameObjectMatchers;
Modified: trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/test/net/sf/gridarta/gui/copybuffer/CopyBufferTest.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -27,9 +27,9 @@
import net.sf.gridarta.model.archetype.DuplicateArchetypeException;
import net.sf.gridarta.model.archetype.TestArchetype;
import net.sf.gridarta.model.gameobject.TestGameObject;
-import net.sf.gridarta.model.map.grid.SelectionMode;
import net.sf.gridarta.model.map.maparchobject.TestMapArchObject;
import net.sf.gridarta.model.map.mapcontrol.MapControl;
+import net.sf.gridarta.model.map.mapgrid.SelectionMode;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import net.sf.gridarta.utils.Size2D;
import org.junit.Test;
Modified: trunk/src/test/net/sf/gridarta/gui/map/renderer/TestRendererFactory.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/map/renderer/TestRendererFactory.java 2010-06-28 07:52:25 UTC (rev 8552)
+++ trunk/src/test/net/sf/gridarta/gui/map/renderer/TestRendererFactory.java 2010-06-28 08:01:28 UTC (rev 8553)
@@ -21,8 +21,8 @@
import net.sf.gridarta.model.archetype.TestArchetype;
import net.sf.gridarta.model.gameobject.TestGameObject;
-import net.sf.gridarta.model.map.grid.MapGrid;
import net.sf.gridarta.model.map.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.map.mapgrid.MapGrid;
import net.sf.gridarta.model.map.mapmodel.MapModel;
import org.jetbrains.annotations.NotNull;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:52:31
|
Revision: 8552
http://gridarta.svn.sourceforge.net/gridarta/?rev=8552&view=rev
Author: akirschbaum
Date: 2010-06-28 07:52:25 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Remove dependency NamedObject -> FaceObjectProviders.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java
trunk/model/src/app/net/sf/gridarta/model/data/NamedObject.java
trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObject.java
trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
trunk/src/app/net/sf/gridarta/gui/data/NamedNodeTreeCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/utils/AnimTreeChooseAction.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -180,7 +180,7 @@
* This part is located using the 2 weights calculated:
* (32*weight,0) and (32*weightC,32)
*/
- final ImageIcon img = smoothFace.getDisplayIcon(faceObjectProviders);
+ final ImageIcon img = faceObjectProviders.getDisplayIcon(smoothFace);
if (weight > 0) {
src.x = IGUIConstants.SQUARE_WIDTH * weight;
src.y = 0;
Modified: trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -22,13 +22,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
-import javax.swing.ImageIcon;
import net.sf.gridarta.model.data.AbstractNamedObject;
-import net.sf.gridarta.model.face.FaceObjectProviders;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* Abstract base implementation of {@link AnimationObject}.
@@ -190,16 +187,16 @@
/**
* {@inheritDoc}
*/
- @Nullable
+ @NotNull
@Override
- public ImageIcon getDisplayIcon(@NotNull final FaceObjectProviders faceObjectProviders) {
+ public String getDisplayIconName() {
for (int facing = 1; facing < facings; facing++) {
final String frame = getFirstFrame(facing);
if (!frame.startsWith("dummy.")) {
- return faceObjectProviders.getImageIconForFacename(frame);
+ return frame;
}
}
- return faceObjectProviders.getImageIconForFacename(getFirstFrame(0));
+ return getFirstFrame(0);
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/data/NamedObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/data/NamedObject.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/model/src/app/net/sf/gridarta/model/data/NamedObject.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -20,10 +20,7 @@
package net.sf.gridarta.model.data;
import java.io.Serializable;
-import javax.swing.ImageIcon;
-import net.sf.gridarta.model.face.FaceObjectProviders;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* A <code>AbstractNamedObject</code> has a name and tree position source and
@@ -66,13 +63,11 @@
void setPath(@NotNull String path);
/**
- * Get the display icon for this AbstractNamedObject.
- * @param faceObjectProviders the face object providers for looking up
- * faces
- * @return display icon of this AbstractNamedObject
+ * Returns the face name of the display icon for this AbstractNamedObject.
+ * @return the face name
*/
- @Nullable
- ImageIcon getDisplayIcon(@NotNull FaceObjectProviders faceObjectProviders);
+ @NotNull
+ String getDisplayIconName();
/**
* {@inheritDoc}
Modified: trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObject.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObject.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -21,7 +21,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.swing.ImageIcon;
import net.sf.gridarta.model.data.AbstractNamedObject;
import net.sf.gridarta.model.data.NamedObject;
import org.jetbrains.annotations.NotNull;
@@ -194,10 +193,10 @@
/**
* {@inheritDoc}
*/
- @Nullable
+ @NotNull
@Override
- public ImageIcon getDisplayIcon(@NotNull final FaceObjectProviders faceObjectProviders) {
- return faceObjectProviders.getImageIconForFacename(faceName);
+ public String getDisplayIconName() {
+ return faceName;
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/model/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -26,6 +26,7 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.baseobject.BaseObjectVisitor;
+import net.sf.gridarta.model.data.NamedObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.utils.AlphaImageFilterInstance;
@@ -349,4 +350,14 @@
return normalFaceProvider == null ? null : normalFaceProvider.getImageIconForFacename(faceObjName);
}
+ /**
+ * Returns the display icon for a {@link NamedObject}.
+ * @param namedObject the named object
+ * @return display icon of this AbstractNamedObject
+ */
+ @Nullable
+ public ImageIcon getDisplayIcon(@NotNull final NamedObject namedObject) {
+ return getImageIconForFacename(namedObject.getDisplayIconName());
+ }
+
} // class FaceObjectProviders
Modified: trunk/src/app/net/sf/gridarta/gui/data/NamedNodeTreeCellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/data/NamedNodeTreeCellRenderer.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/src/app/net/sf/gridarta/gui/data/NamedNodeTreeCellRenderer.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -63,7 +63,7 @@
final NamedTreeNode<?> node = (NamedTreeNode<?>) value;
final NamedObject object = node.getNamedObject();
if (object != null) {
- setIcon(object.getDisplayIcon(faceObjectProviders));
+ setIcon(faceObjectProviders.getDisplayIcon(object));
}
setText(node.getName());
return this;
Modified: trunk/src/app/net/sf/gridarta/gui/utils/AnimTreeChooseAction.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/AnimTreeChooseAction.java 2010-06-28 07:26:29 UTC (rev 8551)
+++ trunk/src/app/net/sf/gridarta/gui/utils/AnimTreeChooseAction.java 2010-06-28 07:52:25 UTC (rev 8552)
@@ -127,7 +127,7 @@
if (animationObject == null) {
face = unknownSquareIcon;
} else {
- final Icon tmp = animationObject.getDisplayIcon(faceObjectProviders);
+ final Icon tmp = faceObjectProviders.getDisplayIcon(animationObject);
face = tmp == null ? unknownSquareIcon : tmp;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:26:35
|
Revision: 8551
http://gridarta.svn.sourceforge.net/gridarta/?rev=8551&view=rev
Author: akirschbaum
Date: 2010-06-28 07:26:29 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-28 07:21:43 UTC (rev 8550)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-28 07:26:29 UTC (rev 8551)
@@ -293,9 +293,16 @@
@NotNull
private final MapManager<G, A, R> mapManager;
+ /**
+ * All {@link DialogAttribute DialogAttributes} in the dialog.
+ */
@NotNull
private final Collection<DialogAttribute<G, A, R, ?>> dialogAttributes = new ArrayList<DialogAttribute<G, A, R, ?>>();
+ /**
+ * The {@link TypesBoxItemListener} attached to the combo box box for
+ * selecting the object's type.
+ */
@NotNull
private TypesBoxItemListener<G, A, R> typesBoxItemListener;
@@ -775,7 +782,7 @@
};
/**
- * Create an AbstractGameObjectAttributesDialog.
+ * Creates a new instance.
* @param gameObjectAttributesDialogFactory the associated factory
* @param archetypeTypeSet Reference to the list of archetype types.
* @param gameObject the game object to show dialog for; must be part of a
@@ -902,7 +909,7 @@
}
/**
- * Construct the Combo box of the available archetypes.
+ * Constructs the combo box of the available archetypes.
* @param type the initially selected type
* @param archetypeType the archetype type to display
* @return a <code>JComponent</code> with the combo box in it
@@ -944,7 +951,7 @@
}
/**
- * Construct the upper left part of the attribute dialog, containing name,
+ * Constructs the upper left part of the attribute dialog, containing name,
* type, archetype name and face.
* @param type the initially selected type
* @param archetypeType the archetype type to display
@@ -1003,7 +1010,7 @@
}
/**
- * Construct the upper right part of the attribute dialog, containing the
+ * Constructs the upper right part of the attribute dialog, containing the
* object's inventory.
* @return a <code>JScrollPane</code> with the upper right part of the
* dialog window
@@ -1023,7 +1030,7 @@
}
/**
- * Construct the central part of the attribute dialog, containing the
+ * Constructs the central part of the attribute dialog, containing the
* object's gameObject attributes.
*/
public final void buildAttribute() {
@@ -1135,7 +1142,7 @@
}
/**
- * Construct the dialog options: help, default, okay, apply, cancel.
+ * Constructs the dialog options: help, default, okay, apply, cancel.
* @return Object[] with dialog options
*/
@NotNull
@@ -1380,6 +1387,8 @@
* Constructs the combo box for arrays of "list data".
* @param listData list with list items and corresponding values
* @param gameObject the associated game object
+ * @param archetypeAttributeName the name of the shown attribute
+ * @param attributeName the label to show on the combox box
* @return the completed <code>JComboBox</code>
*/
@NotNull
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:21:52
|
Revision: 8550
http://gridarta.svn.sourceforge.net/gridarta/?rev=8550&view=rev
Author: akirschbaum
Date: 2010-06-28 07:21:43 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Fix possible NullPointerException.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-28 07:20:41 UTC (rev 8549)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-28 07:21:43 UTC (rev 8550)
@@ -1310,7 +1310,10 @@
}
// recalculate the editType value; XXX: should use MVC
- gameObjectMatchers.updateEditType(gameObject, gameObject.getMapSquare().getMapModel().getActiveEditType());
+ final MapSquare<G, A, R> mapSquare = gameObject.getMapSquare();
+ if (mapSquare != null) {
+ gameObjectMatchers.updateEditType(gameObject, mapSquare.getMapModel().getActiveEditType());
+ }
return true; // apply succeeded
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:20:47
|
Revision: 8549
http://gridarta.svn.sourceforge.net/gridarta/?rev=8549&view=rev
Author: akirschbaum
Date: 2010-06-28 07:20:41 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:18:28 UTC (rev 8548)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:20:41 UTC (rev 8549)
@@ -30,8 +30,8 @@
import org.jetbrains.annotations.NotNull;
/**
- * ActionListener for the buttons on treasurelists. When such a button is
- * pressed, the dialog with treasurelists pops up.
+ * An {@link javax.swing.Action Action} for the buttons on treasurelists. When
+ * such a button is pressed, the dialog with treasurelists pops up.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
*/
public class ViewTreasurelistAL<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractAction {
@@ -41,24 +41,29 @@
*/
private static final long serialVersionUID = 1L;
+ /**
+ * The {@link CFTreasureListTree} to display.
+ */
@NotNull
private final CFTreasureListTree<G, A, R> treasureListTree;
/**
- * The input field which contains the selected treasurelist.
+ * The input field which contains the selected treasurelist.
*/
@NotNull
private final JTextComponent input;
+ /**
+ * The parent component to show on.
+ */
@NotNull
- private final Component parent; // reference to this dialog instance
+ private final Component parent;
/**
* Constructor.
- * @param input the GUI-string attribute where the treasurelist button
- * belongs to
- * @param treasureListTree the treasure list tree to use
- * @param parent Parent component to show on.
+ * @param input the input field which contains the selected treasurelist
+ * @param treasureListTree the treasure list tree to display
+ * @param parent the parent component to show on
*/
public ViewTreasurelistAL(@NotNull final JTextComponent input, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
super("treasurelist:");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:18:34
|
Revision: 8548
http://gridarta.svn.sourceforge.net/gridarta/?rev=8548&view=rev
Author: akirschbaum
Date: 2010-06-28 07:18:28 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Simplify code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeTreasure.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeTreasure.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeTreasure.java 2010-06-28 07:13:39 UTC (rev 8547)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeTreasure.java 2010-06-28 07:18:28 UTC (rev 8548)
@@ -100,13 +100,4 @@
}
}
- /**
- * Returns the input ui component for editing the value.
- * @return the component
- */
- @NotNull
- public JTextComponent getInput() {
- return input;
- }
-
} // class DialogAttributeTreasure
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-28 07:13:39 UTC (rev 8547)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-28 07:18:28 UTC (rev 8548)
@@ -649,7 +649,7 @@
final JTextField input = new JTextField(" " + treasureName, ArchetypeAttribute.TEXTFIELD_COLUMNS);
input.setEditable(false);
final DialogAttributeTreasure<G, A, R> tmpAttribute = new DialogAttributeTreasure<G, A, R>(archetypeAttribute, input, treasureTree);
- final JButton cLabel = new JButton(new ViewTreasurelistAL<G, A, R>(tmpAttribute, GameObjectAttributesDialog.this, treasureListTree));
+ final JButton cLabel = new JButton(new ViewTreasurelistAL<G, A, R>(input, GameObjectAttributesDialog.this, treasureListTree));
guiInfo = new GuiInfo<G, A, R, ArchetypeAttributeTreasure>(tmpAttribute, cLabel, input, null, null, false);
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:13:39 UTC (rev 8547)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:18:28 UTC (rev 8548)
@@ -22,6 +22,7 @@
import java.awt.Component;
import java.awt.event.ActionEvent;
import javax.swing.AbstractAction;
+import javax.swing.text.JTextComponent;
import net.sf.gridarta.gui.treasurelist.CFTreasureListTree;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
@@ -43,23 +44,26 @@
@NotNull
private final CFTreasureListTree<G, A, R> treasureListTree;
+ /**
+ * The input field which contains the selected treasurelist.
+ */
@NotNull
- private final DialogAttributeTreasure<G, A, R> strAttr; // attribute structure
+ private final JTextComponent input;
@NotNull
private final Component parent; // reference to this dialog instance
/**
* Constructor.
- * @param attr the GUI-string attribute where the treasurelist button
+ * @param input the GUI-string attribute where the treasurelist button
* belongs to
* @param treasureListTree the treasure list tree to use
* @param parent Parent component to show on.
*/
- public ViewTreasurelistAL(@NotNull final DialogAttributeTreasure<G, A, R> attr, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
+ public ViewTreasurelistAL(@NotNull final JTextComponent input, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
super("treasurelist:");
this.treasureListTree = treasureListTree;
- strAttr = attr;
+ this.input = input;
this.parent = parent;
}
@@ -68,7 +72,7 @@
*/
@Override
public void actionPerformed(final ActionEvent e) {
- treasureListTree.showDialog(strAttr.getInput(), parent);
+ treasureListTree.showDialog(input, parent);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:13:45
|
Revision: 8547
http://gridarta.svn.sourceforge.net/gridarta/?rev=8547&view=rev
Author: akirschbaum
Date: 2010-06-28 07:13:39 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Remove redundant code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:13:21 UTC (rev 8546)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:13:39 UTC (rev 8547)
@@ -68,9 +68,7 @@
*/
@Override
public void actionPerformed(final ActionEvent e) {
- if (strAttr != null) {
- treasureListTree.showDialog(strAttr.getInput(), parent);
- }
+ treasureListTree.showDialog(strAttr.getInput(), parent);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:13:30
|
Revision: 8546
http://gridarta.svn.sourceforge.net/gridarta/?rev=8546&view=rev
Author: akirschbaum
Date: 2010-06-28 07:13:21 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Add @NotNull annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:12:00 UTC (rev 8545)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2010-06-28 07:13:21 UTC (rev 8546)
@@ -40,8 +40,10 @@
*/
private static final long serialVersionUID = 1L;
+ @NotNull
private final CFTreasureListTree<G, A, R> treasureListTree;
+ @NotNull
private final DialogAttributeTreasure<G, A, R> strAttr; // attribute structure
@NotNull
@@ -54,7 +56,7 @@
* @param treasureListTree the treasure list tree to use
* @param parent Parent component to show on.
*/
- public ViewTreasurelistAL(final DialogAttributeTreasure<G, A, R> attr, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
+ public ViewTreasurelistAL(@NotNull final DialogAttributeTreasure<G, A, R> attr, @NotNull final Component parent, @NotNull final CFTreasureListTree<G, A, R> treasureListTree) {
super("treasurelist:");
this.treasureListTree = treasureListTree;
strAttr = attr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:12:06
|
Revision: 8545
http://gridarta.svn.sourceforge.net/gridarta/?rev=8545&view=rev
Author: akirschbaum
Date: 2010-06-28 07:12:00 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Merge duplicated code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
Modified: trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-06-28 07:08:10 UTC (rev 8544)
+++ trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-06-28 07:12:00 UTC (rev 8545)
@@ -211,13 +211,8 @@
expandPath(new TreePath(treasureTree.getRoot()));
}
- if (input == null) {
- okButton.setVisible(false);
- noneButton.setVisible(false);
- } else {
- okButton.setVisible(true);
- noneButton.setVisible(true);
- }
+ okButton.setVisible(input != null);
+ noneButton.setVisible(input != null);
assert frame != null;
frame.setSize(470, 550);
@@ -247,20 +242,16 @@
scrollRowToVisible(getRowCount() - 1);
scrollPathToVisible(treePath);
- assert frame != null;
- frame.setVisible(true);
} else {
scrollRowToVisible(0);
setSelectionPath(null);
- assert frame != null;
- frame.setVisible(true);
}
} else {
scrollRowToVisible(0);
setSelectionPath(null);
- assert frame != null;
- frame.setVisible(true);
}
+ assert frame != null;
+ frame.setVisible(true);
}
/**
@@ -279,11 +270,7 @@
public void actionPerformed(final ActionEvent e) {
final String result = getSelectedTreasureList();
if (result != null) {
- if (input != null) {
- input.setText(" " + result);
- }
- assert frame != null;
- frame.setVisible(false);
+ selectValue(result);
}
}
});
@@ -293,11 +280,7 @@
@Override
public void actionPerformed(final ActionEvent e) {
// print "none" into the attribute dialog
- if (input != null) {
- input.setText(" " + NONE_SYM);
- }
- assert frame != null;
- frame.setVisible(false);
+ selectValue(NONE_SYM);
}
});
rightSide.add(noneButton);
@@ -330,6 +313,18 @@
}
/**
+ * Selects a value and closes the dialog.
+ * @param result the selected value
+ */
+ private void selectValue(@NotNull final String result) {
+ if (input != null) {
+ input.setText(" " + result);
+ }
+ assert frame != null;
+ frame.setVisible(false);
+ }
+
+ /**
* Returns the name of the currently selected treasurelist. If nothing is
* selected, <code>null</code> is returned.
* @return the name of the currently selected treasurelist or
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:08:16
|
Revision: 8544
http://gridarta.svn.sourceforge.net/gridarta/?rev=8544&view=rev
Author: akirschbaum
Date: 2010-06-28 07:08:10 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
Modified: trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-06-28 07:01:59 UTC (rev 8543)
+++ trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-06-28 07:08:10 UTC (rev 8544)
@@ -67,15 +67,18 @@
*/
public class CFTreasureListTree<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JTree {
- public static final String NONE_SYM = "<none>"; // string displayed in attribute dialog for "none"
+ /**
+ * The string displayed in attribute dialog for "none".
+ */
+ public static final String NONE_SYM = "<none>";
/**
- * Action Builder.
+ * The {@link ActionBuilder}.
*/
private static final ActionBuilder ACTION_BUILDER = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
/**
- * Serial Version UID.
+ * The serial version UID.
*/
private static final long serialVersionUID = 1L;
@@ -121,10 +124,10 @@
private JTextComponent input = null;
/**
- * Create a new instance.
+ * Creates a new instance.
* @param treasureTree the defined treasure lists
* @param parent the parent frame for dialog boxes
- * @param archetypeSet ArchetypeSet to get treasures from.
+ * @param archetypeSet the archetype set to get treasures from
* @param faceObjectProviders the face object providers for looking up
* faces
* @param systemIcons the system icons for creating icons
@@ -159,22 +162,22 @@
}
/**
- * Show the Dialog window containing this tree. The user can select a
- * treasurelist which is returned as String. The dialog window is built only
- * ONCE, then hidden/shown as needed. As a side-effect, only one
+ * Shows the dialog window containing this tree. The user can select a
+ * treasurelist which is returned as a string. The dialog window is built
+ * only ONCE, then hidden/shown as needed. As a side-effect, only one
* treasurelist window can be open at a time. When a second window is
* opened, the first one gets (re-)moved.
- * @param input Textfield to show.
- * @param parent Parent frame (attribute dialog)
+ * @param input the textfield to show
+ * @param parent the parent frame (attribute dialog)
*/
public synchronized void showDialog(@Nullable final JTextComponent input, @NotNull final Component parent) {
- this.input = input; // set textfield for input/output
+ this.input = input;
final boolean hasBeenDisplayed = frame != null;
if (frame != null) {
if (frame.isShowing()) {
assert frame != null;
- frame.setVisible(false); // frame should be hidden at this point
+ frame.setVisible(false);
}
// collapse everything except root
@@ -185,7 +188,7 @@
} else {
// open a popup dialog which temporarily disables all other frames
frame = new JDialog(this.parent, "Treasurelists", false);
- frame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); // click on close box hides dialog
+ frame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
final JScrollPane scrollPane = new JScrollPane(this);
@@ -193,7 +196,6 @@
scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
- // split display: tree/buttons
final JPanel buttonPanel = buildButtonPanel();
final JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, scrollPane, buttonPanel);
splitPane.setOneTouchExpandable(false);
@@ -203,7 +205,6 @@
splitPane.setDividerSize(4);
splitPane.setResizeWeight(1.0);
- // show the splitted pane (tree and buttons)
assert frame != null;
frame.getContentPane().add(splitPane);
@@ -211,7 +212,6 @@
}
if (input == null) {
- // hide select/none buttons when there is no related attribute dialog
okButton.setVisible(false);
noneButton.setVisible(false);
} else {
@@ -219,7 +219,6 @@
noneButton.setVisible(true);
}
- // center dialog relative to parent window
assert frame != null;
frame.setSize(470, 550);
assert frame != null;
@@ -229,13 +228,12 @@
final String listName = input.getText().trim(); // name of pre-selected list
final DefaultMutableTreeNode treasureNode = treasureTree.get(listName);
if (treasureNode != null) {
- // set the position of the scroll bar
final DefaultMutableTreeNode[] node = new DefaultMutableTreeNode[2];
node[0] = treasureTree.getRoot();
node[1] = treasureNode;
final TreePath treePath = new TreePath(node);
- expandPath(treePath); // expand pre-selected treasurelist
- setSelectionPath(treePath); // select it too
+ expandPath(treePath);
+ setSelectionPath(treePath);
if (!hasBeenDisplayed) {
// If this is the first time, the frame has to be packed,
@@ -247,39 +245,35 @@
setSelectionPath(treePath);
}
- // scroll the tree to the pre-selected treasurelist
scrollRowToVisible(getRowCount() - 1);
scrollPathToVisible(treePath);
assert frame != null;
- frame.setVisible(true); // display the window
+ frame.setVisible(true);
} else {
- // no valid treasurelist is preselected:
- scrollRowToVisible(0); // show first row (root node)
- setSelectionPath(null); // nothing selected
+ scrollRowToVisible(0);
+ setSelectionPath(null);
assert frame != null;
frame.setVisible(true);
}
} else {
- // no parent attribute dialog exists:
- scrollRowToVisible(0); // show first row (root node)
- setSelectionPath(null); // nothing selected
+ scrollRowToVisible(0);
+ setSelectionPath(null);
assert frame != null;
frame.setVisible(true);
}
}
/**
- * Building the button panel (bottom-line of the dialog window).
- * @return the JPanel containing all buttons
+ * Builds the button panel (bottom-line of the dialog window).
+ * @return the panel containing all buttons
*/
@NotNull
private JPanel buildButtonPanel() {
- final JPanel buttonPanel = new JPanel(new BorderLayout()); // main panel, containing everything
+ final JPanel buttonPanel = new JPanel(new BorderLayout());
- final Container leftSide = new JPanel(); // panel containing left-side buttons
- final Container rightSide = new JPanel(); // panel containing right-side buttons
+ final Container leftSide = new JPanel();
+ final Container rightSide = new JPanel();
- // build right side buttons
okButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(final ActionEvent e) {
@@ -318,7 +312,6 @@
});
rightSide.add(cancelButton);
- // left right side buttons
final AbstractButton helpButton = new JButton("Help");
helpButton.addActionListener(new ActionListener() {
@Override
@@ -331,33 +324,29 @@
leftSide.add(testButton);
testButton.setEnabled(false); // disable test button until implemented
- // attach left/right sides
buttonPanel.add(leftSide, BorderLayout.WEST);
buttonPanel.add(rightSide, BorderLayout.EAST);
- return buttonPanel; // return the full panel
+ return buttonPanel;
}
/**
- * Return the name of the currently selected treasurelist. If nothing is
+ * Returns the name of the currently selected treasurelist. If nothing is
* selected, <code>null</code> is returned.
- * @return The name of the currently selected treasurelist or
- * <code>null</code> if nothing is selected.
+ * @return the name of the currently selected treasurelist or
+ * <code>null</code> if nothing is selected
*/
@Nullable
private String getSelectedTreasureList() {
- // return null when nothing is selected
if (isSelectionEmpty()) {
return null;
}
TreeNode node = (TreeNode) getSelectionPath().getLastPathComponent();
- // when the root node is selected, also return null
if (node == treasureTree.getRoot()) {
return null;
}
- // climb up the tree path to the last node before root - this is the treasurelist
while (true) {
final TreeNode parentNode = node.getParent();
if (parentNode == treasureTree.getRoot()) {
@@ -366,8 +355,9 @@
node = parentNode;
}
- // When a treasurelist inside a special sub folder (like "God Intervention")
- // is selected, also return null because those must not be used on maps.
+ // When a treasurelist inside a special sub folder (like
+ // "God Intervention") is selected, also return null because those must
+ // not be used on maps.
final TreasureTreeNode treasureTreeNode = (TreasureTreeNode) node;
if (treasureTreeNode.getTreasureObj() instanceof FolderTreasureObj) {
ACTION_BUILDER.showMessageDialog(frame, "treasurelistForbidden", treasureTreeNode.getTreasureObj().getName());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 07:02:05
|
Revision: 8543
http://gridarta.svn.sourceforge.net/gridarta/?rev=8543&view=rev
Author: akirschbaum
Date: 2010-06-28 07:01:59 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Fix possible NullPointerExceptions.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
Modified: trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-06-28 06:58:18 UTC (rev 8542)
+++ trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2010-06-28 07:01:59 UTC (rev 8543)
@@ -285,7 +285,9 @@
public void actionPerformed(final ActionEvent e) {
final String result = getSelectedTreasureList();
if (result != null) {
- input.setText(" " + result);
+ if (input != null) {
+ input.setText(" " + result);
+ }
assert frame != null;
frame.setVisible(false);
}
@@ -297,7 +299,9 @@
@Override
public void actionPerformed(final ActionEvent e) {
// print "none" into the attribute dialog
- input.setText(" " + NONE_SYM);
+ if (input != null) {
+ input.setText(" " + NONE_SYM);
+ }
assert frame != null;
frame.setVisible(false);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:58:24
|
Revision: 8542
http://gridarta.svn.sourceforge.net/gridarta/?rev=8542&view=rev
Author: akirschbaum
Date: 2010-06-28 06:58:18 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Add assert statements.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
Modified: trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java 2010-06-28 06:56:17 UTC (rev 8541)
+++ trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java 2010-06-28 06:58:18 UTC (rev 8542)
@@ -138,8 +138,11 @@
setMessage(createPanel());
dialog = createDialog(parentComponent, dialogTitle);
+ assert dialog != null;
dialog.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ assert dialog != null;
dialog.getRootPane().setDefaultButton(okButton);
+ assert dialog != null;
dialog.setModal(false);
}
@@ -147,6 +150,7 @@
* Initializes the dialog.
*/
protected void init2() {
+ assert dialog != null;
dialog.setVisible(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:56:23
|
Revision: 8541
http://gridarta.svn.sourceforge.net/gridarta/?rev=8541&view=rev
Author: akirschbaum
Date: 2010-06-28 06:56:17 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Add assert statement.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java 2010-06-28 06:52:14 UTC (rev 8540)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/TilePanel.java 2010-06-28 06:56:17 UTC (rev 8541)
@@ -229,9 +229,11 @@
* Returns the text.
* @return the text
*/
- @Nullable
+ @NotNull
public String getText() {
- return textField.getText();
+ final String text = textField.getText();
+ assert text != null;
+ return text;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:52:23
|
Revision: 8540
http://gridarta.svn.sourceforge.net/gridarta/?rev=8540&view=rev
Author: akirschbaum
Date: 2010-06-28 06:52:14 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Remove SplashScreen; it's needed only for Java <1.6 and we do not support that anymore.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/misc/SplashScreen.java
Deleted: trunk/src/app/net/sf/gridarta/gui/misc/SplashScreen.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/SplashScreen.java 2010-06-28 06:45:12 UTC (rev 8539)
+++ trunk/src/app/net/sf/gridarta/gui/misc/SplashScreen.java 2010-06-28 06:52:14 UTC (rev 8540)
@@ -1,93 +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.gui.misc;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Frame;
-import javax.swing.ImageIcon;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.SwingConstants;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Class for a splash screen that's displayed while loading. It is mainly a
- * workaround to load stuff in the background which speeds up startup
- * significantly.
- * @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- * @todo move this class to JAPI
- */
-public class SplashScreen {
-
- /**
- * SplashScreen window.
- */
- @Nullable
- private Frame splashScreen = null;
-
- /**
- * Show the splash screen.
- */
- public void show() {
- // Only show before Java 1.6.0
- if (System.getProperty("java.version").compareTo("1.6.0") < 0) {
- showImpl();
- }
- }
-
- /**
- * Create splash screen and show it.
- */
- private void showImpl() {
- splashScreen = new JFrame();
- //noinspection ProhibitedExceptionCaught
- try {
- splashScreen.add(new JLabel(new ImageIcon(SplashScreen.class.getClassLoader().getResource("icons/CFIntro.gif"))));
- } catch (final NullPointerException e) {
- /* Just ignore this because it's nothing serious that the image is unavailable. */
- }
- final JComponent loading = new JLabel("Loading, hold on...", SwingConstants.CENTER);
- loading.setOpaque(true);
- loading.setBackground(Color.BLACK);
- loading.setForeground(Color.WHITE);
- splashScreen.add(loading, BorderLayout.SOUTH);
- splashScreen.setUndecorated(true);
- splashScreen.pack();
- splashScreen.setLocationRelativeTo(null);
- splashScreen.setVisible(true);
- }
-
- /**
- * Show the splash screen.
- */
- public void hide() {
- if (splashScreen != null) {
- splashScreen.setVisible(false);
- assert splashScreen != null;
- splashScreen.dispose();
- assert splashScreen != null;
- splashScreen.removeAll();
- splashScreen = null;
- }
- }
-
-} // class SplashScreen
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-06-28 06:45:12 UTC (rev 8539)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-06-28 06:52:14 UTC (rev 8540)
@@ -41,7 +41,6 @@
import net.sf.gridarta.gui.filter.DefaultFilterControl;
import net.sf.gridarta.gui.filter.FilterControl;
import net.sf.gridarta.gui.map.renderer.RendererFactory;
-import net.sf.gridarta.gui.misc.SplashScreen;
import net.sf.gridarta.gui.prefs.GUIPreferences;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.mainactions.DefaultExiter;
@@ -228,13 +227,6 @@
final ActionBuilder actionBuilder = ActionBuilderFactory.getInstance().getActionBuilder("net.sf.gridarta");
actionBuilder.addPref(DefaultMainControl.class);
actionBuilder.addParent(ActionBuilderFactory.getInstance().getActionBuilder(actionBuilderPackage));
- @Nullable final SplashScreen splashScreen;
- if (mode == GridartaRunMode.NORMAL) {
- splashScreen = new SplashScreen();
- splashScreen.show();
- } else {
- splashScreen = null;
- }
// Create the application and give it the parameters
final ErrorView errorView = GraphicsEnvironment.isHeadless() || mode.isConsoleMode() ? new ConsoleErrorView() : new DefaultErrorView(null);
@@ -299,7 +291,7 @@
try {
switch (mode) {
case NORMAL:
- returnCode = runNormal(args2, mainControl, editorFactory, splashScreen, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
+ returnCode = runNormal(args2, mainControl, editorFactory, errorView, guiUtils, configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, mapManager, pickmapManager, mapControlFactory, archetypeSet, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, scriptModel, animationObjects, archetypeChooserModel, scriptedEventEditor, resources, numberSpells, gameObjectSpells, attributeRangeChecker, pluginParameterFactory);
break;
case BATCH_PNG:
@@ -388,7 +380,6 @@
* @param args the files to open
* @param mainControl the main control to use
* @param editorFactory the editor factory to use
- * @param splashScreen the splash screen to disable
* @param errorView the error view to add errors to
* @param guiUtils the gui utils to use
* @param configSourceFactory the config source factory to use
@@ -424,7 +415,7 @@
* @param pluginParameterFactory the plugin parameter factory to use
* @return return code suitable for passing to {@link System#exit(int)}
*/
- private int runNormal(@NotNull final Iterable<String> args, @NotNull final DefaultMainControl<G, A, R> mainControl, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final SplashScreen splashScreen, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects<G, A, R> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects<G, A, R> animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
+ private int runNormal(@NotNull final Iterable<String> args, @NotNull final DefaultMainControl<G, A, R> mainControl, @NotNull final EditorFactory<G, A, R> editorFactory, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<G, A, R> rendererFactory, @NotNull final FilterControl<G, A, R> filterControl, @NotNull final ScriptExecutor<G, A, R> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<G, A, R> mapManager, @NotNull final MapManager<G, A, R> pickmapManager, @NotNull final MapControlFactory<G, A, R> mapControlFactory, @NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final FaceObjects<G, A, R> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<G, A, R> topmostInsertionMode, @NotNull final GameObjectFactory<G, A, R> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<A> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<G, A, R> mapReaderFactory, @NotNull final DelegatingMapValidator<G, A, R> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<G, A, R> scriptModel, @NotNull final AnimationObjects<G, A, R> animationObjects, @NotNull final ArchetypeChooserModel<G, A, R> archetypeChooserModel, @NotNull final ScriptedEventEditor<G, A, R> scriptedEventEditor, @NotNull final AbstractResources<G, A, R> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<G, A, R>> gameObjectSpells, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
final GUIMainControl<?, ?, ?>[] guiMainControl = new GUIMainControl<?, ?, ?>[1];
final Runnable runnable = new Runnable() {
@@ -455,7 +446,6 @@
@Override
public void run() {
guiMainControl[0].run(args);
- splashScreen.hide();
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:45:18
|
Revision: 8539
http://gridarta.svn.sourceforge.net/gridarta/?rev=8539&view=rev
Author: akirschbaum
Date: 2010-06-28 06:45:12 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Fix possible NullPointerException.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java 2010-06-28 06:44:07 UTC (rev 8538)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java 2010-06-28 06:45:12 UTC (rev 8539)
@@ -112,7 +112,7 @@
scriptedEvent.modifyEventPath(); // ok button for modifying path
}
- if (isOkButton && scriptArchData != null) {
+ if (isOkButton && scriptArchData != null && gameObject != null) {
// ok button for creating a new event/script
scriptArchEditor.createNewEvent(frame, scriptArchData, gameObject);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:44:15
|
Revision: 8538
http://gridarta.svn.sourceforge.net/gridarta/?rev=8538&view=rev
Author: akirschbaum
Date: 2010-06-28 06:44:07 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Add nullable annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java 2010-06-28 06:41:31 UTC (rev 8537)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java 2010-06-28 06:44:07 UTC (rev 8538)
@@ -37,6 +37,7 @@
*/
public class PathButtonListener<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements ActionListener {
+ @NotNull
private final JDialog frame;
private final boolean isOkButton;
@@ -44,17 +45,19 @@
/**
* The target event to script.
*/
- @NotNull
+ @Nullable
private ScriptedEvent<G, A, R> scriptedEvent;
/**
* The ScriptArchData to operate on.
*/
+ @Nullable
private ScriptArchData<G, A, R> scriptArchData;
/**
* The affected game object.
*/
+ @Nullable
private G gameObject;
/**
@@ -73,7 +76,7 @@
* @param scriptArchEditor the script arch editor to use
* @param scriptedEvent the target event to script
*/
- public PathButtonListener(final boolean isOkButton, final JDialog frame, @Nullable final ScriptArchData<G, A, R> scriptArchData, @Nullable final G gameObject, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @NotNull final ScriptedEvent<G, A, R> scriptedEvent) {
+ public PathButtonListener(final boolean isOkButton, @NotNull final JDialog frame, @Nullable final ScriptArchData<G, A, R> scriptArchData, @Nullable final G gameObject, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @Nullable final ScriptedEvent<G, A, R> scriptedEvent) {
this.isOkButton = isOkButton;
this.frame = frame;
this.scriptArchData = scriptArchData;
@@ -86,7 +89,7 @@
* Set the target event to script.
* @param scriptedEvent new target event to script.
*/
- public void setTargetEvent(final ScriptedEvent<G, A, R> scriptedEvent) {
+ public void setTargetEvent(@NotNull final ScriptedEvent<G, A, R> scriptedEvent) {
this.scriptedEvent = scriptedEvent;
}
@@ -95,7 +98,7 @@
* @param scriptArchData ScriptArchData to operate on.
* @param gameObject the affected game object
*/
- public void setScriptArchData(final ScriptArchData<G, A, R> scriptArchData, @NotNull final G gameObject) {
+ public void setScriptArchData(@NotNull final ScriptArchData<G, A, R> scriptArchData, @NotNull final G gameObject) {
this.scriptArchData = scriptArchData;
this.gameObject = gameObject;
}
@@ -104,7 +107,7 @@
* {@inheritDoc}
*/
@Override
- public void actionPerformed(final ActionEvent e) {
+ public void actionPerformed(@NotNull final ActionEvent e) {
if (isOkButton && scriptArchData == null && scriptedEvent != null) {
scriptedEvent.modifyEventPath(); // ok button for modifying path
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:41:38
|
Revision: 8537
http://gridarta.svn.sourceforge.net/gridarta/?rev=8537&view=rev
Author: akirschbaum
Date: 2010-06-28 06:41:31 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Make project compilable.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java 2010-06-28 06:35:53 UTC (rev 8536)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java 2010-06-28 06:41:31 UTC (rev 8537)
@@ -278,12 +278,12 @@
mainPanel.add(Box.createVerticalStrut(10));
final Container line6 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
final AbstractButton nsOkButton = new JButton("OK");
- nsOkListener = new PathButtonListener<G, A, R>(true, newScriptFrame, scriptArchData, gameObject, this);
+ nsOkListener = new PathButtonListener<G, A, R>(true, newScriptFrame, scriptArchData, gameObject, this, null);
nsOkButton.addActionListener(nsOkListener);
line6.add(nsOkButton);
final AbstractButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new PathButtonListener<G, A, R>(false, newScriptFrame, null, null, this));
+ cancelButton.addActionListener(new PathButtonListener<G, A, R>(false, newScriptFrame, null, null, this, null));
line6.add(cancelButton);
mainPanel.add(line6);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-28 06:35:59
|
Revision: 8536
http://gridarta.svn.sourceforge.net/gridarta/?rev=8536&view=rev
Author: akirschbaum
Date: 2010-06-28 06:35:53 +0000 (Mon, 28 Jun 2010)
Log Message:
-----------
Fix possible @NotNull violation.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
trunk/src/app/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java 2010-06-28 06:33:45 UTC (rev 8535)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/PathButtonListener.java 2010-06-28 06:35:53 UTC (rev 8536)
@@ -44,7 +44,8 @@
/**
* The target event to script.
*/
- private ScriptedEvent<G, A, R> scriptedEvent; // target event
+ @NotNull
+ private ScriptedEvent<G, A, R> scriptedEvent;
/**
* The ScriptArchData to operate on.
@@ -70,13 +71,15 @@
* frame, otherwise null
* @param gameObject the affected game object
* @param scriptArchEditor the script arch editor to use
+ * @param scriptedEvent the target event to script
*/
- public PathButtonListener(final boolean isOkButton, final JDialog frame, @Nullable final ScriptArchData<G, A, R> scriptArchData, @Nullable final G gameObject, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor) {
+ public PathButtonListener(final boolean isOkButton, final JDialog frame, @Nullable final ScriptArchData<G, A, R> scriptArchData, @Nullable final G gameObject, @NotNull final ScriptArchEditor<G, A, R> scriptArchEditor, @NotNull final ScriptedEvent<G, A, R> scriptedEvent) {
this.isOkButton = isOkButton;
this.frame = frame;
this.scriptArchData = scriptArchData;
this.gameObject = gameObject;
this.scriptArchEditor = scriptArchEditor;
+ this.scriptedEvent = scriptedEvent;
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java 2010-06-28 06:33:45 UTC (rev 8535)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java 2010-06-28 06:35:53 UTC (rev 8536)
@@ -185,14 +185,12 @@
// button panel:
final Container line4 = new JPanel(new FlowLayout(FlowLayout.RIGHT));
final AbstractButton okButton = new JButton("OK");
- okListener = new PathButtonListener<G, A, R>(true, pathFrame, null, null, scriptArchEditor);
- okListener.setTargetEvent(scriptedEvent);
+ okListener = new PathButtonListener<G, A, R>(true, pathFrame, null, null, scriptArchEditor, scriptedEvent);
okButton.addActionListener(okListener);
line4.add(okButton);
final AbstractButton cancelButton = new JButton("Cancel");
- cancelListener = new PathButtonListener<G, A, R>(false, pathFrame, null, null, scriptArchEditor);
- cancelListener.setTargetEvent(scriptedEvent);
+ cancelListener = new PathButtonListener<G, A, R>(false, pathFrame, null, null, scriptArchEditor, scriptedEvent);
cancelButton.addActionListener(cancelListener);
line4.add(cancelButton);
mainPanel.add(line4);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
