Menu
▾
▴
gridarta-commit
|
From: <aki...@us...> - 2011-06-30 13:57:51
|
Revision: 8918
http://gridarta.svn.sourceforge.net/gridarta/?rev=8918&view=rev
Author: akirschbaum
Date: 2011-06-30 13:57:44 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
Adapt to changed format of crossfire.0. [Crossfire].
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java
trunk/crossfire/ChangeLog
trunk/crossfire/resource/resource/conf/crossfire.0
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java
trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java
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 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -268,7 +268,7 @@
@NotNull
@Override
public FaceObjects<GameObject, MapArchObject, Archetype> createFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) {
- return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider);
+ return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider, true);
}
/**
Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java
===================================================================
--- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -140,7 +140,7 @@
@Override
protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype, ? extends AbstractArchetypeBuilder<GameObject, MapArchObject, Archetype>> newArchetypeParser() {
final ArchFaceProvider archFaceProvider = new ArchFaceProvider();
- final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider);
+ final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider, true);
final GUIUtils guiUtils = new GUIUtils();
final SystemIcons systemIcons = new SystemIcons(guiUtils);
final FaceObjectProviders faceObjectProviders = new FaceObjectProviders(0, faceObjects, systemIcons);
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/crossfire/ChangeLog 2011-06-30 13:57:44 UTC (rev 8918)
@@ -1,3 +1,7 @@
+2011-06-30 Andreas Kirschbaum
+
+ * Adapt to changed format of crossfire.0.
+
2011-06-28 Andreas Kirschbaum
* Implement map, inv, and allows_all_inv attributes for <type> in
Modified: trunk/crossfire/resource/resource/conf/crossfire.0
===================================================================
(Binary files differ)
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 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -239,7 +239,7 @@
@NotNull
@Override
public FaceObjects<GameObject, MapArchObject, Archetype> createFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) {
- return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider);
+ return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider, false);
}
/**
Modified: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java
===================================================================
--- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParserTest.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -98,7 +98,7 @@
@Override
protected AbstractArchetypeParser<GameObject, MapArchObject, Archetype, ? extends AbstractArchetypeBuilder<GameObject, MapArchObject, Archetype>> newArchetypeParser() {
final ArchFaceProvider archFaceProvider = new ArchFaceProvider();
- final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider);
+ final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider, false);
final GUIUtils guiUtils = new GUIUtils();
final SystemIcons systemIcons = new SystemIcons(guiUtils);
final FaceObjectProviders faceObjectProviders = new FaceObjectProviders(0, faceObjects, systemIcons);
Modified: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java
===================================================================
--- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/GameObjectCreator.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -61,7 +61,7 @@
*/
GameObjectCreator() {
final ArchFaceProvider archFaceProvider = new ArchFaceProvider();
- final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider);
+ final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects = new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider, false);
final GUIUtils guiUtils = new GUIUtils();
final SystemIcons systemIcons = new SystemIcons(guiUtils);
faceObjectProviders = new FaceObjectProviders(1, faceObjects, systemIcons);
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 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -268,7 +268,7 @@
@NotNull
@Override
public FaceObjects<GameObject, MapArchObject, Archetype> createFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) {
- return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider);
+ return new DefaultFaceObjects<GameObject, MapArchObject, Archetype>(archFaceProvider, true);
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2011-06-28 19:39:20 UTC (rev 8917)
+++ trunk/model/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2011-06-30 13:57:44 UTC (rev 8918)
@@ -87,12 +87,19 @@
private final ArchFaceProvider archFaceProvider;
/**
+ * Whether the face file contains face numbers.
+ */
+ private final boolean includeFaceNumbers;
+
+ /**
* Creates a new instance.
* @param archFaceProvider the arch face provider to use for collection
+ * @param includeFaceNumbers whether the face file contains face numbers
*/
- public DefaultFaceObjects(@NotNull final ArchFaceProvider archFaceProvider) {
+ public DefaultFaceObjects(@NotNull final ArchFaceProvider archFaceProvider, final boolean includeFaceNumbers) {
super(ActionBuilderUtils.getString(ACTION_BUILDER, "nameOfFaceObject"));
this.archFaceProvider = archFaceProvider;
+ this.includeFaceNumbers = includeFaceNumbers;
}
/**
@@ -136,7 +143,7 @@
final FileChannel inChannel = fin.getChannel();
final long imageSize = inChannel.size();
byteBuffer.clear();
- byteBuffer.put(("IMAGE " + i + " " + imageSize + " " + face + "\n").getBytes(charset));
+ byteBuffer.put(("IMAGE " + (includeFaceNumbers ? i + " " : "") + imageSize + " " + face + "\n").getBytes(charset));
byteBuffer.flip();
outChannel.write(byteBuffer);
inChannel.transferTo(0L, imageSize, outChannel);
@@ -261,13 +268,16 @@
int offset = 0;
while (offset < data.length) {
// File: Structure*
- // Structure: "IMAGE " seqNr ' ' size ' ' facename '\n' PNGBinary
+ // Structure: "IMAGE " seqNr ' ' size ' ' facename '\n' PNGBinary (if includeFaceNumbers)
+ // Structure: "IMAGE " size ' ' facename '\n' PNGBinary (if !includeFaceNumbers)
if (!ArrayUtils.contains(data, offset, tag)) { // check for IMAGE
throw new IOException("expecting 'IMAGE' at position " + offset);
}
offset += 6; // skip "IMAGE ";
- while (data[offset++] != 0x20) {
- // skip seqNr ' '
+ if (includeFaceNumbers) {
+ while (data[offset++] != 0x20) {
+ // skip seqNr ' '
+ }
}
int size = 0;
// read size ' '
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-06 20:40:44
|
Revision: 8927
http://gridarta.svn.sourceforge.net/gridarta/?rev=8927&view=rev
Author: akirschbaum
Date: 2011-07-06 20:40:37 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
Fix map renderer to paint multi-square objects at the correct location, [Atrinik, Daimonin]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/daimonin/ChangeLog
trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-06 19:39:53 UTC (rev 8926)
+++ trunk/atrinik/ChangeLog 2011-07-06 20:40:37 UTC (rev 8927)
@@ -1,3 +1,8 @@
+2011-07-06 Andreas Kirschbaum
+
+ * Fix map renderer to paint multi-square objects at the correct
+ location.
+
2011-07-05 Alex Tokar
* Discard existing z attribute if a newly inserted game object has
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-07-06 19:39:53 UTC (rev 8926)
+++ trunk/daimonin/ChangeLog 2011-07-06 20:40:37 UTC (rev 8927)
@@ -1,3 +1,8 @@
+2011-07-06 Andreas Kirschbaum
+
+ * Fix map renderer to paint multi-square objects at the correct
+ location.
+
2011-06-28 Andreas Kirschbaum
* Implement map, inv, and allows_all_inv attributes for <type> in
Modified: trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java 2011-07-06 19:39:53 UTC (rev 8926)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java 2011-07-06 20:40:37 UTC (rev 8927)
@@ -214,4 +214,22 @@
return data[shapeID][1] - isoMapSquareInfo.getYLen() - data[shapeID][3 + positionID * 2];
}
+ /**
+ * Returns the total width for a multi-square image.
+ * @param shapeID the shape ID
+ * @return the width in pixels
+ */
+ public int getWidth(final int shapeID) {
+ return data[shapeID][0];
+ }
+
+ /**
+ * Returns the total height for a multi-square image.
+ * @param shapeID the shape ID
+ * @return the height in pixels
+ */
+ public int getHeight(final int shapeID) {
+ return data[shapeID][1];
+ }
+
} // class MultiPositionData
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-06 19:39:53 UTC (rev 8926)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-06 20:40:37 UTC (rev 8927)
@@ -532,29 +532,19 @@
private void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject, final boolean inSpawnPoint) {
final G head = gameObject.getHead();
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
- final int yOffset = icon.getIconHeight() - isoMapSquareInfo.getYLen();
if (head.getMultiRefCount() > 0) {
- // multi-part images have to be painted with correct offset
- // TODO: This should be improved, especially regarding multi arch mobs inside spawn points.
final R archetype = gameObject.getArchetype();
- final R headArchetype = head.getArchetype();
- final int headMultiShapeID = headArchetype.getMultiShapeID();
- final int multiPartNr = archetype.getMultiPartNr();
- final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr);
- final int y = yStart - yOffset + multiPositionData.getYOffset(headMultiShapeID, multiPartNr);
- if (archetype.isLowestPart()) {
+ if (inSpawnPoint || archetype.isLowestPart()) {
+ final int headMultiShapeID = head.getArchetype().getMultiShapeID();
+ final int multiPartNr = archetype.getMultiPartNr();
+ final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr) + multiPositionData.getWidth(headMultiShapeID) / 2 - icon.getIconWidth() / 2;
+ final int y = yStart - multiPositionData.getYOffset(headMultiShapeID, multiPartNr) + isoMapSquareInfo.getYLen() - icon.getIconHeight();
icon.paintIcon(this, g, x, y);
- } else if (inSpawnPoint) {
- icon.paintIcon(this, g, x, y);
}
} else {
- final int xOffset;
- if (icon.getIconWidth() > isoMapSquareInfo.getXLen()) {
- xOffset = (icon.getIconWidth() - isoMapSquareInfo.getXLen()) / 2;
- } else {
- xOffset = 0;
- }
- icon.paintIcon(this, g, xStart - xOffset, yStart - yOffset);
+ final int x = xStart + isoMapSquareInfo.getXLen2() - icon.getIconWidth() / 2;
+ final int y = yStart + isoMapSquareInfo.getYLen() - icon.getIconHeight();
+ icon.paintIcon(this, g, x, y);
}
// Paint first object (most likely a mob) in spawn points.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-07 17:36:41
|
Revision: 8928
http://gridarta.svn.sourceforge.net/gridarta/?rev=8928&view=rev
Author: akirschbaum
Date: 2011-07-07 17:36:34 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Implement part of #3332081 (Atrinik Rendering). The renderer now supports the "align" and "z" attributes. [Atrinik]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-06 20:40:37 UTC (rev 8927)
+++ trunk/atrinik/ChangeLog 2011-07-07 17:36:34 UTC (rev 8928)
@@ -1,3 +1,8 @@
+2011-07-07 Andreas Kirschbaum
+
+ * Implement part of #3332081 (Atrinik Rendering). The renderer now
+ supports the "align" and "z" attributes.
+
2011-07-06 Andreas Kirschbaum
* Fix map renderer to paint multi-square objects at the correct
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-06 20:40:37 UTC (rev 8927)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-07 17:36:34 UTC (rev 8928)
@@ -532,6 +532,7 @@
private void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject, final boolean inSpawnPoint) {
final G head = gameObject.getHead();
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
+ final int xOffset = head.getAttributeInt("align");
if (head.getMultiRefCount() > 0) {
final R archetype = gameObject.getArchetype();
if (inSpawnPoint || archetype.isLowestPart()) {
@@ -539,12 +540,12 @@
final int multiPartNr = archetype.getMultiPartNr();
final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr) + multiPositionData.getWidth(headMultiShapeID) / 2 - icon.getIconWidth() / 2;
final int y = yStart - multiPositionData.getYOffset(headMultiShapeID, multiPartNr) + isoMapSquareInfo.getYLen() - icon.getIconHeight();
- icon.paintIcon(this, g, x, y);
+ icon.paintIcon(this, g, x + xOffset, y);
}
} else {
final int x = xStart + isoMapSquareInfo.getXLen2() - icon.getIconWidth() / 2;
final int y = yStart + isoMapSquareInfo.getYLen() - icon.getIconHeight();
- icon.paintIcon(this, g, x, y);
+ icon.paintIcon(this, g, x + xOffset, y);
}
// Paint first object (most likely a mob) in spawn points.
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2011-07-06 20:40:37 UTC (rev 8927)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2011-07-07 17:36:34 UTC (rev 8928)
@@ -165,10 +165,19 @@
if (square.isEmpty()) {
emptySquareIcon.paintIcon(this, g, x, y);
} else {
+ boolean foundFloor = false;
for (final G node : square) {
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node)) {
- paintGameObjectIfVisible(g, x, y, node);
+ final G head = node.getHead();
+ final int yOffset;
+ if (!foundFloor && head.getAttributeInt("layer") == 1) {
+ foundFloor = true;
+ yOffset = 0;
+ } else {
+ yOffset = head.getAttributeInt("z");
+ }
+ paintGameObjectIfVisible(g, x, y - yOffset, node);
}
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2011-07-06 20:40:37 UTC (rev 8927)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2011-07-07 17:36:34 UTC (rev 8928)
@@ -79,8 +79,17 @@
*/
@Override
protected void paintSquare(@NotNull final Graphics2D g, final int x, final int y, @NotNull final MapSquare<G, A, R> square) {
+ boolean foundFloor = false;
for (final G node : square) {
- paintGameObjectIfVisible(g, x, y, node);
+ final G head = node.getHead();
+ final int yOffset;
+ if (!foundFloor && head.getAttributeInt("layer") == 1) {
+ foundFloor = true;
+ yOffset = 0;
+ } else {
+ yOffset = head.getAttributeInt("z");
+ }
+ paintGameObjectIfVisible(g, x, y - yOffset, node);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-07 18:23:34
|
Revision: 8929
http://gridarta.svn.sourceforge.net/gridarta/?rev=8929&view=rev
Author: akirschbaum
Date: 2011-07-07 18:23:27 +0000 (Thu, 07 Jul 2011)
Log Message:
-----------
Support "draw_double" and "draw_double_always" attributes in map renderer. [Atrinik]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-07 17:36:34 UTC (rev 8928)
+++ trunk/atrinik/ChangeLog 2011-07-07 18:23:27 UTC (rev 8929)
@@ -1,5 +1,8 @@
2011-07-07 Andreas Kirschbaum
+ * Support "draw_double" and "draw_double_always" attributes in map
+ renderer.
+
* Implement part of #3332081 (Atrinik Rendering). The renderer now
supports the "align" and "z" attributes.
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2011-07-07 17:36:34 UTC (rev 8928)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2011-07-07 18:23:27 UTC (rev 8929)
@@ -19,11 +19,13 @@
package net.sf.gridarta.var.atrinik.model.gameobject;
+import javax.swing.ImageIcon;
import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
+import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.var.atrinik.model.archetype.Archetype;
import net.sf.gridarta.var.atrinik.model.maparchobject.MapArchObject;
import org.jetbrains.annotations.NotNull;
@@ -139,4 +141,26 @@
return false;
}
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
+ final boolean drawDouble = getAttributeInt("draw_double_always") != 0 || (mapViewSettings.isDoubleFaces() && getAttributeInt("draw_double") != 0);
+ if (mapViewSettings.isAlphaType(getEditType())) {
+ if (drawDouble) {
+ return getTransparentDoubleImage();
+ } else {
+ return getTransparentImage();
+ }
+ } else {
+ if (drawDouble) {
+ return getDoubleImage();
+ } else {
+ return getNormalImage();
+ }
+ }
+ }
+
} // class GameObject
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java 2011-07-07 17:36:34 UTC (rev 8928)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java 2011-07-07 18:23:27 UTC (rev 8929)
@@ -19,11 +19,13 @@
package net.sf.gridarta.var.daimonin.model.gameobject;
+import javax.swing.ImageIcon;
import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
+import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.var.daimonin.model.archetype.Archetype;
import net.sf.gridarta.var.daimonin.model.maparchobject.MapArchObject;
import org.jetbrains.annotations.NotNull;
@@ -128,4 +130,25 @@
return false;
}
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
+ if (mapViewSettings.isAlphaType(getEditType())) {
+ if (mapViewSettings.isDoubleFaces()) {
+ return getTransparentDoubleImage();
+ } else {
+ return getTransparentImage();
+ }
+ } else {
+ if (mapViewSettings.isDoubleFaces()) {
+ return getDoubleImage();
+ } else {
+ return getNormalImage();
+ }
+ }
+ }
+
} // class GameObject
Modified: trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2011-07-07 17:36:34 UTC (rev 8928)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2011-07-07 18:23:27 UTC (rev 8929)
@@ -24,7 +24,6 @@
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.maparchobject.MapArchObject;
-import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -102,7 +101,7 @@
* @return the transparent face for this game object
*/
@NotNull
- private ImageIcon getTransparentImage() {
+ protected ImageIcon getTransparentImage() {
if (transFace == null) {
transFace = faceObjectProviders.getTrans(this);
}
@@ -114,7 +113,7 @@
* @return the double face for this game object
*/
@NotNull
- private ImageIcon getDoubleImage() {
+ protected ImageIcon getDoubleImage() {
if (doubleFace == null) {
doubleFace = faceObjectProviders.getDouble(this);
}
@@ -126,7 +125,7 @@
* @return the transparent face for this game object
*/
@NotNull
- private ImageIcon getTransparentDoubleImage() {
+ protected ImageIcon getTransparentDoubleImage() {
if (transDoubleFace == null) {
transDoubleFace = faceObjectProviders.getTransDouble(this);
}
@@ -158,28 +157,7 @@
/**
* {@inheritDoc}
*/
- @NotNull
@Override
- public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
- if (mapViewSettings.isAlphaType(getEditType())) {
- if (mapViewSettings.isDoubleFaces()) {
- return getTransparentDoubleImage();
- } else {
- return getTransparentImage();
- }
- } else {
- if (mapViewSettings.isDoubleFaces()) {
- return getDoubleImage();
- } else {
- return getNormalImage();
- }
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void facesReloaded() {
transFace = null;
doubleFace = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-08 15:22:10
|
Revision: 8935
http://gridarta.svn.sourceforge.net/gridarta/?rev=8935&view=rev
Author: akirschbaum
Date: 2011-07-08 15:22:04 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Do not reorder game objects when loading map files.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapReader.java
trunk/model/src/test/net/sf/gridarta/model/mapcontrol/TestMapControlCreator.java
Added Paths:
-----------
trunk/model/src/test/net/sf/gridarta/model/io/DefaultMapReaderTest.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-08 15:20:23 UTC (rev 8934)
+++ trunk/atrinik/ChangeLog 2011-07-08 15:22:04 UTC (rev 8935)
@@ -1,3 +1,8 @@
+2011-07-08 Andreas Kirschbaum
+
+ * Do not reorder game objects when loading map files. Formerly
+ multi-square game objects were moved to top.
+
2011-07-07 Andreas Kirschbaum
* Support "draw_double" and "draw_double_always" attributes in map
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-07-08 15:20:23 UTC (rev 8934)
+++ trunk/crossfire/ChangeLog 2011-07-08 15:22:04 UTC (rev 8935)
@@ -1,3 +1,8 @@
+2011-07-08 Andreas Kirschbaum
+
+ * Do not reorder game objects when loading map files. Formerly
+ multi-square game objects were moved to top.
+
2011-06-30 Andreas Kirschbaum
* Adapt to changed format of crossfire.0.
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-07-08 15:20:23 UTC (rev 8934)
+++ trunk/daimonin/ChangeLog 2011-07-08 15:22:04 UTC (rev 8935)
@@ -1,3 +1,8 @@
+2011-07-08 Andreas Kirschbaum
+
+ * Do not reorder game objects when loading map files. Formerly
+ multi-square game objects were moved to top.
+
2011-07-06 Andreas Kirschbaum
* Fix map renderer to paint multi-square objects at the correct
Modified: trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapReader.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapReader.java 2011-07-08 15:20:23 UTC (rev 8934)
+++ trunk/model/src/app/net/sf/gridarta/model/io/DefaultMapReader.java 2011-07-08 15:22:04 UTC (rev 8935)
@@ -25,8 +25,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
@@ -56,21 +54,6 @@
private final A mapArchObject;
/**
- * A comparator to sort multi-part objects before single-part objects.
- */
- private static final Comparator<GameObject<?, ?, ?>> sorter = new Comparator<GameObject<?, ?, ?>>() {
-
- /** {@inheritDoc} */
- @Override
- public int compare(final GameObject<?, ?, ?> o1, final GameObject<?, ?, ?> o2) {
- final boolean b1 = o1.isMulti();
- final boolean b2 = o2.isMulti();
- return b1 == b2 ? 0 : b2 ? -1 : 1;
- }
-
- };
-
- /**
* Open a file for reading it as a map.
* @param mapArchObjectParserFactory the map arch object parser factory
* instance
@@ -103,7 +86,6 @@
}
gameObjectParser.collectTempList(mapViewSettings, objects);
- Collections.sort(objects, sorter);
}
/**
Added: trunk/model/src/test/net/sf/gridarta/model/io/DefaultMapReaderTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/io/DefaultMapReaderTest.java (rev 0)
+++ trunk/model/src/test/net/sf/gridarta/model/io/DefaultMapReaderTest.java 2011-07-08 15:22:04 UTC (rev 8935)
@@ -0,0 +1,84 @@
+/*
+ * 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.io;
+
+import java.awt.Point;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+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.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
+import net.sf.gridarta.model.mapmodel.InsertionMode;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
+import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
+import net.sf.gridarta.model.mapviewsettings.TestMapViewSettings;
+import net.sf.gridarta.utils.Size2D;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link DefaultMapReader}.
+ * @author Andreas Kirschbaum
+ */
+public class DefaultMapReaderTest {
+
+ /**
+ * Checks that map loading doesn't reorder multi-square game objects.
+ * @throws DuplicateArchetypeException if the test fails
+ * @throws IOException if the test fails
+ */
+ @Test
+ public void testReorderMultiSquares() throws DuplicateArchetypeException, IOException {
+ final TestMapControlCreator mapControlCreator = new TestMapControlCreator();
+ final TestMapModelCreator mapModelCreator = mapControlCreator.getMapModelCreator();
+ final File mapFile = File.createTempFile("gridarta", null);
+ final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl = mapControlCreator.newMapControl(mapFile, "test", new Size2D(2, 1));
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapControl.getMapModel();
+ final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> insertionMode = mapModelCreator.getTopmostInsertionMode();
+ final TestArchetype arch1x1 = mapModelCreator.getArchetype("arch1x1");
+ final TestArchetype arch2x1 = mapModelCreator.newArchetype("arch2x1");
+ final TestArchetype arch2x1b = mapModelCreator.newArchetype("arch2x1b");
+ arch2x1b.setMultiX(1);
+ arch2x1.addTailPart(arch2x1b);
+ mapModelCreator.getArchetypeSet().addArchetype(arch2x1);
+ mapModel.insertArchToMap(arch1x1, null, new Point(0, 0), false);
+ mapModel.insertArchToMap(arch1x1, null, new Point(1, 0), false);
+ mapModel.insertArchToMap(arch2x1, null, new Point(0, 0), false);
+ mapModel.insertArchToMap(arch1x1, null, new Point(0, 0), false);
+ mapModel.insertArchToMap(arch1x1, null, new Point(1, 0), false);
+ mapControl.save();
+ final MapViewSettings mapViewSettings = new TestMapViewSettings();
+ final DefaultMapReader<TestGameObject, TestMapArchObject, TestArchetype> reader = mapControlCreator.newMapReader(mapViewSettings, mapFile);
+ final List<TestGameObject> objects = reader.getGameObjects();
+ Assert.assertEquals(6, objects.size());
+ Assert.assertEquals("arch1x1", objects.get(0).getArchetype().getArchetypeName());
+ Assert.assertEquals("arch2x1", objects.get(1).getArchetype().getArchetypeName());
+ Assert.assertEquals("arch1x1", objects.get(2).getArchetype().getArchetypeName());
+ Assert.assertEquals("arch1x1", objects.get(3).getArchetype().getArchetypeName());
+ Assert.assertEquals("arch1x1", objects.get(4).getArchetype().getArchetypeName());
+ Assert.assertEquals("arch2x1b", objects.get(5).getArchetype().getArchetypeName());
+ }
+
+}
Property changes on: trunk/model/src/test/net/sf/gridarta/model/io/DefaultMapReaderTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/model/src/test/net/sf/gridarta/model/mapcontrol/TestMapControlCreator.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/mapcontrol/TestMapControlCreator.java 2011-07-08 15:20:23 UTC (rev 8934)
+++ trunk/model/src/test/net/sf/gridarta/model/mapcontrol/TestMapControlCreator.java 2011-07-08 15:22:04 UTC (rev 8935)
@@ -20,6 +20,7 @@
package net.sf.gridarta.model.mapcontrol;
import java.io.File;
+import java.io.IOException;
import net.sf.gridarta.model.archetype.ArchetypeSet;
import net.sf.gridarta.model.archetype.DuplicateArchetypeException;
import net.sf.gridarta.model.archetype.TestArchetype;
@@ -27,6 +28,7 @@
import net.sf.gridarta.model.autojoin.AutojoinListsHelper;
import net.sf.gridarta.model.exitconnector.ExitMatcher;
import net.sf.gridarta.model.gameobject.TestGameObject;
+import net.sf.gridarta.model.io.DefaultMapReader;
import net.sf.gridarta.model.io.DefaultMapWriter;
import net.sf.gridarta.model.io.GameObjectParser;
import net.sf.gridarta.model.io.MapArchObjectParserFactory;
@@ -47,6 +49,7 @@
import net.sf.gridarta.model.mapmodel.MapModelFactory;
import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
import net.sf.gridarta.model.mapmodel.TestMapModelHelper;
+import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.model.match.TypeNrsGameObjectMatcher;
import net.sf.gridarta.model.settings.GlobalSettings;
@@ -86,6 +89,18 @@
private final ExitMatcher<TestGameObject, TestMapArchObject, TestArchetype> exitMatcher;
/**
+ * The {@link MapArchObjectParserFactory} instance.
+ */
+ @NotNull
+ private final MapArchObjectParserFactory<TestMapArchObject> mapArchObjectParserFactory;
+
+ /**
+ * The {@link GameObjectParser} instance.
+ */
+ @NotNull
+ private final GameObjectParser<TestGameObject, TestMapArchObject, TestArchetype> gameObjectParser;
+
+ /**
* The {@link MapReaderFactory} instance.
*/
@NotNull
@@ -139,8 +154,8 @@
public TestMapControlCreator() {
final GameObjectMatcher exitGameObjectMatcher = new TypeNrsGameObjectMatcher(TestMapModelHelper.EXIT_TYPE);
exitMatcher = new ExitMatcher<TestGameObject, TestMapArchObject, TestArchetype>(exitGameObjectMatcher);
- final MapArchObjectParserFactory<TestMapArchObject> mapArchObjectParserFactory = new TestMapArchObjectParserFactory();
- final GameObjectParser<TestGameObject, TestMapArchObject, TestArchetype> gameObjectParser = mapModelCreator.newGameObjectParser();
+ mapArchObjectParserFactory = new TestMapArchObjectParserFactory();
+ gameObjectParser = mapModelCreator.newGameObjectParser();
mapReaderFactory = new TestMapReaderFactory(mapArchObjectParserFactory, mapArchObjectFactory, gameObjectParser, mapModelCreator.getMapViewSettings());
globalSettings = new TestGlobalSettings();
mapWriter = new DefaultMapWriter<TestGameObject, TestMapArchObject, TestArchetype>(mapArchObjectParserFactory, gameObjectParser);
@@ -305,4 +320,17 @@
return mapWriter;
}
+ /**
+ * Creates a new instance.
+ * @param mapViewSettings the map view settings to pass to the map reader
+ * constructor
+ * @param mapFile the file to pass to the map reader constructor
+ * @return the map reader instance
+ * @throws IOException if the map reader cannot be created
+ */
+ @NotNull
+ public DefaultMapReader<TestGameObject, TestMapArchObject, TestArchetype> newMapReader(@NotNull final MapViewSettings mapViewSettings, @NotNull final File mapFile) throws IOException {
+ return new DefaultMapReader<TestGameObject, TestMapArchObject, TestArchetype>(mapArchObjectParserFactory, mapArchObjectFactory, gameObjectParser, mapViewSettings, mapFile);
+ }
+
} // class TestMapControlCreator
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-08 17:41:49
|
Revision: 8936
http://gridarta.svn.sourceforge.net/gridarta/?rev=8936&view=rev
Author: akirschbaum
Date: 2011-07-08 17:41:43 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Support 'zoom' attribute in map renderer. [Atrinik]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-08 15:22:04 UTC (rev 8935)
+++ trunk/atrinik/ChangeLog 2011-07-08 17:41:43 UTC (rev 8936)
@@ -1,5 +1,7 @@
2011-07-08 Andreas Kirschbaum
+ * Support 'zoom' attribute in map renderer.
+
* Do not reorder game objects when loading map files. Formerly
multi-square game objects were moved to top.
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-08 15:22:04 UTC (rev 8935)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-08 17:41:43 UTC (rev 8936)
@@ -25,6 +25,7 @@
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.io.File;
import java.util.Set;
@@ -533,24 +534,34 @@
final G head = gameObject.getHead();
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
final int xOffset = head.getAttributeInt("align");
+ final int zoom = head.getAttributeInt("zoom");
+ final int iconWidth;
+ final int iconHeight;
+ if (zoom == 0 || zoom == 100) {
+ iconWidth = icon.getIconWidth();
+ iconHeight = icon.getIconHeight();
+ } else {
+ iconWidth = (icon.getIconWidth() * zoom + 50) / 100;
+ iconHeight = (icon.getIconHeight() * zoom + 50) / 100;
+ }
if (head.getMultiRefCount() > 0) {
final R archetype = gameObject.getArchetype();
if (inSpawnPoint || archetype.isLowestPart()) {
final int headMultiShapeID = head.getArchetype().getMultiShapeID();
final int multiPartNr = archetype.getMultiPartNr();
- final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr) + multiPositionData.getWidth(headMultiShapeID) / 2 - icon.getIconWidth() / 2;
- final int y = yStart - multiPositionData.getYOffset(headMultiShapeID, multiPartNr) + isoMapSquareInfo.getYLen() - icon.getIconHeight();
- icon.paintIcon(this, g, x + xOffset, y);
+ final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr) + multiPositionData.getWidth(headMultiShapeID) / 2 - iconWidth / 2;
+ final int y = yStart - multiPositionData.getYOffset(headMultiShapeID, multiPartNr) + isoMapSquareInfo.getYLen() - iconHeight;
+ paintScaledIcon(g, icon, x + xOffset, y, zoom);
}
} else {
final int x;
- if (icon.getIconWidth() > isoMapSquareInfo.getXLen()) {
- x = xStart + isoMapSquareInfo.getXLen2() - icon.getIconWidth() / 2;
+ if (iconWidth > isoMapSquareInfo.getXLen()) {
+ x = xStart + isoMapSquareInfo.getXLen2() - iconWidth / 2;
} else {
x = xStart;
}
- final int y = yStart + isoMapSquareInfo.getYLen() - icon.getIconHeight();
- icon.paintIcon(this, g, x + xOffset, y);
+ final int y = yStart + isoMapSquareInfo.getYLen() - iconHeight;
+ paintScaledIcon(g, icon, x + xOffset, y, zoom);
}
// Paint first object (most likely a mob) in spawn points.
@@ -563,6 +574,29 @@
}
/**
+ * Paints an icon at a given zoom factor.
+ * @param g the graphics to paint into
+ * @param icon the icon to paint
+ * @param x the x coordinate to paint at
+ * @param y the y coordinate to paint at
+ * @param zoom the zoom factor in percent
+ */
+ private void paintScaledIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int zoom) {
+ if (zoom <= 0 || zoom == 100) {
+ icon.paintIcon(this, g, x, y);
+ } else {
+ final AffineTransform savedTransform = g.getTransform();
+ try {
+ g.translate(x, y);
+ g.scale(zoom/100.0, zoom/100.0);
+ icon.paintIcon(this, g, 0, 0);
+ } finally {
+ g.setTransform(savedTransform);
+ }
+ }
+ }
+
+ /**
* Returns whether the given {@link BaseObject} is a spawn point.
* @param gameObject the game object
* @return whether it is a spawn point
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-08 18:03:11
|
Revision: 8937
http://gridarta.svn.sourceforge.net/gridarta/?rev=8937&view=rev
Author: akirschbaum
Date: 2011-07-08 18:03:01 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Support 'alpha' attribute in map renderer. [Atrinik]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-08 17:41:43 UTC (rev 8936)
+++ trunk/atrinik/ChangeLog 2011-07-08 18:03:01 UTC (rev 8937)
@@ -1,6 +1,6 @@
2011-07-08 Andreas Kirschbaum
- * Support 'zoom' attribute in map renderer.
+ * Support 'zoom' and 'alpha' attributes in map renderer.
* Do not reorder game objects when loading map files. Formerly
multi-square game objects were moved to top.
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-08 17:41:43 UTC (rev 8936)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-08 18:03:01 UTC (rev 8937)
@@ -19,7 +19,9 @@
package net.sf.gridarta.gui.map.renderer;
+import java.awt.AlphaComposite;
import java.awt.Color;
+import java.awt.Composite;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
@@ -535,6 +537,7 @@
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
final int xOffset = head.getAttributeInt("align");
final int zoom = head.getAttributeInt("zoom");
+ final int alpha = head.getAttributeInt("alpha");
final int iconWidth;
final int iconHeight;
if (zoom == 0 || zoom == 100) {
@@ -551,7 +554,7 @@
final int multiPartNr = archetype.getMultiPartNr();
final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr) + multiPositionData.getWidth(headMultiShapeID) / 2 - iconWidth / 2;
final int y = yStart - multiPositionData.getYOffset(headMultiShapeID, multiPartNr) + isoMapSquareInfo.getYLen() - iconHeight;
- paintScaledIcon(g, icon, x + xOffset, y, zoom);
+ paintScaledIcon(g, icon, x + xOffset, y, zoom, alpha);
}
} else {
final int x;
@@ -561,7 +564,7 @@
x = xStart;
}
final int y = yStart + isoMapSquareInfo.getYLen() - iconHeight;
- paintScaledIcon(g, icon, x + xOffset, y, zoom);
+ paintScaledIcon(g, icon, x + xOffset, y, zoom, alpha);
}
// Paint first object (most likely a mob) in spawn points.
@@ -574,22 +577,23 @@
}
/**
- * Paints an icon at a given zoom factor.
+ * Paints an icon at a given zoom factor and alpha value.
* @param g the graphics to paint into
* @param icon the icon to paint
* @param x the x coordinate to paint at
* @param y the y coordinate to paint at
* @param zoom the zoom factor in percent
+ * @param alpha the alpha value (0..255)
*/
- private void paintScaledIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int zoom) {
+ private void paintScaledIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int zoom, final int alpha) {
if (zoom <= 0 || zoom == 100) {
- icon.paintIcon(this, g, x, y);
+ paintAlphaIcon(g, icon, x, y, alpha);
} else {
final AffineTransform savedTransform = g.getTransform();
try {
g.translate(x, y);
- g.scale(zoom/100.0, zoom/100.0);
- icon.paintIcon(this, g, 0, 0);
+ g.scale(zoom / 100.0, zoom / 100.0);
+ paintAlphaIcon(g, icon, 0, 0, alpha);
} finally {
g.setTransform(savedTransform);
}
@@ -597,6 +601,28 @@
}
/**
+ * Paints an icon at a given alpha value.
+ * @param g the graphics to paint into
+ * @param icon the icon to paint
+ * @param x the x coordinate to paint at
+ * @param y the y coordinate to paint at
+ * @param alpha the alpha value (0..255)
+ */
+ private void paintAlphaIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int alpha) {
+ if (alpha <= 0 || alpha >= 255) {
+ icon.paintIcon(this, g, x, y);
+ } else {
+ final Composite savedComposite = g.getComposite();
+ try {
+ g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha / 255.0F));
+ icon.paintIcon(this, g, x, y);
+ } finally {
+ g.setComposite(savedComposite);
+ }
+ }
+ }
+
+ /**
* Returns whether the given {@link BaseObject} is a spawn point.
* @param gameObject the game object
* @return whether it is a spawn point
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-08 18:59:04
|
Revision: 8939
http://gridarta.svn.sourceforge.net/gridarta/?rev=8939&view=rev
Author: akirschbaum
Date: 2011-07-08 18:58:57 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Support 'system_system_object' matcher for auto-insertion mode.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/model/src/app/net/sf/gridarta/model/mapmodel/AutoInsertionMode.java
trunk/model/src/app/net/sf/gridarta/model/mapmodel/InsertionModeSet.java
trunk/model/src/test/net/sf/gridarta/model/mapmodel/TestMapModelCreator.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/doc/ref/GameObjectMatcher.xhtml
Added Paths:
-----------
trunk/model/src/test/net/sf/gridarta/model/mapmodel/AutoInsertionModeTest.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/atrinik/ChangeLog 2011-07-08 18:58:57 UTC (rev 8939)
@@ -1,5 +1,8 @@
2011-07-08 Andreas Kirschbaum
+ * Support 'system_system_object' matcher for auto-insertion mode.
+ Matching game objects stay on top of the square.
+
* Support 'zoom' and 'alpha' attributes in map renderer.
* Do not reorder game objects when loading map files. Formerly
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/crossfire/ChangeLog 2011-07-08 18:58:57 UTC (rev 8939)
@@ -1,5 +1,8 @@
2011-07-08 Andreas Kirschbaum
+ * Support 'system_system_object' matcher for auto-insertion mode.
+ Matching game objects stay on top of the square.
+
* Do not reorder game objects when loading map files. Formerly
multi-square game objects were moved to top.
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/daimonin/ChangeLog 2011-07-08 18:58:57 UTC (rev 8939)
@@ -1,5 +1,8 @@
2011-07-08 Andreas Kirschbaum
+ * Support 'system_system_object' matcher for auto-insertion mode.
+ Matching game objects stay on top of the square.
+
* Do not reorder game objects when loading map files. Formerly
multi-square game objects were moved to top.
Modified: trunk/model/src/app/net/sf/gridarta/model/mapmodel/AutoInsertionMode.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapmodel/AutoInsertionMode.java 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/model/src/app/net/sf/gridarta/model/mapmodel/AutoInsertionMode.java 2011-07-08 18:58:57 UTC (rev 8939)
@@ -61,16 +61,27 @@
private final GameObjectMatcher belowFloorGameObjectMatcher;
/**
+ * A {@link GameObjectMatcher} matching system objects that should stay on
+ * top.
+ * @serial
+ */
+ @Nullable
+ private final GameObjectMatcher systemObjectGameObjectMatcher;
+
+ /**
* Initializes the class.
* @param floorGameObjectMatcher the floor matcher to use
* @param wallGameObjectMatcher the wall matcher to use
* @param belowFloorGameObjectMatcher the game object to insert below the
* floor
+ * @param systemObjectGameObjectMatcher matches system objects that should
+ * stay on top
*/
- public AutoInsertionMode(@Nullable final GameObjectMatcher floorGameObjectMatcher, @Nullable final GameObjectMatcher wallGameObjectMatcher, @Nullable final GameObjectMatcher belowFloorGameObjectMatcher) {
+ public AutoInsertionMode(@Nullable final GameObjectMatcher floorGameObjectMatcher, @Nullable final GameObjectMatcher wallGameObjectMatcher, @Nullable final GameObjectMatcher belowFloorGameObjectMatcher, @Nullable final GameObjectMatcher systemObjectGameObjectMatcher) {
this.floorGameObjectMatcher = floorGameObjectMatcher;
this.wallGameObjectMatcher = wallGameObjectMatcher;
this.belowFloorGameObjectMatcher = belowFloorGameObjectMatcher;
+ this.systemObjectGameObjectMatcher = systemObjectGameObjectMatcher;
}
/**
@@ -80,10 +91,11 @@
public void insert(@NotNull final G gameObject, @NotNull final MapSquare<G, A, R> mapSquare) {
if (floorGameObjectMatcher != null && floorGameObjectMatcher.isMatching(gameObject)) {
replaceFloor(gameObject, mapSquare, mapSquare.getLast(floorGameObjectMatcher));
- } else if (wallGameObjectMatcher != null && wallGameObjectMatcher.isMatching(gameObject)) {
- replaceWall(gameObject, mapSquare, mapSquare.getLast(wallGameObjectMatcher));
+ } else if (wallGameObjectMatcher != null && wallGameObjectMatcher.isMatching(gameObject) && replaceWall(gameObject, mapSquare, mapSquare.getLast(wallGameObjectMatcher))) {
} else if (belowFloorGameObjectMatcher != null && belowFloorGameObjectMatcher.isMatching(gameObject)) {
mapSquare.addFirst(gameObject);
+ } else if (systemObjectGameObjectMatcher != null && !systemObjectGameObjectMatcher.isMatching(gameObject)) {
+ insertNonSystemObject(gameObject, mapSquare, mapSquare.getFirst(systemObjectGameObjectMatcher));
} else {
mapSquare.addLast(gameObject);
}
@@ -104,7 +116,7 @@
* @param lastFloor the last floor game object within
* <code>mapSquare</code>
*/
- private void replaceFloor(final G gameObject, final MapSquare<G, A, R> mapSquare, final G lastFloor) {
+ private void replaceFloor(@NotNull final G gameObject, @NotNull final MapSquare<G, A, R> mapSquare, @Nullable final G lastFloor) {
// floor exists ==> replace it
if (lastFloor != null && !lastFloor.isMulti()) {
mapSquare.replace(lastFloor, gameObject);
@@ -125,17 +137,30 @@
}
/**
- * Replace a wall game object.
+ * Replaces a wall game object.
* @param gameObject the game object to insert with
* @param mapSquare the map square to modify
* @param lastWall the last wall game object within <code>mapSquare</code>
+ * @return whether an existing wall was replaced
*/
- private void replaceWall(final G gameObject, final GameObjectContainer<G, A, R> mapSquare, final G lastWall) {
+ private boolean replaceWall(@NotNull final G gameObject, @NotNull final GameObjectContainer<G, A, R> mapSquare, @Nullable final G lastWall) {
if (lastWall != null && !lastWall.isMulti()) {
mapSquare.replace(lastWall, gameObject);
- } else {
- mapSquare.addLast(gameObject);
+ return true;
}
+
+ return false;
}
+ /**
+ * Inserts a non-system game object.
+ * @param gameObject the game object to insert
+ * @param mapSquare the map square to modify
+ * @param firstSystemObject the first system game object within
+ * <code>mapSquare</code>
+ */
+ private void insertNonSystemObject(@NotNull final G gameObject, @NotNull final GameObjectContainer<G, A, R> mapSquare, @Nullable final G firstSystemObject) {
+ mapSquare.insertAfter(firstSystemObject, gameObject);
+ }
+
} // class AutoInsertionMode
Modified: trunk/model/src/app/net/sf/gridarta/model/mapmodel/InsertionModeSet.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/mapmodel/InsertionModeSet.java 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/model/src/app/net/sf/gridarta/model/mapmodel/InsertionModeSet.java 2011-07-08 18:58:57 UTC (rev 8939)
@@ -71,10 +71,12 @@
* game objects
* @param belowFloorGameObjectMatcher the game object matcher for selecting
* below floor game objects
+ * @param systemObjectGameObjectMatcher the game object matcher for
+ * selecting game objects that should stay on top
*/
- public InsertionModeSet(@NotNull final InsertionMode<G, A, R> topmostInsertionMode, @Nullable final GameObjectMatcher floorGameObjectMatcher, @Nullable final GameObjectMatcher wallGameObjectMatcher, @Nullable final GameObjectMatcher belowFloorGameObjectMatcher) {
+ public InsertionModeSet(@NotNull final InsertionMode<G, A, R> topmostInsertionMode, @Nullable final GameObjectMatcher floorGameObjectMatcher, @Nullable final GameObjectMatcher wallGameObjectMatcher, @Nullable final GameObjectMatcher belowFloorGameObjectMatcher, @Nullable final GameObjectMatcher systemObjectGameObjectMatcher) {
this.topmostInsertionMode = topmostInsertionMode;
- autoInsertionMode = new AutoInsertionMode<G, A, R>(floorGameObjectMatcher, wallGameObjectMatcher, belowFloorGameObjectMatcher);
+ autoInsertionMode = new AutoInsertionMode<G, A, R>(floorGameObjectMatcher, wallGameObjectMatcher, belowFloorGameObjectMatcher, systemObjectGameObjectMatcher);
aboveFloorInsertionMode = new AboveFloorInsertionMode<G, A, R>(floorGameObjectMatcher);
belowFloorInsertionMode = new BelowFloorInsertionMode<G, A, R>(floorGameObjectMatcher);
}
Added: trunk/model/src/test/net/sf/gridarta/model/mapmodel/AutoInsertionModeTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/mapmodel/AutoInsertionModeTest.java (rev 0)
+++ trunk/model/src/test/net/sf/gridarta/model/mapmodel/AutoInsertionModeTest.java 2011-07-08 18:58:57 UTC (rev 8939)
@@ -0,0 +1,177 @@
+/*
+ * 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.mapmodel;
+
+import java.awt.Point;
+import java.util.Iterator;
+import net.sf.gridarta.model.archetype.DuplicateArchetypeException;
+import net.sf.gridarta.model.archetype.TestArchetype;
+import net.sf.gridarta.model.baseobject.BaseObject;
+import net.sf.gridarta.model.gameobject.TestGameObject;
+import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.match.GameObjectMatcher;
+import net.sf.gridarta.model.match.TypeNrsGameObjectMatcher;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link AutoInsertionMode}.
+ * @author Andreas Kirschbaum
+ */
+public class AutoInsertionModeTest {
+
+ /**
+ * The archetype type for floor objects.
+ */
+ private static final int TYPE_FLOOR = 1;
+
+ /**
+ * The archetype type for wall objects.
+ */
+ private static final int TYPE_WALL = 2;
+
+ /**
+ * The archetype type for objects to be put below the floor.
+ */
+ private static final int TYPE_BELOW_FLOOR = 3;
+
+ /**
+ * The archetype type for system objects.
+ */
+ private static final int TYPE_SYSTEM = 4;
+
+ /**
+ * A {@link GameObjectMatcher} that matches floor objects.
+ */
+ @NotNull
+ private final GameObjectMatcher floorGameObjectMatcher = new TypeNrsGameObjectMatcher(TYPE_FLOOR);
+
+ /**
+ * A {@link GameObjectMatcher} that matches wall objects.
+ */
+ @NotNull
+ private final GameObjectMatcher wallGameObjectMatcher = new TypeNrsGameObjectMatcher(TYPE_WALL);
+
+ /**
+ * A {@link GameObjectMatcher} that matches objects to be put below the
+ * floor.
+ */
+ @NotNull
+ private final GameObjectMatcher belowFloorGameObjectMatcher = new TypeNrsGameObjectMatcher(TYPE_BELOW_FLOOR);
+
+ /**
+ * A {@link GameObjectMatcher} that matches system objects.
+ */
+ @NotNull
+ private final GameObjectMatcher systemGameObjectMatcher = new TypeNrsGameObjectMatcher(TYPE_SYSTEM);
+
+ /**
+ * The auto-insertion mode.
+ */
+ @NotNull
+ private final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> autoInsertionMode = new AutoInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>(floorGameObjectMatcher, wallGameObjectMatcher, belowFloorGameObjectMatcher, systemGameObjectMatcher);
+
+ /**
+ * The topmost-insertion mode.
+ */
+ @NotNull
+ private final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> topmostInsertionMode = new TopmostInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>();
+
+ /**
+ * The {@link TestMapModelCreator} instance.
+ */
+ private TestMapModelCreator mapModelCreator;
+
+ /**
+ * Checks that the auto-insertion mode works as expected.
+ * @throws DuplicateArchetypeException if the test fails
+ */
+ @Test
+ public void testInsertSystemObject1() throws DuplicateArchetypeException {
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapModelCreator.newMapModel(1, 1);
+ mapModel.beginTransaction("test");
+ try {
+ mapModelCreator.addGameObjectToMap(mapModel, "floor", "1", 0, 0, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "wall", "2", 0, 0, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "sys", "3", 0, 0, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "wall", "4", 0, 0, autoInsertionMode);
+ } finally {
+ mapModel.endTransaction();
+ }
+ final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquare = mapModel.getMapSquare(new Point(0, 0));
+ final Iterator<TestGameObject> it = mapSquare.iterator();
+ Assert.assertTrue(it.hasNext());
+ Assert.assertEquals("1", it.next().getBestName());
+ Assert.assertTrue(it.hasNext());
+ Assert.assertEquals("4", it.next().getBestName());
+ Assert.assertTrue(it.hasNext());
+ Assert.assertEquals("3", it.next().getBestName());
+ Assert.assertFalse(it.hasNext());
+ }
+
+ /**
+ * Checks that the auto-insertion mode works as expected.
+ */
+ @Test
+ public void testInsertSystemObject2() {
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapModelCreator.newMapModel(1, 1);
+ mapModel.beginTransaction("test");
+ try {
+ mapModelCreator.addGameObjectToMap(mapModel, "floor", "1", 0, 0, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "sys", "3", 0, 0, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "wall", "4", 0, 0, autoInsertionMode);
+ } finally {
+ mapModel.endTransaction();
+ }
+ final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquare = mapModel.getMapSquare(new Point(0, 0));
+ final Iterator<TestGameObject> it = mapSquare.iterator();
+ Assert.assertTrue(it.hasNext());
+ Assert.assertEquals("1", it.next().getBestName());
+ Assert.assertTrue(it.hasNext());
+ Assert.assertEquals("4", it.next().getBestName());
+ Assert.assertTrue(it.hasNext());
+ Assert.assertEquals("3", it.next().getBestName());
+ Assert.assertFalse(it.hasNext());
+ }
+
+ /**
+ * Initializes the tests.
+ * @throws DuplicateArchetypeException if the test fails
+ */
+ @Before
+ public void setUp() throws DuplicateArchetypeException {
+ mapModelCreator = new TestMapModelCreator(false);
+
+ final TestArchetype floorArchetype = mapModelCreator.newArchetype("floor");
+ floorArchetype.setAttributeInt(BaseObject.TYPE, TYPE_FLOOR);
+ mapModelCreator.getArchetypeSet().addArchetype(floorArchetype);
+
+ final TestArchetype wallArchetype = mapModelCreator.newArchetype("wall");
+ wallArchetype.setAttributeInt(BaseObject.TYPE, TYPE_WALL);
+ mapModelCreator.getArchetypeSet().addArchetype(wallArchetype);
+
+ final TestArchetype sysArchetype = mapModelCreator.newArchetype("sys");
+ sysArchetype.setAttributeInt(BaseObject.TYPE, TYPE_SYSTEM);
+ mapModelCreator.getArchetypeSet().addArchetype(sysArchetype);
+ }
+
+}
Property changes on: trunk/model/src/test/net/sf/gridarta/model/mapmodel/AutoInsertionModeTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/model/src/test/net/sf/gridarta/model/mapmodel/TestMapModelCreator.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/mapmodel/TestMapModelCreator.java 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/model/src/test/net/sf/gridarta/model/mapmodel/TestMapModelCreator.java 2011-07-08 18:58:57 UTC (rev 8939)
@@ -146,7 +146,7 @@
archetypeSet = new TestArchetypeSet(archetypeFactory, "archetypes", faceObjectProviders);
gameObjectFactory = new TestGameObjectFactory(faceObjectProviders, animationObjects);
topmostInsertionMode = new TopmostInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>();
- insertionModeSet = new InsertionModeSet<TestGameObject, TestMapArchObject, TestArchetype>(topmostInsertionMode, new TypeNrsGameObjectMatcher(), new TypeNrsGameObjectMatcher(), new TypeNrsGameObjectMatcher());
+ insertionModeSet = new InsertionModeSet<TestGameObject, TestMapArchObject, TestArchetype>(topmostInsertionMode, new TypeNrsGameObjectMatcher(), new TypeNrsGameObjectMatcher(), new TypeNrsGameObjectMatcher(), new TypeNrsGameObjectMatcher());
}
/**
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-07-08 18:58:57 UTC (rev 8939)
@@ -471,7 +471,8 @@
final GameObjectMatcher wallMatcher = gameObjectMatchers.getMatcher("system_wall", "wall");
final ErrorViewCollector gameObjectMatchersErrorViewCollector = new ErrorViewCollector(errorView, new File(globalSettings.getConfigurationDirectory(), "GameObjectMatchers.xml"));
final GameObjectMatcher belowFloorMatcher = gameObjectMatchers.getMatcherWarn(gameObjectMatchersErrorViewCollector, "system_below_floor", "below_floor");
- final InsertionModeSet<G, A, R> insertionModeSet = new InsertionModeSet<G, A, R>(topmostInsertionMode, floorMatcher, wallMatcher, belowFloorMatcher);
+ final GameObjectMatcher systemObjectMatcher = gameObjectMatchers.getMatcherWarn(gameObjectMatchersErrorViewCollector, "system_system_object");
+ final InsertionModeSet<G, A, R> insertionModeSet = new InsertionModeSet<G, A, R>(topmostInsertionMode, floorMatcher, wallMatcher, belowFloorMatcher, systemObjectMatcher);
final CopyBuffer<G, A, R> copyBuffer = new CopyBuffer<G, A, R>(mapViewSettings, gameObjectFactory, mapArchObjectFactory, mapModelFactory, insertionModeSet);
final ReplaceDialogManager<G, A, R> replaceDialogManager = new ReplaceDialogManager<G, A, R>(mainViewFrame, copyBuffer, objectChooser, mapViewManager, faceObjectProviders, insertionModeSet);
exiter = new DefaultExiter(mainViewFrame);
Modified: trunk/src/doc/ref/GameObjectMatcher.xhtml
===================================================================
--- trunk/src/doc/ref/GameObjectMatcher.xhtml 2011-07-08 18:54:18 UTC (rev 8938)
+++ trunk/src/doc/ref/GameObjectMatcher.xhtml 2011-07-08 18:58:57 UTC (rev 8939)
@@ -134,6 +134,11 @@
'below_floor') matcher for selecting game objects that should be
inserted below floors.
</li>
+ <li>
+ The insertion tool uses the 'system_system_object' matcher for
+ selecting game objects that should be inserted on top of
+ non-system objects.
+ </li>
</ul>
</dd>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-16 10:45:02
|
Revision: 8942
http://gridarta.svn.sourceforge.net/gridarta/?rev=8942&view=rev
Author: akirschbaum
Date: 2011-07-16 10:44:55 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Support 'rotate' attribute in map renderer. [Atrinik]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-09 10:23:45 UTC (rev 8941)
+++ trunk/atrinik/ChangeLog 2011-07-16 10:44:55 UTC (rev 8942)
@@ -1,3 +1,7 @@
+2011-07-16 Andreas Kirschbaum
+
+ * Support 'rotate' attribute in map renderer.
+
2011-07-08 Andreas Kirschbaum
* Support 'system_system_object' matcher for auto-insertion mode.
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-09 10:23:45 UTC (rev 8941)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-16 10:44:55 UTC (rev 8942)
@@ -537,15 +537,25 @@
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
final int xOffset = head.getAttributeInt("align");
final int zoom = head.getAttributeInt("zoom");
+ final double rotate = getRotate(head);
final int alpha = head.getAttributeInt("alpha");
+ final int tmpIconWidth;
+ final int tmpIconHeight;
+ if (zoom == 0 || zoom == 100) {
+ tmpIconWidth = icon.getIconWidth();
+ tmpIconHeight = icon.getIconHeight();
+ } else {
+ tmpIconWidth = (icon.getIconWidth() * zoom + 50) / 100;
+ tmpIconHeight = (icon.getIconHeight() * zoom + 50) / 100;
+ }
final int iconWidth;
final int iconHeight;
- if (zoom == 0 || zoom == 100) {
- iconWidth = icon.getIconWidth();
- iconHeight = icon.getIconHeight();
+ if (rotate < 0.001) {
+ iconWidth = tmpIconWidth;
+ iconHeight = tmpIconHeight;
} else {
- iconWidth = (icon.getIconWidth() * zoom + 50) / 100;
- iconHeight = (icon.getIconHeight() * zoom + 50) / 100;
+ iconWidth = (int) (Math.abs(Math.cos(rotate) * tmpIconWidth) + 0.5) + (int) (Math.abs(Math.sin(rotate) * tmpIconHeight) + 0.5);
+ iconHeight = (int) (Math.abs(Math.sin(rotate) * tmpIconWidth) + 0.5) + (int) (Math.abs(Math.cos(rotate) * tmpIconHeight) + 0.5);
}
if (head.getMultiRefCount() > 0) {
final R archetype = gameObject.getArchetype();
@@ -554,7 +564,7 @@
final int multiPartNr = archetype.getMultiPartNr();
final int x = xStart - multiPositionData.getXOffset(headMultiShapeID, multiPartNr) + multiPositionData.getWidth(headMultiShapeID) / 2 - iconWidth / 2;
final int y = yStart - multiPositionData.getYOffset(headMultiShapeID, multiPartNr) + isoMapSquareInfo.getYLen() - iconHeight;
- paintScaledIcon(g, icon, x + xOffset, y, zoom, alpha);
+ paintScaledIcon(g, icon, x + xOffset, y, zoom, alpha, rotate, tmpIconWidth, tmpIconHeight, iconWidth, iconHeight);
}
} else {
final int x;
@@ -564,7 +574,7 @@
x = xStart;
}
final int y = yStart + isoMapSquareInfo.getYLen() - iconHeight;
- paintScaledIcon(g, icon, x + xOffset, y, zoom, alpha);
+ paintScaledIcon(g, icon, x + xOffset, y, zoom, alpha, rotate, tmpIconWidth, tmpIconHeight, iconWidth, iconHeight);
}
// Paint first object (most likely a mob) in spawn points.
@@ -577,6 +587,16 @@
}
/**
+ * Returns the rotation angle of a game object.
+ * @param head the head of the game object
+ * @return the rotation angle in radians
+ */
+ private static double getRotate(@NotNull final BaseObject<?, ?, ?, ?> head) {
+ final int rotate = -head.getAttributeInt("rotate") % 360;
+ return (rotate < 0 ? rotate + 360 : rotate) * 2 * Math.PI / 360;
+ }
+
+ /**
* Paints an icon at a given zoom factor and alpha value.
* @param g the graphics to paint into
* @param icon the icon to paint
@@ -584,16 +604,21 @@
* @param y the y coordinate to paint at
* @param zoom the zoom factor in percent
* @param alpha the alpha value (0..255)
+ * @param rotate the rotation angle in radians
+ * @param oldIconWidth the width of the icon before rotation in pixel
+ * @param oldIconHeight the height of the icon before rotation in pixel
+ * @param newIconWidth the width of the icon after rotation in pixel
+ * @param newIconHeight the height of the icon atfer rotation in pixel
*/
- private void paintScaledIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int zoom, final int alpha) {
+ private void paintScaledIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int zoom, final int alpha, final double rotate, final int oldIconWidth, final int oldIconHeight, final int newIconWidth, final int newIconHeight) {
if (zoom <= 0 || zoom == 100) {
- paintAlphaIcon(g, icon, x, y, alpha);
+ paintAlphaIcon(g, icon, x, y, alpha, rotate, oldIconWidth, oldIconHeight, newIconWidth, newIconHeight);
} else {
final AffineTransform savedTransform = g.getTransform();
try {
g.translate(x, y);
g.scale(zoom / 100.0, zoom / 100.0);
- paintAlphaIcon(g, icon, 0, 0, alpha);
+ paintAlphaIcon(g, icon, 0, 0, alpha, rotate, oldIconWidth, oldIconHeight, newIconWidth, newIconHeight);
} finally {
g.setTransform(savedTransform);
}
@@ -607,15 +632,20 @@
* @param x the x coordinate to paint at
* @param y the y coordinate to paint at
* @param alpha the alpha value (0..255)
+ * @param rotate the rotation angle in radians
+ * @param oldIconWidth the width of the icon before rotation in pixel
+ * @param oldIconHeight the height of the icon before rotation in pixel
+ * @param newIconWidth the width of the icon after rotation in pixel
+ * @param newIconHeight the height of the icon atfer rotation in pixel
*/
- private void paintAlphaIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int alpha) {
+ private void paintAlphaIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final int alpha, final double rotate, final int oldIconWidth, final int oldIconHeight, final int newIconWidth, final int newIconHeight) {
if (alpha <= 0 || alpha >= 255) {
- icon.paintIcon(this, g, x, y);
+ paintRotatedIcon(g, icon, x, y, rotate, oldIconWidth, oldIconHeight, newIconWidth, newIconHeight);
} else {
final Composite savedComposite = g.getComposite();
try {
g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha / 255.0F));
- icon.paintIcon(this, g, x, y);
+ paintRotatedIcon(g, icon, x, y, rotate, oldIconWidth, oldIconHeight, newIconWidth, newIconHeight);
} finally {
g.setComposite(savedComposite);
}
@@ -623,6 +653,34 @@
}
/**
+ * Paints an icon at a given rotation angle.
+ * @param g the graphics to paint into
+ * @param icon the icon to paint
+ * @param x the x coordinate to paint at
+ * @param y the y coordinate to paint at
+ * @param rotate the rotation angle in radians
+ * @param oldIconWidth the width of the icon before rotation in pixel
+ * @param oldIconHeight the height of the icon before rotation in pixel
+ * @param newIconWidth the width of the icon after rotation in pixel
+ * @param newIconHeight the height of the icon atfer rotation in pixel
+ */
+ private void paintRotatedIcon(@NotNull final Graphics2D g, @NotNull final Icon icon, final int x, final int y, final double rotate, final int oldIconWidth, final int oldIconHeight, final int newIconWidth, final int newIconHeight) {
+ if (rotate < 0.001) {
+ icon.paintIcon(this, g, x, y);
+ } else {
+ final AffineTransform savedTransform = g.getTransform();
+ try {
+ g.translate(x + newIconWidth / 2, y + newIconHeight / 2);
+ g.rotate(rotate);
+ g.translate(-oldIconWidth / 2, -oldIconHeight / 2);
+ icon.paintIcon(this, g, 0, 0);
+ } finally {
+ g.setTransform(savedTransform);
+ }
+ }
+ }
+
+ /**
* Returns whether the given {@link BaseObject} is a spawn point.
* @param gameObject the game object
* @return whether it is a spawn point
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-16 11:43:02
|
Revision: 8943
http://gridarta.svn.sourceforge.net/gridarta/?rev=8943&view=rev
Author: akirschbaum
Date: 2011-07-16 11:42:53 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Replace string constants with named constants.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/DefaultArchetype.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.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/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/model/gameobject/GameObject.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/DefaultArchetype.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/exitconnector/ExitLocation.java
trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitMatcher.java
trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMatrix.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMobOrSpawnPointChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSpawnPointChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSquareChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/ConnectedPickableChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/DoubleLayerChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/Entry.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/ExitChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/SlayingChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/SysObjectNotOnLayerZeroChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/checks/UnsetSlayingChecker.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/SysObjectNotOnLayerZeroError.java
trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java
trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/FaceTab.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.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/test/net/sf/gridarta/actions/ExitConnectorActionsTest.java
trunk/src/test/net/sf/gridarta/actions/UndoActionsTest.java
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/DefaultArchetype.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/DefaultArchetype.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/DefaultArchetype.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -62,7 +62,7 @@
*/
@Override
public boolean usesDirection() {
- return getAttributeInt("is_turnable") != 0 || getAttributeInt("is_animated") != 0;
+ return getAttributeInt(IS_TURNABLE) != 0 || getAttributeInt(IS_ANIMATED) != 0;
}
/**
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -44,12 +44,6 @@
public class GameObject extends DefaultIsoGameObject<GameObject, MapArchObject, Archetype> {
/**
- * The name of the "z" attribute.
- */
- @NotNull
- public static final String Z_ATTRIBUTE = "z";
-
- /**
* The serial version UID.
*/
private static final long serialVersionUID = 1L;
@@ -103,11 +97,11 @@
*/
@Override
public void propagateElevation(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
- if (getAttributeInt(Z_ATTRIBUTE) == 0) {
- final int elevation = gameObject.getAttributeInt(Z_ATTRIBUTE, false);
- setAttributeInt(Z_ATTRIBUTE, elevation);
+ if (getAttributeInt(Z) == 0) {
+ final int elevation = gameObject.getAttributeInt(Z, false);
+ setAttributeInt(Z, elevation);
}
- gameObject.removeAttribute(Z_ATTRIBUTE);
+ gameObject.removeAttribute(Z);
}
/**
@@ -147,7 +141,7 @@
@NotNull
@Override
public ImageIcon getImage(@NotNull final MapViewSettings mapViewSettings) {
- final boolean drawDouble = getAttributeInt("draw_double_always") != 0 || (mapViewSettings.isDoubleFaces() && getAttributeInt("draw_double") != 0);
+ final boolean drawDouble = getAttributeInt(DRAW_DOUBLE_ALWAYS) != 0 || (mapViewSettings.isDoubleFaces() && getAttributeInt(DRAW_DOUBLE) != 0);
if (mapViewSettings.isAlphaType(getEditType())) {
if (drawDouble) {
return getTransparentDoubleImage();
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 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -305,14 +305,14 @@
final int borderOffsetY = getBorderOffsetY();
int layer = -1;
for (final GameObject node : square) {
- if (node.getAttributeInt("invisible", true) == 0) {
+ if (node.getAttributeInt(GameObject.INVISIBLE, true) == 0) {
layer++;
}
filterControl.objectInSquare(filterState, node);
if (filterControl.canShow(node) && mapViewSettings.isEditType(node)) {
paintGameObject(g, x, y, node);
- if (node.getAttributeInt("smoothlevel", true) > 0) {
- smoothingRenderer.paintSmooth(g, square.getMapX(), square.getMapY(), node.getAttributeInt("smoothlevel", true), layer, false, borderOffsetX, borderOffsetY);
+ if (node.getAttributeInt(GameObject.SMOOTHLEVEL, true) > 0) {
+ smoothingRenderer.paintSmooth(g, square.getMapX(), square.getMapY(), node.getAttributeInt(GameObject.SMOOTHLEVEL, true), layer, false, borderOffsetX, borderOffsetY);
}
}
}
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 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -152,7 +152,7 @@
int layer = -1;
for (final BaseObject<?, ?, ?, ?> node : mapModel.getMapSquare(point)) {
- if (node.getAttributeInt("invisible", true) == 0) {
+ if (node.getAttributeInt(GameObject.INVISIBLE, true) == 0) {
layer++;
}
final ImageIcon img = node.getNormalImage();
@@ -165,8 +165,8 @@
offset.y = IGUIConstants.SQUARE_HEIGHT * (node.getArchetype().getMultiY() - node.getMinY());
}
graphics.drawImage(img.getImage(), point.x * IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT, point.x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, offset.x, offset.y, offset.x + IGUIConstants.SQUARE_WIDTH, offset.y + IGUIConstants.SQUARE_HEIGHT, this);
- if (node.getAttributeInt("smoothlevel", true) > 0) {
- smoothingRenderer.paintSmooth(graphics, point.x, point.y, node.getAttributeInt("smoothlevel", true), layer, false, 0, 0);
+ if (node.getAttributeInt(GameObject.SMOOTHLEVEL, true) > 0) {
+ smoothingRenderer.paintSmooth(graphics, point.x, point.y, node.getAttributeInt(GameObject.SMOOTHLEVEL, true), layer, false, 0, 0);
}
}
if (layer > -1) {
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 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -129,11 +129,11 @@
if (mapArchObject.isPointValid(where)) {
int currentLayer = -1;
for (final net.sf.gridarta.model.gameobject.GameObject<GameObject, MapArchObject, Archetype> node : mapModel.getMapSquare(where)) {
- if (node.getAttributeInt("invisible", true) == 0) {
+ if (node.getAttributeInt(GameObject.INVISIBLE, true) == 0) {
currentLayer++;
if (currentLayer == layer) {
foundLayer = true;
- if (node.getAttributeInt("smoothlevel", true) > 0) {
+ if (node.getAttributeInt(GameObject.SMOOTHLEVEL, true) > 0) {
layerNode[deltaX + 1][deltaY + 1] = node;
}
break;
@@ -154,7 +154,7 @@
//noinspection AssignmentToNull
sFaces[i] = null; /*black picture*/
} else {
- final int smoothlevel = node.getAttributeInt("smoothlevel", true);
+ final int smoothlevel = node.getAttributeInt(GameObject.SMOOTHLEVEL, true);
if (smoothlevel <= level) {
sLevels[i] = 0;
//false warning: cannot annotate with @Nullable
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/gameobject/GameObject.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -54,6 +54,18 @@
public static final String ELEVATION = "elevation";
/**
+ * The name of the "invisible" attribute.
+ */
+ @NotNull
+ public static final String INVISIBLE = "invisible";
+
+ /**
+ * The name of the "smoothlevel" attribute.
+ */
+ @NotNull
+ public static final String SMOOTHLEVEL = "smoothlevel";
+
+ /**
* Creates a new instance.
* @param archetype the base archetype
* @param faceObjectProviders the face object providers for looking up
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/DefaultArchetype.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/DefaultArchetype.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/DefaultArchetype.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -62,7 +62,7 @@
*/
@Override
public boolean usesDirection() {
- return getAttributeInt("is_turnable") != 0 || getAttributeInt("is_animated") != 0;
+ return getAttributeInt(IS_TURNABLE) != 0 || getAttributeInt(IS_ANIMATED) != 0;
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -1043,7 +1043,7 @@
@Override
public void setObjectFace() {
@Nullable String effectiveAnimName;
- if (getAttributeInt("is_animated") == 0 && getAttributeInt("is_turnable") == 0) {
+ if (getAttributeInt(IS_ANIMATED) == 0 && getAttributeInt(IS_TURNABLE) == 0) {
effectiveAnimName = null;
faceObjSource = FaceSource.ANIM;
} else if (animName != null) {
Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/BaseObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/BaseObject.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/BaseObject.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -71,6 +71,72 @@
String TITLE = "title";
/**
+ * The attribute name of the "is_animated" flag.
+ */
+ @NotNull
+ String IS_ANIMATED = "is_animated";
+
+ /**
+ * The name of the "is_turnable" attribute.
+ */
+ @NotNull
+ String IS_TURNABLE = "is_turnable";
+
+ /**
+ * The attribute name of the "hp" attribute.
+ */
+ @NotNull
+ String HP = "hp";
+
+ /**
+ * The attribute name of the "sp" attribute.
+ */
+ @NotNull
+ String SP = "sp";
+
+ /**
+ * The name of the "no_pass" attribute.
+ */
+ @NotNull
+ String NO_PASS = "no_pass";
+
+ /**
+ * The name of the "no_pick" attribute.
+ */
+ @NotNull
+ String NO_PICK = "no_pick";
+
+ /**
+ * The name of the "level" attribute.
+ */
+ @NotNull
+ String LEVEL = "level";
+
+ /**
+ * The name of the "slaying" attribute.
+ */
+ @NotNull
+ String SLAYING = "slaying";
+
+ /**
+ * The name of the "last_heal" attribute.
+ */
+ @NotNull
+ String LAST_HEAL = "last_heal";
+
+ /**
+ * The name of the "blocksview" attribute.
+ */
+ @NotNull
+ String BLOCKSVIEW = "blocksview";
+
+ /**
+ * The name of the "anim_speed" attribute.
+ */
+ @NotNull
+ String ANIM_SPEED = "anim_speed";
+
+ /**
* Returns the type number of this Archetype.
* @return the type number of this archetype
*/
Modified: trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitLocation.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitLocation.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitLocation.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -109,9 +109,9 @@
mapPath = targetMapPath;
}
}
- gameObject.setAttributeString("slaying", mapPath);
- gameObject.setAttributeInt("hp", x);
- gameObject.setAttributeInt("sp", y);
+ gameObject.setAttributeString(BaseObject.SLAYING, mapPath);
+ gameObject.setAttributeInt(BaseObject.HP, x);
+ gameObject.setAttributeInt(BaseObject.SP, y);
if (updateName) {
gameObject.setAttributeString(BaseObject.NAME, mapName);
}
Modified: trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitMatcher.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitMatcher.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/exitconnector/ExitMatcher.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -21,6 +21,7 @@
import java.awt.Point;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapmodel.MapModel;
@@ -135,7 +136,7 @@
* @return whether the game object has "slaying" set
*/
private boolean isValidExit(@NotNull final GameObject<G, A, R> gameObject) {
- return isExit(gameObject) && gameObject.hasAttribute("slaying");
+ return isExit(gameObject) && gameObject.hasAttribute(BaseObject.SLAYING);
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -39,6 +39,60 @@
private static final long serialVersionUID = 1L;
/**
+ * The name of the "z" attribute.
+ */
+ @NotNull
+ public static final String Z = "z";
+
+ /**
+ * The name of the "layer" attribute.
+ */
+ @NotNull
+ public static final String LAYER = "layer";
+
+ /**
+ * The name of the "sys_object" attribute.
+ */
+ @NotNull
+ public static final String SYS_OBJECT = "sys_object";
+
+ /**
+ * The name of the "draw_double_always" attribute.
+ */
+ @NotNull
+ public static final String DRAW_DOUBLE_ALWAYS = "draw_double_always";
+
+ /**
+ * The name of the "draw_double" attribute.
+ */
+ @NotNull
+ public static final String DRAW_DOUBLE = "draw_double";
+
+ /**
+ * The name of the "align" attribute.
+ */
+ @NotNull
+ public static final String ALIGN = "align";
+
+ /**
+ * The name of the "zoom" attribute.
+ */
+ @NotNull
+ public static final String ZOOM = "zoom";
+
+ /**
+ * The name of the "alpha" attribute.
+ */
+ @NotNull
+ public static final String ALPHA = "alpha";
+
+ /**
+ * The name of the "rotate" attribute.
+ */
+ @NotNull
+ public static final String ROTATE = "rotate";
+
+ /**
* The {@link FaceObjectProviders} for looking up faces.
*/
@NotNull
@@ -82,7 +136,7 @@
*/
@Override
public boolean usesDirection() {
- return getAttributeInt("is_turnable") != 0 || getAttributeInt("is_animated") != 0;
+ return getAttributeInt(IS_TURNABLE) != 0 || getAttributeInt(IS_ANIMATED) != 0;
}
/**
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMatrix.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMatrix.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMatrix.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -54,7 +54,7 @@
for (pos.y = 0; pos.y < height; pos.y++) {
for (pos.x = 0; pos.x < width; pos.x++) {
for (final BaseObject<G, A, R, ?> gameObject : mapModel.getMapSquare(pos)) {
- if (gameObject.getAttributeInt("no_pass") != 0) {
+ if (gameObject.getAttributeInt(BaseObject.NO_PASS) != 0) {
blocked[pos.x][pos.y] = true;
break;
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMobOrSpawnPointChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMobOrSpawnPointChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedMobOrSpawnPointChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -25,6 +25,7 @@
import java.util.HashSet;
import java.util.List;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapmodel.MapSquare;
@@ -78,7 +79,7 @@
for (final G gameObject : mapSquare) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
mobsOrSpawnPoints.add(gameObject);
- } else if (gameObject.getAttributeInt("no_pass", true) == 1) {
+ } else if (gameObject.getAttributeInt(BaseObject.NO_PASS, true) == 1) {
blockers.add(gameObject);
}
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSpawnPointChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSpawnPointChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSpawnPointChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -24,6 +24,7 @@
import java.util.Collection;
import java.util.HashSet;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapmodel.MapModel;
@@ -117,7 +118,7 @@
return;
}
- final int spawnRange = Math.min(head.getAttributeInt("last_heal"), freeArrX.length);
+ final int spawnRange = Math.min(head.getAttributeInt(BaseObject.LAST_HEAL), freeArrX.length);
for (int i = 0; i < spawnRange; i++) {
if (!blocked.isBlocked(pos.x + freeArrX[i], pos.y + freeArrY[i])) {
return;
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSquareChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSquareChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/BlockedSquareChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -126,10 +126,10 @@
boolean blocksView = false;
for (final BaseObject<?, ?, ?, ?> gameObject : square) {
if (!noPass) {
- noPass = gameObject.getAttributeInt("no_pass") == 1;
+ noPass = gameObject.getAttributeInt(BaseObject.NO_PASS) == 1;
}
if (!blocksView) {
- blocksView = gameObject.getAttributeInt("blocksview") == 1;
+ blocksView = gameObject.getAttributeInt(BaseObject.BLOCKSVIEW) == 1;
}
if (noPass && blocksView) {
return true;
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/ConnectedPickableChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/ConnectedPickableChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/ConnectedPickableChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -20,6 +20,7 @@
package net.sf.gridarta.model.validation.checks;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.validation.AbstractValidator;
@@ -49,7 +50,7 @@
@Override
public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final GameObject<G, A, R> head = gameObject.getHead();
- final boolean pickable = head.getAttributeInt("no_pick", true) == 0;
+ final boolean pickable = head.getAttributeInt(BaseObject.NO_PICK, true) == 0;
final CharSequence connection = head.getAttributeString("connected", true);
final boolean connected = connection.length() > 0;
if (connected && pickable) {
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/DoubleLayerChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/DoubleLayerChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/DoubleLayerChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -22,6 +22,7 @@
import java.util.HashMap;
import java.util.Map;
import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapmodel.MapSquare;
@@ -55,7 +56,7 @@
final Map<Integer, G> gameObjects = new HashMap<Integer, G>();
final Map<Integer, DoubleLayerError<G, A, R>> errors = new HashMap<Integer, DoubleLayerError<G, A, R>>();
for (final G gameObject : mapSquare) {
- final int layer = gameObject.getHead().getAttributeInt("layer", true);
+ final int layer = gameObject.getHead().getAttributeInt(DefaultIsoGameObject.LAYER, true);
if (layer == 0) {
// ignore layer 0
} else {
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/Entry.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/Entry.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/Entry.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -21,6 +21,7 @@
import java.util.regex.Pattern;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.match.GameObjectMatcher;
@@ -68,7 +69,7 @@
return false;
}
- final CharSequence slaying = gameObject.getAttributeString("slaying", true);
+ final CharSequence slaying = gameObject.getAttributeString(BaseObject.SLAYING, true);
if (!regex.matcher(slaying).matches()) {
errorCollector.collect(new EnvironmentSensorSlayingError<G, A, R>(gameObject));
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/ExitChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/ExitChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/ExitChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -21,6 +21,7 @@
import java.io.File;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapmodel.MapSquare;
@@ -70,7 +71,7 @@
return;
}
- final String path = gameObject.getAttributeString("slaying", false);
+ final String path = gameObject.getAttributeString(BaseObject.SLAYING, false);
if (path.length() <= 0 || path.equals("/!") || path.startsWith("/random/")) {
return;
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/SlayingChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/SlayingChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/SlayingChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.regex.Pattern;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.match.GameObjectMatcher;
@@ -86,7 +87,7 @@
}
if (useDefaultRegex) {
- final CharSequence slaying = gameObject.getAttributeString("slaying", true);
+ final CharSequence slaying = gameObject.getAttributeString(BaseObject.SLAYING, true);
if (!defaultRegex.matcher(slaying).matches()) {
errorCollector.collect(new SlayingError<G, A, R>(gameObject));
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/SysObjectNotOnLayerZeroChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/SysObjectNotOnLayerZeroChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/SysObjectNotOnLayerZeroChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -20,6 +20,7 @@
package net.sf.gridarta.model.validation.checks;
import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import net.sf.gridarta.model.validation.AbstractValidator;
@@ -49,7 +50,7 @@
@Override
public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
final GameObject<G, A, R> head = gameObject.getHead();
- if (head.getAttributeInt("sys_object", true) == 1 && head.getAttributeInt("layer", true) != 0) {
+ if (head.getAttributeInt(DefaultIsoGameObject.SYS_OBJECT, true) == 1 && head.getAttributeInt(DefaultIsoGameObject.LAYER, true) != 0) {
errorCollector.collect(new SysObjectNotOnLayerZeroError<G, A, R>(gameObject));
}
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/checks/UnsetSlayingChecker.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/UnsetSlayingChecker.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/UnsetSlayingChecker.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -23,6 +23,7 @@
import java.util.Collection;
import java.util.HashSet;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.validation.AbstractValidator;
@@ -75,9 +76,9 @@
@Override
public void validateGameObject(@NotNull final G gameObject, @NotNull final ErrorCollector<G, A, R> errorCollector) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
- final String slayingArchetype = gameObject.getArchetype().getAttributeString("slaying");
+ final String slayingArchetype = gameObject.getArchetype().getAttributeString(BaseObject.SLAYING);
if (!allowedValues.contains(slayingArchetype)) {
- final String slayingObject = gameObject.getAttributeString("slaying");
+ final String slayingObject = gameObject.getAttributeString(BaseObject.SLAYING);
if (slayingArchetype.equals(slayingObject)) {
errorCollector.collect(new UnsetSlayingError<G, A, R>(gameObject));
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/errors/SysObjectNotOnLayerZeroError.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/errors/SysObjectNotOnLayerZeroError.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/errors/SysObjectNotOnLayerZeroError.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -22,6 +22,7 @@
import java.awt.Component;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
+import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
import org.jetbrains.annotations.NotNull;
@@ -53,7 +54,7 @@
public void correct(@NotNull final Component parentComponent) {
// TODO: Ask user
for (final BaseObject<G, A, R, ?> gameObject : getGameObjects()) {
- gameObject.setAttributeInt("layer", 0);
+ gameObject.setAttributeInt(DefaultIsoGameObject.LAYER, 0);
}
}
Modified: trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -57,7 +57,7 @@
final FaceObjectProviders faceObjectProviders = newFaceObjectProviders();
final TestArchetype archetype = newArchetype("arch", null, faceObjectProviders, animationObjects);
Assert.assertNull(archetype.getFaceName());
- archetype.setAttributeString(BaseObject.FACE, "arch_face");
+ archetype.setAttributeString("face", "arch_face");
Assert.assertEquals("arch_face", archetype.getFaceName());
final GameObject<TestGameObject, TestMapArchObject, TestArchetype> gameObject = newGameObject(archetype, "test", faceObjectProviders, animationObjects);
@@ -71,7 +71,7 @@
// set face by text change
gameObject.setAttributeString("face1", "face1");
Assert.assertNull(gameObject.getFaceName());
- gameObject.setAttributeString(BaseObject.FACE, "face2");
+ gameObject.setAttributeString("face", "face2");
Assert.assertEquals("face2", gameObject.getFaceName());
gameObject.setAttributeString("face2", "face3");
Assert.assertEquals("face2", gameObject.getFaceName());
@@ -253,7 +253,7 @@
}
/**
- * Checks that caching the {@link BaseObject#TYPE} attribute does work.
+ * Checks that caching the "type" attribute does work.
*/
@Test
public void testType1() {
@@ -262,16 +262,16 @@
final TestArchetype archetype = newArchetype("arch", null, faceObjectProviders, animationObjects);
final GameObject<TestGameObject, TestMapArchObject, TestArchetype> gameObject = newGameObject(archetype, "test", faceObjectProviders, animationObjects);
checkType(gameObject, 0);
- gameObject.setAttributeString(BaseObject.TYPE, "3");
+ gameObject.setAttributeString("type", "3");
checkType(gameObject, 3);
- gameObject.removeAttribute(BaseObject.TYPE);
+ gameObject.removeAttribute("type");
checkType(gameObject, 0);
gameObject.setObjectText("type 3");
checkType(gameObject, 3);
}
/**
- * Checks that caching the {@link BaseObject#NAME} attribute does work.
+ * Checks that caching the "type" attribute does work.
*/
@Test
public void testType2() {
@@ -280,14 +280,14 @@
final TestArchetype archetype = newArchetype("arch", "type 2", faceObjectProviders, animationObjects);
final GameObject<TestGameObject, TestMapArchObject, TestArchetype> gameObject = newGameObject(archetype, "test", faceObjectProviders, animationObjects);
checkType(gameObject, 2);
- gameObject.setAttributeString(BaseObject.TYPE, "3");
+ gameObject.setAttributeString("type", "3");
checkType(gameObject, 3);
- gameObject.removeAttribute(BaseObject.TYPE);
+ gameObject.removeAttribute("type");
checkType(gameObject, 2);
}
/**
- * Checks that caching the {@link BaseObject#TYPE} attribute does work.
+ * Checks that caching the "type" attribute does work.
*/
@Test
public void testType3() {
@@ -299,11 +299,11 @@
checkType(gameObject, 1);
gameObject.setArchetype(archetype2);
checkType(gameObject, 2);
- gameObject.setAttributeString(BaseObject.TYPE, "4");
+ gameObject.setAttributeString("type", "4");
checkType(gameObject, 4);
gameObject.setArchetype(archetype1);
checkType(gameObject, 4);
- gameObject.removeAttribute(BaseObject.TYPE);
+ gameObject.removeAttribute("type");
checkType(gameObject, 1);
}
@@ -319,7 +319,7 @@
}
/**
- * Checks that caching the {@link BaseObject#NAME} attribute does work.
+ * Checks that caching the "name" attribute does work.
*/
@Test
public void testName1() {
@@ -328,16 +328,16 @@
final TestArchetype archetype = newArchetype("arch", null, faceObjectProviders, animationObjects);
final BaseObject<?, ?, ?, ?> gameObject = new TestGameObject(archetype, faceObjectProviders, animationObjects);
checkName(gameObject, "arch", "");
- gameObject.setAttributeString(BaseObject.NAME, "3");
+ gameObject.setAttributeString("name", "3");
checkName(gameObject, "3", "3");
- gameObject.removeAttribute(BaseObject.NAME);
+ gameObject.removeAttribute("name");
checkName(gameObject, "arch", "");
gameObject.setObjectText("name 3");
checkName(gameObject, "3", "3");
}
/**
- * Checks that caching the {@link BaseObject#NAME} attribute does work.
+ * Checks that caching the "name" attribute does work.
*/
@Test
public void testName2() {
@@ -346,14 +346,14 @@
final TestArchetype archetype = newArchetype("arch", "name 2", faceObjectProviders, animationObjects);
final BaseObject<?, ?, ?, ?> gameObject = new TestGameObject(archetype, faceObjectProviders, animationObjects);
checkName(gameObject, "2", "2");
- gameObject.setAttributeString(BaseObject.NAME, "3");
+ gameObject.setAttributeString("name", "3");
checkName(gameObject, "3", "3");
- gameObject.removeAttribute(BaseObject.NAME);
+ gameObject.removeAttribute("name");
checkName(gameObject, "2", "2");
}
/**
- * Checks that caching the {@link BaseObject#NAME} attribute does work.
+ * Checks that caching the "name" attribute does work.
*/
@Test
public void testName3() {
@@ -365,11 +365,11 @@
checkName(gameObject, "1", "1");
gameObject.setArchetype(archetype2);
checkName(gameObject, "2", "2");
- gameObject.setAttributeString(BaseObject.NAME, "4");
+ gameObject.setAttributeString("name", "4");
checkName(gameObject, "4", "4");
gameObject.setArchetype(archetype1);
checkName(gameObject, "4", "4");
- gameObject.removeAttribute(BaseObject.NAME);
+ gameObject.removeAttribute("name");
checkName(gameObject, "1", "1");
}
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/LockedItemsView.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -78,7 +78,7 @@
*/
private void scanGameObject(@NotNull final GameObject<G, A, R> gameObject) {
if (typeNumbers.contains(gameObject.getTypeNo())) {
- final String slayingSpec = gameObject.getAttributeString("slaying");
+ final String slayingSpec = gameObject.getAttributeString(BaseObject.SLAYING);
if (slayingSpec.length() > 0) {
addConnection(slayingSpec, gameObject);
}
Modified: trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/connectionview/MonsterView.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -24,6 +24,7 @@
import net.sf.gridarta.gui.delayedmapmodel.DelayedMapModelListenerManager;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
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.maparchobject.MapArchObject;
import net.sf.gridarta.model.match.GameObjectMatcher;
@@ -97,8 +98,8 @@
*/
@Override
public int compare(@NotNull final GameObject<G, A, R> o1, @NotNull final GameObject<G, A, R> o2) {
- final int level1 = o1.getAttributeInt("level");
- final int level2 = o2.getAttributeInt("level");
+ final int level1 = o1.getAttributeInt(BaseObject.LEVEL);
+ final int level2 = o2.getAttributeInt(BaseObject.LEVEL);
if (level1 < level2) {
return +1;
}
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/FaceTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/FaceTab.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/FaceTab.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -259,9 +259,9 @@
if (gameObject == null) {
animated = false;
} else {
- animated = gameObject.getAttributeInt("is_animated") != 0;
+ animated = gameObject.getAttributeInt(BaseObject.IS_ANIMATED) != 0;
//noinspection UnnecessaryParentheses
- if (severity == Severity.DEFAULT && animated != (gameObject.getArchetype().getAttributeInt("is_animated") != 0)) {
+ if (severity == Severity.DEFAULT && animated != (gameObject.getArchetype().getAttributeInt(BaseObject.IS_ANIMATED) != 0)) {
severity = Severity.MODIFIED;
}
}
@@ -270,8 +270,8 @@
if (gameObject == null) {
animSpeed = "";
} else {
- animSpeed = gameObject.getAttributeString("anim_speed");
- if (severity == Severity.DEFAULT && !gameObject.getArchetype().getAttributeString("anim_speed").equals(animSpeed)) {
+ animSpeed = gameObject.getAttributeString(BaseObject.ANIM_SPEED);
+ if (severity == Severity.DEFAULT && !gameObject.getArchetype().getAttributeString(BaseObject.ANIM_SPEED).equals(animSpeed)) {
severity = Severity.MODIFIED;
}
}
@@ -345,18 +345,18 @@
gameObject.setAttributeString(BaseObject.ANIMATION, animName2);
final boolean isAnimated = animatedCheckBox.isSelected();
- if (isAnimated == (gameObject.getArchetype().getAttributeInt("is_animated") != 0)) {
- gameObject.removeAttribute("is_animated");
+ if (isAnimated == (gameObject.getArchetype().getAttributeInt(BaseObject.IS_ANIMATED) != 0)) {
+ gameObject.removeAttribute(BaseObject.IS_ANIMATED);
} else {
- gameObject.setAttributeInt("is_animated", isAnimated ? 1 : 0);
+ gameObject.setAttributeInt(BaseObject.IS_ANIMATED, isAnimated ? 1 : 0);
}
final String animSpeed = animSpeedTextField.getText().trim();
- final String animSpeedAttribute = gameObject.getArchetype().getAttributeString("anim_speed");
+ final String animSpeedAttribute = gameObject.getArchetype().getAttributeString(BaseObject.ANIM_SPEED);
if (animSpeed.length() == 0 || (animSpeed.equals("0") ? "" : animSpeed).equals(animSpeedAttribute)) {
- gameObject.removeAttribute("anim_speed");
+ gameObject.removeAttribute(BaseObject.ANIM_SPEED);
} else {
- gameObject.setAttributeString("anim_speed", animSpeed);
+ gameObject.setAttributeString(BaseObject.ANIM_SPEED, animSpeed);
}
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -70,7 +70,7 @@
* @throws NoExitPathException if the game object is not a valid exit
*/
public MapLocation(@NotNull final BaseObject<?, ?, ?, ?> gameObject, final boolean allowRandomMapParameters) throws NoExitPathException {
- this(getMapPath(gameObject, allowRandomMapParameters), gameObject.getAttributeInt("hp"), gameObject.getAttributeInt("sp"));
+ this(getMapPath(gameObject, allowRandomMapParameters), gameObject.getAttributeInt(BaseObject.HP), gameObject.getAttributeInt(BaseObject.SP));
}
/**
@@ -122,7 +122,7 @@
* @throws NoExitPathException if the game object is not a valid exit
*/
public static String getMapPath(@NotNull final BaseObject<?, ?, ?, ?> gameObject, final boolean allowRandomMapParameters) throws NoExitPathException {
- String path = gameObject.getAttributeString("slaying");
+ String path = gameObject.getAttributeString(BaseObject.SLAYING);
if (allowRandomMapParameters && (path.equals("/!") || path.startsWith("/random/"))) {
// destination is a random map; extract the final non-random map
path = getRandomMapParameter(gameObject, "final_map");
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -34,6 +34,7 @@
import javax.swing.Icon;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
+import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.IsoMapSquareInfo;
import net.sf.gridarta.model.gameobject.MultiPositionData;
@@ -535,10 +536,10 @@
private void paintGameObject(@NotNull final Graphics2D g, final int xStart, final int yStart, @NotNull final G gameObject, final boolean inSpawnPoint) {
final G head = gameObject.getHead();
final Icon icon = "trans.101".equals(head.getFaceObjName()) ? unknownSquareIcon : head.getImage(mapViewSettings);
- final int xOffset = head.getAttributeInt("align");
- final int zoom = head.getAttributeInt("zoom");
+ final int xOffset = head.getAttributeInt(DefaultIsoGameObject.ALIGN);
+ final int zoom = head.getAttributeInt(DefaultIsoGameObject.ZOOM);
final double rotate = getRotate(head);
- final int alpha = head.getAttributeInt("alpha");
+ final int alpha = head.getAttributeInt(DefaultIsoGameObject.ALPHA);
final int tmpIconWidth;
final int tmpIconHeight;
if (zoom == 0 || zoom == 100) {
@@ -592,7 +593,7 @@
* @return the rotation angle in radians
*/
private static double getRotate(@NotNull final BaseObject<?, ?, ?, ?> head) {
- final int rotate = -head.getAttributeInt("rotate") % 360;
+ final int rotate = -head.getAttributeInt(DefaultIsoGameObject.ROTATE) % 360;
return (rotate < 0 ? rotate + 360 : rotate) * 2 * Math.PI / 360;
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -29,6 +29,7 @@
import net.sf.gridarta.model.filter.FilterConfig;
import net.sf.gridarta.model.filter.FilterConfigChangeType;
import net.sf.gridarta.model.filter.FilterConfigListener;
+import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.IsoMapSquareInfo;
import net.sf.gridarta.model.gameobject.MultiPositionData;
@@ -171,11 +172,11 @@
if (filterControl.canShow(node)) {
final G head = node.getHead();
final int yOffset;
- if (!foundFloor && head.getAttributeInt("layer") == 1) {
+ if (!foundFloor && head.getAttributeInt(DefaultIsoGameObject.LAYER) == 1) {
foundFloor = true;
yOffset = 0;
} else {
- yOffset = head.getAttributeInt("z");
+ yOffset = head.getAttributeInt(DefaultIsoGameObject.Z);
}
paintGameObjectIfVisible(g, x, y - yOffset, node);
}
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -23,6 +23,7 @@
import java.awt.Graphics2D;
import javax.swing.Icon;
import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.DefaultIsoGameObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.IsoMapSquareInfo;
import net.sf.gridarta.model.gameobject.MultiPositionData;
@@ -83,11 +84,11 @@
for (final G node : square) {
final G head = node.getHead();
final int yOffset;
- if (!foundFloor && head.getAttributeInt("layer") == 1) {
+ if (!foundFloor && head.getAttributeInt(DefaultIsoGameObject.LAYER) == 1) {
foundFloor = true;
yOffset = 0;
} else {
- yOffset = head.getAttributeInt("z");
+ yOffset = head.getAttributeInt(DefaultIsoGameObject.Z);
}
paintGameObjectIfVisible(g, x, y - yOffset, node);
}
Modified: trunk/src/test/net/sf/gridarta/actions/ExitConnectorActionsTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/actions/ExitConnectorActionsTest.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/test/net/sf/gridarta/actions/ExitConnectorActionsTest.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -415,9 +415,9 @@
throw new AssertionError();
}
- Assert.assertEquals(exitPath, gameObject.getAttributeString("slaying"));
- Assert.assertEquals(exitPoint.x, gameObject.getAttributeInt("hp"));
- Assert.assertEquals(exitPoint.y, gameObject.getAttributeInt("sp"));
+ Assert.assertEquals(exitPath, gameObject.getAttributeString(BaseObject.SLAYING));
+ Assert.assertEquals(exitPoint.x, gameObject.getAttributeInt(BaseObject.HP));
+ Assert.assertEquals(exitPoint.y, gameObject.getAttributeInt(BaseObject.SP));
return;
}
Modified: trunk/src/test/net/sf/gridarta/actions/UndoActionsTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/actions/UndoActionsTest.java 2011-07-16 10:44:55 UTC (rev 8942)
+++ trunk/src/test/net/sf/gridarta/actions/UndoActionsTest.java 2011-07-16 11:42:53 UTC (rev 8943)
@@ -65,7 +65,7 @@
final AutojoinListsHelper autojoinListsHelper = mapControlCreator.newAutojoinListsHelper();
for (int i = 0; i < 16; i++) {
final TestArchetype a = mapModelCreator.getArchetype("a" + i);
- a.setAttributeString("face", "face" + i);
+ a.setAttributeString(BaseObject.FACE, "face" + i);
}
autojoinListsHelper.newAutojoinLists("a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "a10", "a11", "a12", "a13", "a14", "a15");
@@ -118,7 +118,7 @@
final MapSquare<?, ?, ?> mapSquare = mapModel.getMapSquare(new Point(x, y));
final BaseObject<?, ?, ?, ?> object = mapSquare.getFirst();
Assert.assertNotNull(object);
- Assert.assertEquals(face, object.getAttributeString("face"));
+ Assert.assertEquals(face, object.getAttributeString(BaseObject.FACE));
}
} // class UndoActionsTest
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-07-16 11:48:38
|
Revision: 8945
http://gridarta.svn.sourceforge.net/gridarta/?rev=8945&view=rev
Author: akirschbaum
Date: 2011-07-16 11:48:32 +0000 (Sat, 16 Jul 2011)
Log Message:
-----------
Support 'z' attribute for objects within spawn points. [Atrinik]
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-07-16 11:44:46 UTC (rev 8944)
+++ trunk/atrinik/ChangeLog 2011-07-16 11:48:32 UTC (rev 8945)
@@ -1,5 +1,7 @@
2011-07-16 Andreas Kirschbaum
+ * Support 'z' attribute for objects within spawn points.
+
* Support 'rotate' attribute in map renderer.
2011-07-08 Andreas Kirschbaum
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-16 11:44:46 UTC (rev 8944)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java 2011-07-16 11:48:32 UTC (rev 8945)
@@ -582,7 +582,8 @@
if (!inSpawnPoint && isSpawnPoint(head)) {
final G mob = head.getFirst();
if (mob != null) {
- paintGameObject(g, xStart, yStart, mob, true);
+ final int yOffset = mob.getAttributeInt(DefaultIsoGameObject.Z);
+ paintGameObject(g, xStart, yStart - yOffset, mob, true);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-06 12:19:43
|
Revision: 8948
http://gridarta.svn.sourceforge.net/gridarta/?rev=8948&view=rev
Author: akirschbaum
Date: 2011-08-06 12:19:36 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Move ArchetypeTypeChecks to different package.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
Added Paths:
-----------
trunk/model/src/app/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/archetypetype/
Copied: trunk/model/src/app/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java (from rev 8947, trunk/src/app/net/sf/gridarta/gui/archetypetype/ArchetypeTypeChecks.java)
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java (rev 0)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java 2011-08-06 12:19:36 UTC (rev 8948)
@@ -0,0 +1,251 @@
+/*
+ * 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.validation.checks;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttribute;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeAnimationName;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeBitmask;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeBool;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeBoolSpec;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeFaceName;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeFixed;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeFloat;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeInt;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeInvSpell;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeList;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeLong;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeMapPath;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeScriptFile;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeSpell;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeString;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeText;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeTreasure;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeVisitor;
+import net.sf.gridarta.model.archetypetype.ArchetypeAttributeZSpell;
+import net.sf.gridarta.model.archetypetype.ArchetypeType;
+import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
+import net.sf.gridarta.model.archetypetype.AttributeBitmask;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import org.apache.log4j.Category;
+import org.apache.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Creates checks from {@link ArchetypeType ArchetypeTypes}.
+ * @author Andreas Kirschbaum
+ */
+public class ArchetypeTypeChecks {
+
+ /**
+ * The logger for printing log messages.
+ */
+ private static final Category log = Logger.getLogger(ArchetypeTypeChecks.class);
+
+ /**
+ * Private constructor to prevent instantiation.
+ */
+ private ArchetypeTypeChecks() {
+ }
+
+ /**
+ * Adds attribute range checks for all defined attributes.
+ * @param attributeRangeChecker the attribute range checker to add to
+ * @param environmentChecker the environment checker to add to
+ * @param archetypeTypeSet the archetype type set to use
+ */
+ public static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void addChecks(@NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final EnvironmentChecker<G, A, R> environmentChecker) {
+ final Set<Integer> allowsAllInvTypes = new HashSet<Integer>();
+ for (final ArchetypeType archetypeType : archetypeTypeSet) {
+ if (archetypeType.isAllowsAllInv()) {
+ allowsAllInvTypes.add(archetypeType.getTypeNo());
+ }
+ }
+ for (final ArchetypeType archetypeType : archetypeTypeSet) {
+ addChecks(archetypeTypeSet, attributeRangeChecker, archetypeType);
+ if (!archetypeType.isMap()) {
+ environmentChecker.addNoMap(archetypeType);
+ }
+ final int[] types = archetypeType.getInv();
+ if (types != null) {
+ final Set<Integer> tmp = new HashSet<Integer>(allowsAllInvTypes);
+ for (final int type : types) {
+ tmp.add(type);
+ }
+ final int[] tmp2 = new int[tmp.size()];
+ final Iterator<Integer> it = tmp.iterator();
+ for (int i = 0; i < tmp2.length; i++) {
+ tmp2[i] = it.next();
+ }
+ assert !it.hasNext();
+ environmentChecker.addInv(archetypeType, tmp2);
+ }
+ }
+ }
+
+ /**
+ * Adds attribute range checks for all defined attributes of an {@link
+ * ArchetypeType}.
+ * @param attributeRangeChecker the attribute range checker to add to
+ * @param archetypeTypeSet the archetype type set to use
+ * @param archetypeType the archetype type
+ */
+ private static <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void addChecks(@NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final AttributeRangeChecker<G, A, R> attributeRangeChecker, @NotNull final ArchetypeType archetypeType) {
+ if (archetypeType.hasTypeAttributes()) {
+ return; // XXX: make such attributes work
+ }
+
+ final ArchetypeAttributeVisitor archetypeAttributeVisitor = new ArchetypeAttributeVisitor() {
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeAnimationName archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeBitmask archetypeAttribute) {
+ final AttributeBitmask bitmask = archetypeTypeSet.getBitmask(archetypeAttribute.getBitmaskName());
+ if (bitmask != null) {
+ try {
+ attributeRangeChecker.add(archetypeType.getTypeNo(), archetypeAttribute.getArchetypeAttributeName(), archetypeAttribute.getAttributeName(), 0, bitmask.getMaxValue());
+ } catch (final InvalidCheckException ex) {
+ log.warn(ex.getMessage() + " in type " + archetypeType.getTypeNo() + ".");
+ }
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeBool archetypeAttribute) {
+ try {
+ attributeRangeChecker.add(archetypeType.getTypeNo(), archetypeAttribute.getArchetypeAttributeName(), archetypeAttribute.getAttributeName(), 0, 1);
+ } catch (final InvalidCheckException ex) {
+ log.warn(ex.getMessage() + " in type " + archetypeType.getTypeNo() + ".");
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeBoolSpec archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeFaceName archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeFixed archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeFloat archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeInt archetypeAttribute) {
+ try {
+ attributeRangeChecker.add(archetypeType.getTypeNo(), archetypeAttribute.getArchetypeAttributeName(), archetypeAttribute.getAttributeName(), archetypeAttribute.getMinCheckValue(), archetypeAttribute.getMaxCheckValue());
+ } catch (final InvalidCheckException ex) {
+ log.warn(ex.getMessage() + " in type " + archetypeType.getTypeNo() + ".");
+ }
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeInvSpell archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeList archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeLong archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeMapPath archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeScriptFile archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeSpell archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeString archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeText archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeTreasure archetypeAttribute) {
+ // XXX: missing
+ }
+
+ /** {@inheritDoc} */
+ @Override
+ public void visit(@NotNull final ArchetypeAttributeZSpell archetypeAttribute) {
+ // XXX: missing
+ }
+
+ };
+
+ for (final ArchetypeAttribute archetypeAttribute : archetypeType) {
+ archetypeAttribute.visit(archetypeAttributeVisitor);
+ }
+ }
+
+} // class ArchetypeTypeChecks
Property changes on: trunk/model/src/app/net/sf/gridarta/model/validation/checks/ArchetypeTypeChecks.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java 2011-08-04 17:49:39 UTC (rev 8947)
+++ trunk/src/app/net/sf/gridarta/maincontrol/DefaultMainControl.java 2011-08-06 12:19:36 UTC (rev 8948)
@@ -31,7 +31,6 @@
import javax.swing.filechooser.FileFilter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.ParserConfigurationException;
-import net.sf.gridarta.gui.archetypetype.ArchetypeTypeChecks;
import net.sf.gridarta.gui.filter.FilterControl;
import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.scripts.DefaultScriptArchEditor;
@@ -93,6 +92,7 @@
import net.sf.gridarta.model.validation.DelegatingMapValidator;
import net.sf.gridarta.model.validation.NoSuchValidatorException;
import net.sf.gridarta.model.validation.ValidatorPreferences;
+import net.sf.gridarta.model.validation.checks.ArchetypeTypeChecks;
import net.sf.gridarta.model.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.model.validation.checks.EnvironmentChecker;
import net.sf.gridarta.model.validation.checks.PaidItemShopSquareChecker;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-06 12:50:58
|
Revision: 8949
http://gridarta.svn.sourceforge.net/gridarta/?rev=8949&view=rev
Author: akirschbaum
Date: 2011-08-06 12:50:44 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Distribute gui classes into sub-packages.
Modified Paths:
--------------
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/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/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/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkActions.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkDirectoryDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/EditBookmarkDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/ManageBookmarksDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/MapMenuEntryIcons.java
trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ConsoleErrorView.java
trunk/src/app/net/sf/gridarta/gui/dialog/errorview/DefaultErrorView.java
trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ErrorEntry.java
trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ConfirmErrorsDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttribute.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeAnimationName.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBitmask.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBool.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBoolSpec.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFaceName.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFloat.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInt.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInvSpell.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeList.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeLong.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeMapPath.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeScriptFile.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeSpell.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeString.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeText.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeTreasure.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeZSpell.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GuiInfo.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/HelpActionListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ScrollToVisibleFocusListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/StringKeyManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/TypesBoxItemListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ViewTreasurelistAL.java
trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/GoMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/GoMapDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/MapListCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/dialog/help/Help.java
trunk/src/app/net/sf/gridarta/gui/dialog/help/HtmlPane.java
trunk/src/app/net/sf/gridarta/gui/dialog/mappropertiesdialog/MapPropertiesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/AbstractNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/NewMapDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/NewPickmapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/NewPickmapFolderDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/AppPreferencesModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/DevPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/GUIPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/MapValidatorPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/MiscPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/NetPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/PreferencesHelper.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/ResPreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/UpdatePreferences.java
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ArchetypeNameMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/MatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ObjectNameMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/KeyStrokeDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/KeyStrokeField.java
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/KeyStrokeFieldListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/ShortcutsManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/ShrinkMapSizeUtils.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTab.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTextEditorTab.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/WarningsTab.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.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/ToolPalette.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/mapfiles/MapFolderTreeActions.java
trunk/src/app/net/sf/gridarta/gui/misc/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/gui/misc/HelpActions.java
trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypeChooserControl.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypeChooserView.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypeChooserViewListener.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypeIconCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypeNameCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/ArchetypePanel.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/DirectionPane.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayMode.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/DisplayNameCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/FolderListCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Connection.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionControl.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionView.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/LockedItemsControl.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/LockedItemsView.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterControl.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterView.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/AbstractGameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ArchTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListViewListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/EventsTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/FaceTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesControl.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesControlListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesModel.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesModelListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesTabListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/MsgTextTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/TextEditorTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/GameObjectTextEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/ScrollingTextPane.java
trunk/src/app/net/sf/gridarta/gui/panel/objectchoicedisplay/ObjectChoiceDisplay.java
trunk/src/app/net/sf/gridarta/gui/panel/objectchooser/DefaultObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/panel/objectchooser/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/panel/objectchooser/ObjectChooserListener.java
trunk/src/app/net/sf/gridarta/gui/panel/objectchooser/ObjectChooserTab.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserModel.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserModelListener.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/CloseableTabbedPane.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ClosingIcon.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ClosingListener.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptController.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptManager.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptViewPane.java
trunk/src/app/net/sf/gridarta/gui/panel/script/StackLayout.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBox.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/BooleanParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/DoubleParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/FilterParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/IntegerParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterDescriptionEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterNameEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterTypeEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/PluginParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/PluginParameterViewFactory.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/StringParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/TooltipSpinner.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelection.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionCache.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionListener.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/ModelUpdater.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActions.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareModel.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareModelListener.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/mainactions/DefaultExiter.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/app/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/app/net/sf/gridarta/updater/Updater.java
trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareActionsTest.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/dialog/
trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/
trunk/src/app/net/sf/gridarta/gui/dialog/errorview/
trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/help/
trunk/src/app/net/sf/gridarta/gui/dialog/mappropertiesdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/newmap/
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/
trunk/src/app/net/sf/gridarta/gui/dialog/shortcuts/
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/
trunk/src/app/net/sf/gridarta/gui/panel/
trunk/src/app/net/sf/gridarta/gui/panel/archetypechooser/
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/
trunk/src/app/net/sf/gridarta/gui/panel/gameobjecttexteditor/
trunk/src/app/net/sf/gridarta/gui/panel/objectchoicedisplay/
trunk/src/app/net/sf/gridarta/gui/panel/objectchooser/
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/
trunk/src/app/net/sf/gridarta/gui/panel/script/
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/
trunk/src/test/net/sf/gridarta/gui/panel/
trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/archetypechooser/
trunk/src/app/net/sf/gridarta/gui/bookmarks/
trunk/src/app/net/sf/gridarta/gui/connectionview/
trunk/src/app/net/sf/gridarta/gui/errorview/
trunk/src/app/net/sf/gridarta/gui/findarchetypes/
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/
trunk/src/app/net/sf/gridarta/gui/gameobjecttexteditor/
trunk/src/app/net/sf/gridarta/gui/golocationdialog/
trunk/src/app/net/sf/gridarta/gui/gomapdialog/
trunk/src/app/net/sf/gridarta/gui/help/
trunk/src/app/net/sf/gridarta/gui/mappropertiesdialog/
trunk/src/app/net/sf/gridarta/gui/newmap/
trunk/src/app/net/sf/gridarta/gui/objectchoicedisplay/
trunk/src/app/net/sf/gridarta/gui/objectchooser/
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/
trunk/src/app/net/sf/gridarta/gui/prefs/
trunk/src/app/net/sf/gridarta/gui/replacedialog/
trunk/src/app/net/sf/gridarta/gui/script/
trunk/src/app/net/sf/gridarta/gui/selectedsquare/
trunk/src/app/net/sf/gridarta/gui/shortcuts/
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/
trunk/src/test/net/sf/gridarta/gui/selectedsquare/
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -22,7 +22,7 @@
import java.awt.Component;
import javax.swing.JFrame;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/MapPropertiesDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -46,7 +46,7 @@
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.help.Help;
+import net.sf.gridarta.gui.dialog.help.Help;
import net.sf.gridarta.gui.map.maptilepane.AbstractMapTilePane;
import net.sf.gridarta.gui.map.maptilepane.IsoMapTilePane;
import net.sf.gridarta.gui.utils.GUIConstants;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -28,17 +28,17 @@
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.gui.map.renderer.RendererFactory;
-import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
-import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.prefs.AppPreferences;
-import net.sf.gridarta.gui.prefs.AppPreferencesModel;
-import net.sf.gridarta.gui.prefs.DevPreferences;
-import net.sf.gridarta.gui.prefs.GUIPreferences;
-import net.sf.gridarta.gui.prefs.MapValidatorPreferences;
-import net.sf.gridarta.gui.prefs.MiscPreferences;
-import net.sf.gridarta.gui.prefs.NetPreferences;
-import net.sf.gridarta.gui.prefs.ResPreferences;
-import net.sf.gridarta.gui.prefs.UpdatePreferences;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
+import net.sf.gridarta.gui.dialog.prefs.DevPreferences;
+import net.sf.gridarta.gui.dialog.prefs.GUIPreferences;
+import net.sf.gridarta.gui.dialog.prefs.MapValidatorPreferences;
+import net.sf.gridarta.gui.dialog.prefs.MiscPreferences;
+import net.sf.gridarta.gui.dialog.prefs.NetPreferences;
+import net.sf.gridarta.gui.dialog.prefs.ResPreferences;
+import net.sf.gridarta.gui.dialog.prefs.UpdatePreferences;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -22,7 +22,7 @@
import java.awt.Component;
import javax.swing.JFrame;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/MapPropertiesDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -39,7 +39,7 @@
import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileFilter;
import javax.swing.text.JTextComponent;
-import net.sf.gridarta.gui.help.Help;
+import net.sf.gridarta.gui.dialog.help.Help;
import net.sf.gridarta.gui.map.maptilepane.AbstractMapTilePane;
import net.sf.gridarta.gui.map.maptilepane.FlatMapTilePane;
import net.sf.gridarta.gui.utils.TextComponentUtils;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -26,17 +26,17 @@
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.gui.map.renderer.RendererFactory;
-import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
-import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.prefs.AppPreferences;
-import net.sf.gridarta.gui.prefs.AppPreferencesModel;
-import net.sf.gridarta.gui.prefs.DevPreferences;
-import net.sf.gridarta.gui.prefs.GUIPreferences;
-import net.sf.gridarta.gui.prefs.MapValidatorPreferences;
-import net.sf.gridarta.gui.prefs.MiscPreferences;
-import net.sf.gridarta.gui.prefs.NetPreferences;
-import net.sf.gridarta.gui.prefs.ResPreferences;
-import net.sf.gridarta.gui.prefs.UpdatePreferences;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
+import net.sf.gridarta.gui.dialog.prefs.DevPreferences;
+import net.sf.gridarta.gui.dialog.prefs.GUIPreferences;
+import net.sf.gridarta.gui.dialog.prefs.MapValidatorPreferences;
+import net.sf.gridarta.gui.dialog.prefs.MiscPreferences;
+import net.sf.gridarta.gui.dialog.prefs.NetPreferences;
+import net.sf.gridarta.gui.dialog.prefs.ResPreferences;
+import net.sf.gridarta.gui.dialog.prefs.UpdatePreferences;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -22,7 +22,7 @@
import java.awt.Component;
import javax.swing.JFrame;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/MapPropertiesDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -47,7 +47,7 @@
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.help.Help;
+import net.sf.gridarta.gui.dialog.help.Help;
import net.sf.gridarta.gui.map.maptilepane.AbstractMapTilePane;
import net.sf.gridarta.gui.map.maptilepane.IsoMapTilePane;
import net.sf.gridarta.gui.utils.GUIConstants;
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 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -28,17 +28,17 @@
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
import net.sf.gridarta.gui.map.renderer.RendererFactory;
-import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
-import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.prefs.AppPreferences;
-import net.sf.gridarta.gui.prefs.AppPreferencesModel;
-import net.sf.gridarta.gui.prefs.DevPreferences;
-import net.sf.gridarta.gui.prefs.GUIPreferences;
-import net.sf.gridarta.gui.prefs.MapValidatorPreferences;
-import net.sf.gridarta.gui.prefs.MiscPreferences;
-import net.sf.gridarta.gui.prefs.NetPreferences;
-import net.sf.gridarta.gui.prefs.ResPreferences;
-import net.sf.gridarta.gui.prefs.UpdatePreferences;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
+import net.sf.gridarta.gui.dialog.prefs.DevPreferences;
+import net.sf.gridarta.gui.dialog.prefs.GUIPreferences;
+import net.sf.gridarta.gui.dialog.prefs.MapValidatorPreferences;
+import net.sf.gridarta.gui.dialog.prefs.MiscPreferences;
+import net.sf.gridarta.gui.dialog.prefs.NetPreferences;
+import net.sf.gridarta.gui.dialog.prefs.ResPreferences;
+import net.sf.gridarta.gui.dialog.prefs.UpdatePreferences;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkActions.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkActions.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.bookmarks;
+package net.sf.gridarta.gui.dialog.bookmarks;
import java.awt.Component;
import java.io.File;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkDirectoryDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/bookmarks/BookmarkDirectoryDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/BookmarkDirectoryDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.bookmarks;
+package net.sf.gridarta.gui.dialog.bookmarks;
import java.awt.Component;
import javax.swing.Box;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/EditBookmarkDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/bookmarks/EditBookmarkDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/EditBookmarkDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.bookmarks;
+package net.sf.gridarta.gui.dialog.bookmarks;
import java.awt.Component;
import javax.swing.Box;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/ManageBookmarksDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/bookmarks/ManageBookmarksDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/ManageBookmarksDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.bookmarks;
+package net.sf.gridarta.gui.dialog.bookmarks;
import java.awt.Component;
import java.awt.Dimension;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/MapMenuEntryIcons.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/bookmarks/MapMenuEntryIcons.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/bookmarks/MapMenuEntryIcons.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.bookmarks;
+package net.sf.gridarta.gui.dialog.bookmarks;
import javax.swing.Icon;
import javax.swing.ImageIcon;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ConsoleErrorView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/ConsoleErrorView.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ConsoleErrorView.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.errorview;
+package net.sf.gridarta.gui.dialog.errorview;
import net.sf.gridarta.model.errorview.ErrorView;
import net.sf.gridarta.model.errorview.ErrorViewCategory;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/errorview/DefaultErrorView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/errorview/DefaultErrorView.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.errorview;
+package net.sf.gridarta.gui.dialog.errorview;
import java.awt.Component;
import java.awt.Dialog;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ErrorEntry.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/errorview/ErrorEntry.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/errorview/ErrorEntry.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.errorview;
+package net.sf.gridarta.gui.dialog.errorview;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeModel;
@@ -25,7 +25,7 @@
import org.jetbrains.annotations.NotNull;
/**
- * An entry in a {@link net.sf.gridarta.gui.errorview.DefaultErrorView}.
+ * An entry in a {@link net.sf.gridarta.gui.dialog.errorview.DefaultErrorView}.
* @author Andreas Kirschbaum
*/
public class ErrorEntry extends DefaultMutableTreeNode {
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.findarchetypes;
+package net.sf.gridarta.gui.dialog.findarchetypes;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -42,8 +42,8 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.text.JTextComponent;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
-import net.sf.gridarta.gui.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.utils.SwingUtils;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialogManager.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/FindArchetypesDialogManager.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,11 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.findarchetypes;
+package net.sf.gridarta.gui.dialog.findarchetypes;
import java.awt.Component;
-import net.sf.gridarta.gui.archetypechooser.ArchetypeChooserControl;
-import net.sf.gridarta.gui.objectchooser.ObjectChooser;
+import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.utils.AbstractDialogManager;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.archetypetype.ArchetypeTypeSet;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/findarchetypes/TableModel.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/findarchetypes/TableModel.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.findarchetypes;
+package net.sf.gridarta.gui.dialog.findarchetypes;
import java.util.ArrayList;
import java.util.Arrays;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ConfirmErrorsDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ConfirmErrorsDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import java.awt.Container;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttribute.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttribute.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttribute.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.AttributeSet;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeAnimationName.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeAnimationName.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeAnimationName.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBitmask.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBitmask.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBitmask.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBool.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBool.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.AbstractButton;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBoolSpec.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeBoolSpec.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBoolSpec.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.AbstractButton;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFaceName.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeFaceName.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFaceName.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFloat.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeFloat.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFloat.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JFormattedTextField;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInt.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeInt.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInt.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JFormattedTextField;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInvSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeInvSpell.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInvSpell.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeList.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeList.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeLong.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeLong.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeLong.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JFormattedTextField;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeMapPath.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeMapPath.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeMapPath.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeScriptFile.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeScriptFile.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeScriptFile.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeSpell.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeSpell.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeString.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeString.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeString.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeText.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeText.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeText.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeTreasure.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeTreasure.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeTreasure.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JOptionPane;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeZSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/DialogAttributeZSpell.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeZSpell.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.CardLayout;
import java.awt.Color;
@@ -66,7 +66,7 @@
import javax.swing.text.Style;
import javax.swing.text.StyleConstants;
import javax.swing.text.StyleContext;
-import net.sf.gridarta.gui.help.Help;
+import net.sf.gridarta.gui.dialog.help.Help;
import net.sf.gridarta.gui.map.maptilepane.TilePanel;
import net.sf.gridarta.gui.treasurelist.CFTreasureListTree;
import net.sf.gridarta.gui.utils.AnimationComponent;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Window;
import java.util.HashMap;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GuiInfo.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GuiInfo.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GuiInfo.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import net.sf.gridarta.model.archetype.Archetype;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/HelpActionListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/HelpActionListener.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/HelpActionListener.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import java.awt.event.ActionEvent;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Container;
import java.awt.GridLayout;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ScrollToVisibleFocusListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ScrollToVisibleFocusListener.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ScrollToVisibleFocusListener.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import java.awt.Rectangle;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/StringKeyManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/StringKeyManager.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/StringKeyManager.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import javax.swing.ComboBoxModel;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/TypesBoxItemListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/TypesBoxItemListener.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/TypesBoxItemListener.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ViewTreasurelistAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ViewTreasurelistAL.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ViewTreasurelistAL.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
import java.awt.Component;
import java.awt.event.ActionEvent;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialog.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialog.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.golocationdialog;
+package net.sf.gridarta.gui.dialog.golocationdialog;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/golocationdialog/GoLocationDialogManager.java 2011-08-06 12:19:36 UTC (rev 8948)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialogManager.java 2011-08-06 12:50:44 UTC (rev 8949)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.golocationdialog;
+package net.sf.gridarta.gui.dialog.golocationdialog;
import net.sf.gridarta.gui.map.AbstractPerMapDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
Modified: trunk/src/app/net/sf/gridarta/g...
[truncated message content] |
|
From: <aki...@us...> - 2011-08-06 13:01:27
|
Revision: 8950
http://gridarta.svn.sourceforge.net/gridarta/?rev=8950&view=rev
Author: akirschbaum
Date: 2011-08-06 13:01:20 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Order import statements.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/misc/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.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/app/net/sf/gridarta/maincontrol/GridartaEditor.java
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 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -22,12 +22,6 @@
import java.awt.Component;
import java.io.IOException;
import java.net.URL;
-import net.sf.gridarta.gui.filter.FilterControl;
-import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory;
-import net.sf.gridarta.gui.map.mapview.MapViewFactory;
-import net.sf.gridarta.gui.map.mapview.MapViewsManager;
-import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
-import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
@@ -39,6 +33,12 @@
import net.sf.gridarta.gui.dialog.prefs.NetPreferences;
import net.sf.gridarta.gui.dialog.prefs.ResPreferences;
import net.sf.gridarta.gui.dialog.prefs.UpdatePreferences;
+import net.sf.gridarta.gui.filter.FilterControl;
+import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory;
+import net.sf.gridarta.gui.map.mapview.MapViewFactory;
+import net.sf.gridarta.gui.map.mapview.MapViewsManager;
+import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
+import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
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 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -20,12 +20,6 @@
package net.sf.gridarta.var.crossfire.maincontrol;
import java.awt.Component;
-import net.sf.gridarta.gui.filter.FilterControl;
-import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory;
-import net.sf.gridarta.gui.map.mapview.MapViewFactory;
-import net.sf.gridarta.gui.map.mapview.MapViewsManager;
-import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
-import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
@@ -37,6 +31,12 @@
import net.sf.gridarta.gui.dialog.prefs.NetPreferences;
import net.sf.gridarta.gui.dialog.prefs.ResPreferences;
import net.sf.gridarta.gui.dialog.prefs.UpdatePreferences;
+import net.sf.gridarta.gui.filter.FilterControl;
+import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory;
+import net.sf.gridarta.gui.map.mapview.MapViewFactory;
+import net.sf.gridarta.gui.map.mapview.MapViewsManager;
+import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
+import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
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 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -22,12 +22,6 @@
import java.awt.Component;
import java.io.IOException;
import java.net.URL;
-import net.sf.gridarta.gui.filter.FilterControl;
-import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory;
-import net.sf.gridarta.gui.map.mapview.MapViewFactory;
-import net.sf.gridarta.gui.map.mapview.MapViewsManager;
-import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
-import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
@@ -39,6 +33,12 @@
import net.sf.gridarta.gui.dialog.prefs.NetPreferences;
import net.sf.gridarta.gui.dialog.prefs.ResPreferences;
import net.sf.gridarta.gui.dialog.prefs.UpdatePreferences;
+import net.sf.gridarta.gui.filter.FilterControl;
+import net.sf.gridarta.gui.map.mapview.DefaultMapViewFactory;
+import net.sf.gridarta.gui.map.mapview.MapViewFactory;
+import net.sf.gridarta.gui.map.mapview.MapViewsManager;
+import net.sf.gridarta.gui.map.renderer.GridMapSquarePainter;
+import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -32,13 +32,13 @@
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.shrinkmapsizedialog.ShrinkMapSizeDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
import net.sf.gridarta.gui.map.mapview.MapViewManagerListener;
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModel;
-import net.sf.gridarta.gui.dialog.shrinkmapsizedialog.ShrinkMapSizeDialogManager;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.direction.Direction;
import net.sf.gridarta.model.exitconnector.ExitMatcher;
Modified: trunk/src/app/net/sf/gridarta/gui/misc/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/DefaultFileControl.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/gui/misc/DefaultFileControl.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -25,10 +25,10 @@
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
import javax.swing.filechooser.FileFilter;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.map.MapPreviewAccessory;
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
import net.sf.gridarta.gui.mapimagecache.MapImageCache;
-import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/gui/panel/pickmapchooser/PickmapChooserControl.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -32,6 +32,7 @@
import javax.swing.JPopupMenu;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
import net.sf.gridarta.gui.mapfiles.DuplicatePickmapException;
@@ -39,7 +40,6 @@
import net.sf.gridarta.gui.mapfiles.MapFile;
import net.sf.gridarta.gui.mapfiles.MapFolder;
import net.sf.gridarta.gui.mapfiles.MapFolderTree;
-import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooserTab;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -31,13 +31,13 @@
import javax.swing.JFrame;
import net.sf.gridarta.commands.Collector;
import net.sf.gridarta.gui.copybuffer.CopyBuffer;
+import net.sf.gridarta.gui.dialog.replacedialog.ReplaceDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewBasic;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
import net.sf.gridarta.gui.map.mapview.MapViewManagerListener;
import net.sf.gridarta.gui.misc.ShiftProcessor;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
-import net.sf.gridarta.gui.dialog.replacedialog.ReplaceDialogManager;
import net.sf.gridarta.gui.utils.AsynchronousProgress;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.archetype.ArchetypeSet;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/maincontrol/EditorFactory.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -20,13 +20,13 @@
package net.sf.gridarta.maincontrol;
import java.awt.Component;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
import net.sf.gridarta.gui.filter.FilterControl;
import net.sf.gridarta.gui.map.mapview.MapViewFactory;
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
import net.sf.gridarta.gui.map.renderer.RendererFactory;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
-import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
-import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.model.anim.AnimationObjects;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -35,29 +35,20 @@
import javax.swing.filechooser.FileFilter;
import net.sf.gridarta.MainControl;
import net.sf.gridarta.actions.ExitConnectorActions;
-import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.autovalidator.AutoValidator;
-import net.sf.gridarta.gui.dialog.bookmarks.BookmarkActions;
-import net.sf.gridarta.gui.panel.connectionview.ConnectionControl;
-import net.sf.gridarta.gui.panel.connectionview.Control;
-import net.sf.gridarta.gui.panel.connectionview.LockedItemsControl;
-import net.sf.gridarta.gui.panel.connectionview.MonsterControl;
import net.sf.gridarta.gui.copybuffer.CopyBuffer;
import net.sf.gridarta.gui.delayedmapmodel.DelayedMapModelListenerManager;
-import net.sf.gridarta.gui.exitconnector.ExitConnectorController;
-import net.sf.gridarta.gui.filter.FilterControl;
+import net.sf.gridarta.gui.dialog.bookmarks.BookmarkActions;
import net.sf.gridarta.gui.dialog.findarchetypes.FindArchetypesDialogManager;
import net.sf.gridarta.gui.dialog.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.ArchTab;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.ErrorListView;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.EventsTab;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.FaceTab;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesControl;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesModel;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.MsgTextTab;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.TextEditorTab;
-import net.sf.gridarta.gui.panel.gameobjecttexteditor.GameObjectTextEditor;
import net.sf.gridarta.gui.dialog.gomapdialog.GoMapDialogManager;
+import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
+import net.sf.gridarta.gui.dialog.replacedialog.ReplaceDialogManager;
+import net.sf.gridarta.gui.dialog.shortcuts.ShortcutsManager;
+import net.sf.gridarta.gui.exitconnector.ExitConnectorController;
+import net.sf.gridarta.gui.filter.FilterControl;
import net.sf.gridarta.gui.mainwindow.GameObjectTab;
import net.sf.gridarta.gui.mainwindow.GameObjectTextEditorTab;
import net.sf.gridarta.gui.mainwindow.WarningsTab;
@@ -84,7 +75,6 @@
import net.sf.gridarta.gui.mapmenu.MapMenuManager;
import net.sf.gridarta.gui.mapmenu.MapMenuPreferences;
import net.sf.gridarta.gui.mapmenu.RecentMapMenuPreferences;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.mapuserlistener.MapUserListenerManager;
import net.sf.gridarta.gui.misc.About;
import net.sf.gridarta.gui.misc.DefaultFileControl;
@@ -95,22 +85,32 @@
import net.sf.gridarta.gui.misc.MapPreview;
import net.sf.gridarta.gui.misc.RecentManager;
import net.sf.gridarta.gui.misc.StatusBar;
-import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
+import net.sf.gridarta.gui.panel.connectionview.ConnectionControl;
+import net.sf.gridarta.gui.panel.connectionview.Control;
+import net.sf.gridarta.gui.panel.connectionview.LockedItemsControl;
+import net.sf.gridarta.gui.panel.connectionview.MonsterControl;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.ArchTab;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.ErrorListView;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.EventsTab;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.FaceTab;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesControl;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.MsgTextTab;
+import net.sf.gridarta.gui.panel.gameobjectattributespanel.TextEditorTab;
+import net.sf.gridarta.gui.panel.gameobjecttexteditor.GameObjectTextEditor;
import net.sf.gridarta.gui.panel.objectchooser.DefaultObjectChooser;
import net.sf.gridarta.gui.panel.pickmapchooser.PickmapChooserControl;
import net.sf.gridarta.gui.panel.pickmapchooser.PickmapChooserModel;
-import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
-import net.sf.gridarta.gui.dialog.replacedialog.ReplaceDialogManager;
import net.sf.gridarta.gui.panel.script.ScriptController;
import net.sf.gridarta.gui.panel.script.parameter.PluginParameterViewFactory;
-import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
-import net.sf.gridarta.gui.scripts.ScriptArchEditor;
-import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareActions;
import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareControl;
import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModel;
import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareView;
-import net.sf.gridarta.gui.dialog.shortcuts.ShortcutsManager;
+import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
+import net.sf.gridarta.gui.scripts.ScriptArchEditor;
+import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.gui.spells.SpellsUtils;
import net.sf.gridarta.gui.treasurelist.CFTreasureListTree;
import net.sf.gridarta.gui.undo.UndoControl;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2011-08-06 12:50:44 UTC (rev 8949)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2011-08-06 13:01:20 UTC (rev 8950)
@@ -38,10 +38,10 @@
import net.sf.gridarta.commands.SinglePngCommand;
import net.sf.gridarta.gui.dialog.errorview.ConsoleErrorView;
import net.sf.gridarta.gui.dialog.errorview.DefaultErrorView;
+import net.sf.gridarta.gui.dialog.prefs.GUIPreferences;
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.dialog.prefs.GUIPreferences;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.mainactions.DefaultExiter;
import net.sf.gridarta.model.anim.AnimationObjects;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-06 13:06:55
|
Revision: 8951
http://gridarta.svn.sourceforge.net/gridarta/?rev=8951&view=rev
Author: akirschbaum
Date: 2011-08-06 13:06:46 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Consistently format code.
Modified Paths:
--------------
trunk/atrinik/resource/resource/HelpFiles/treasure_multi.html
trunk/crossfire/resource/resource/HelpFiles/map_basic.html
trunk/crossfire/resource/resource/HelpFiles/treasure_multi.html
trunk/crossfire/resource/resource/HelpFiles/tut_loading.html
trunk/daimonin/resource/resource/HelpFiles/treasure_multi.html
trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java
trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
trunk/model/src/app/net/sf/gridarta/model/filter/Filter.java
trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
trunk/model/src/app/net/sf/gridarta/model/index/Index.java
trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java
trunk/model/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentInvError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentMapError.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/ValidationError.java
trunk/model/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyMode.java
trunk/src/app/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java
trunk/src/app/net/sf/gridarta/gui/dialog/prefs/MiscPreferences.java
trunk/src/app/net/sf/gridarta/gui/filter/BtnPopup.java
trunk/src/app/net/sf/gridarta/gui/filter/FilterComponent.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/misc/MainView.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionView.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptManager.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/DoubleParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/IntegerParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterDescriptionEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/StringParameterView.java
trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
trunk/src/app/net/sf/gridarta/gui/utils/AbstractDialogManager.java
trunk/src/app/net/sf/gridarta/gui/utils/AnimationComponent.java
trunk/src/app/net/sf/gridarta/gui/utils/AsynchronousProgress.java
trunk/src/app/net/sf/gridarta/gui/utils/FaceComponent.java
trunk/src/app/net/sf/gridarta/gui/utils/GSplitPane.java
trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/Location.java
trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateState.java
trunk/src/app/net/sf/gridarta/mainactions/DefaultExiter.java
trunk/src/test/net/sf/gridarta/gui/utils/GSplitPaneTestApplication.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/utils/src/app/net/sf/gridarta/MainControl.java
trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java
trunk/utils/src/test/net/sf/gridarta/utils/StringUtilsTest.java
Modified: trunk/atrinik/resource/resource/HelpFiles/treasure_multi.html
===================================================================
--- trunk/atrinik/resource/resource/HelpFiles/treasure_multi.html 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/atrinik/resource/resource/HelpFiles/treasure_multi.html 2011-08-06 13:06:46 UTC (rev 8951)
@@ -54,9 +54,9 @@
There is a 10% chance for the bow to be generated. Now <b>if</b> the bow is
generated, automatically arrows are generated too.
<br>
- There is a 5% chance for the sword to be generated. If that fails, the
- short sword has a 10% chance to be generated. If that fails again, there is a
- 15% chance for the dagger.
+ There is a 5% chance for the sword to be generated. If that fails, the short
+ sword has a 10% chance to be generated. If that fails again, there is a 15%
+ chance for the dagger.
<br>
</P>
<IMG SRC="treasure4.jpg" WIDTH="277" HEIGHT="366" ALIGN="CENTER">
Modified: trunk/crossfire/resource/resource/HelpFiles/map_basic.html
===================================================================
--- trunk/crossfire/resource/resource/HelpFiles/map_basic.html 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/crossfire/resource/resource/HelpFiles/map_basic.html 2011-08-06 13:06:46 UTC (rev 8951)
@@ -59,12 +59,12 @@
<H2 align="center">Step 3 - Walls:</H2>
-<P>Let's add some walls next. On the
- <A HREF="tut_frames.html">Default-Archetype panel</A> (left side) select
- "Arch List" - "wall". Now pick one of the wall types. You can enable the
- menu "Map->Auto-Joining". This will automatically join the wall parts as you
- insert them on the map. Later you can switch off Auto-Joining again and
- replace some wall parts with special parts, like a window as seen below.</P>
+<P>Let's add some walls next. On the <A HREF="tut_frames.html">Default-Archetype
+ panel</A> (left side) select "Arch List" - "wall". Now pick one of the wall
+ types. You can enable the menu "Map->Auto-Joining". This will automatically
+ join the wall parts as you insert them on the map. Later you can switch off
+ Auto-Joining again and replace some wall parts with special parts, like a
+ window as seen below.</P>
<P>
<center><IMG SRC="map1_walls.jpg" width="224" height="192"></center>
@@ -78,7 +78,7 @@
course. An undead map could show some tombstones/mist, pillars belong in a
castle, altars in a church, trees/bushes for outdoor maps etc. (At this
point I assume you know how to find things in the <A HREF="tut_frames.html">Default-Archetype
- panel</A>.)
+ panel</A>.)
<br>
You can place some doors between separate rooms. And maybe add a little
food, because players are always hungry.
Modified: trunk/crossfire/resource/resource/HelpFiles/treasure_multi.html
===================================================================
--- trunk/crossfire/resource/resource/HelpFiles/treasure_multi.html 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/crossfire/resource/resource/HelpFiles/treasure_multi.html 2011-08-06 13:06:46 UTC (rev 8951)
@@ -58,9 +58,9 @@
<p>There is a 10% chance for the bow to be generated. Now <b>if</b> the bow is
generated, automatically arrows are generated too.</p>
-<p>There is a 5% chance for the sword to be generated. If that fails, the
- short sword has a 10% chance to be generated. If that fails again, there is
- a 15% chance for the dagger.</p>
+<p>There is a 5% chance for the sword to be generated. If that fails, the short
+ sword has a 10% chance to be generated. If that fails again, there is a 15%
+ chance for the dagger.</p>
<p>
<img src="treasure4.jpg" width="277" height="366" align="center" alt="Treasurelist 'goblin">
Modified: trunk/crossfire/resource/resource/HelpFiles/tut_loading.html
===================================================================
--- trunk/crossfire/resource/resource/HelpFiles/tut_loading.html 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/crossfire/resource/resource/HelpFiles/tut_loading.html 2011-08-06 13:06:46 UTC (rev 8951)
@@ -50,8 +50,8 @@
<P>Once you've got the arch folder, you must <B>set the path</B> to this
folder. Select the menu "File->Options...", un-check the box
- "Load Arches from Collection", then enter the path in "Arch".
- When you're at it, you can also customize the default map-path.</P>
+ "Load Arches from Collection", then enter the path in "Arch". When
+ you're at it, you can also customize the default map-path.</P>
<P>Now you're ready to go. Click OK, quit the editor and restart it.
This time the archetypes will load from all the individual arch and
Modified: trunk/daimonin/resource/resource/HelpFiles/treasure_multi.html
===================================================================
--- trunk/daimonin/resource/resource/HelpFiles/treasure_multi.html 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/daimonin/resource/resource/HelpFiles/treasure_multi.html 2011-08-06 13:06:46 UTC (rev 8951)
@@ -53,9 +53,9 @@
There is a 10% chance for the bow to be generated. Now <b>if</b> the bow is
generated, automatically arrows are generated too.
<br>
- There is a 5% chance for the sword to be generated. If that fails, the
- short sword has a 10% chance to be generated. If that fails again, there is
- a 15% chance for the dagger.
+ There is a 5% chance for the sword to be generated. If that fails, the short
+ sword has a 10% chance to be generated. If that fails again, there is a 15%
+ chance for the dagger.
</P>
<IMG SRC="treasure4.jpg" WIDTH="277" HEIGHT="366" ALIGN="CENTER">
Modified: trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -85,9 +85,9 @@
/**
* Creates a new instance. Therefore animList is parsed. Do not invoke this
- * constructor directly, use {@link AnimationObjects#addAnimationObject(String,String,String)}
- * instead. If you invoke this constructor directly, the created
- * AnimationObject will not be registered.
+ * constructor directly, use {@link AnimationObjects#addAnimationObject(String,
+ * String, String)} instead. If you invoke this constructor directly, the
+ * created AnimationObject will not be registered.
* @param animName name of the animation
* @param animList list of animation as found between "anim" and "mina",
* separated with "\n", including "facings" but including neither "anim" nor
Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -109,8 +109,8 @@
* @param map whether this archetype type is allowed on maps
* @param inv which archetype types allow this archetype type in their
* inventories or <code>null</code> for no restrictions
- * @param allowsAllInv whether this archetype type allows any inventory game objects, whether
- * these types have "inv" specifications
+ * @param allowsAllInv whether this archetype type allows any inventory game
+ * objects, whether these types have "inv" specifications
* @param description the description
* @param use the usage notes
* @param sectionNum the number of attribute sections
Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -88,6 +88,7 @@
private void initData() {
contents = new ArrayList<G>(0);
recursive = new Iterable<G>() {
+
/** {@inheritDoc} */
@Override
public Iterator<G> iterator() {
@@ -95,6 +96,7 @@
}
};
reverse = new Iterable<G>() {
+
/** {@inheritDoc} */
@Override
public Iterator<G> iterator() {
Modified: trunk/model/src/app/net/sf/gridarta/model/filter/Filter.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/filter/Filter.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/filter/Filter.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -58,7 +58,7 @@
/**
* Tells if all the game objects on a square are to be analyzed before a
* match result. If all game objects must be analyzed to decide the result
- * of a match, the return value of {@link #match(FilterConfig,GameObject)}
+ * of a match, the return value of {@link #match(FilterConfig, GameObject)}
* is ignored and the returning value of {@link #reset(FilterConfig)} is
* used as replacement. This should mainly used by complex analyze filters.
* @param config the filter configuration to use
Modified: trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/index/AbstractIndex.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -36,8 +36,8 @@
/**
* Abstract base class for {@link Index} implementations.
+ * @param <V> the value's type
* @author Andreas Kirschbaum
- * @param <V> the value's type
*/
public class AbstractIndex<V extends Serializable> implements Index<V> {
Modified: trunk/model/src/app/net/sf/gridarta/model/index/Index.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/Index.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/index/Index.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -35,8 +35,8 @@
* <p/>
* All methods are synchronized: concurrent access from multiple threads is
* supported.
+ * @param <V> the value's type
* @author Andreas Kirschbaum
- * @param <V> the value's type
*/
public interface Index<V> {
Modified: trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/index/IndexListener.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -24,8 +24,8 @@
/**
* Interface for listeners interested in {@link Index} related events.
+ * @param <V> the index's value's type
* @author Andreas Kirschbaum
- * @param <V> the index's value's type
*/
public interface IndexListener<V> extends EventListener {
Modified: trunk/model/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/scripts/UndefinedEventArchetypeException.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -25,7 +25,7 @@
* The class <code>UndefinedEventArchetypeException</code> is thrown when an
* event game object cannot be created.
* @author Andreas Kirschbaum
- * @noinspection AbstractClassExtendsConcreteClass,AbstractClassWithoutAbstractMethods
+ * @noinspection AbstractClassExtendsConcreteClass, AbstractClassWithoutAbstractMethods
*/
public abstract class UndefinedEventArchetypeException extends Exception {
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentInvError.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentInvError.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentInvError.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -26,8 +26,8 @@
import org.jetbrains.annotations.Nullable;
/**
- * Validation error that's used when the EnvironmentChecker detected a
- * possible error on the map.
+ * Validation error that's used when the EnvironmentChecker detected a possible
+ * error on the map.
* @author Andreas Kirschbaum
*/
public class EnvironmentInvError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends GameObjectValidationError<G, A, R> {
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentMapError.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentMapError.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/errors/EnvironmentMapError.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -26,8 +26,8 @@
import org.jetbrains.annotations.Nullable;
/**
- * Validation error that's used when the EnvironmentChecker detected a
- * possible error on the map.
+ * Validation error that's used when the EnvironmentChecker detected a possible
+ * error on the map.
* @author Andreas Kirschbaum
*/
public class EnvironmentMapError<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends GameObjectValidationError<G, A, R> {
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/errors/ValidationError.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/errors/ValidationError.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/errors/ValidationError.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -308,8 +308,8 @@
/**
* Interface for formatting objects.
+ * @param <O> the object type to format
* @author Andreas Kirschbaum
- * @param <O> the object type to format
*/
private interface Formatter<O> extends Comparator<O>, Serializable {
Modified: trunk/model/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/model/src/test/net/sf/gridarta/validation/AbstractValidatorTest.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -53,6 +53,7 @@
final ValidatorPreferences validatorPreferences = new TestValidatorPreferences();
//noinspection EmptyClass
oUT = new AbstractValidator<TestGameObject, TestMapArchObject, TestArchetype>(validatorPreferences, DelegatingMapValidator.DEFAULT_KEY) {
+
};
}
Modified: trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyMode.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyMode.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -42,7 +42,6 @@
* Clear the selection.
*/
DO_CLEAR {
-
/** {@inheritDoc} */
@Override
public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void prepare(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D mapSize) {
@@ -63,7 +62,6 @@
* Cut the selection.
*/
DO_CUT {
-
/** {@inheritDoc} */
@Override
public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void prepare(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D mapSize) {
@@ -91,7 +89,6 @@
* Copy the selection.
*/
DO_COPY {
-
/** {@inheritDoc} */
@Override
public <G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> void prepare(@NotNull final MapModel<G, A, R> mapModel, @NotNull final Size2D mapSize) {
Modified: trunk/src/app/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/delayedmapmodel/DelayedMapModelListenerManager.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -190,6 +190,7 @@
try {
SwingUtilities.invokeAndWait(new Runnable() {
+
/** {@inheritDoc} */
@Override
public void run() {
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -78,6 +78,7 @@
*/
@NotNull
private final ChangeListener singleChangeListener = new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
allCheckbox.getTristateModel().setTristateState(getBitState());
@@ -89,6 +90,7 @@
*/
@NotNull
private final ChangeListener allChangeListener = new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
switch (allCheckbox.getTristateModel().getTristateState()) {
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/prefs/MiscPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/prefs/MiscPreferences.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/prefs/MiscPreferences.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -220,6 +220,7 @@
preferencesHelper.addComponent(exitArchetypeName);
autoCreateExit.addChangeListener(new ChangeListener() {
+
/** {@inheritDoc} */
@Override
public void stateChanged(final ChangeEvent e) {
Modified: trunk/src/app/net/sf/gridarta/gui/filter/BtnPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/filter/BtnPopup.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/filter/BtnPopup.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -36,6 +36,7 @@
button = new JButton(name);
popupMenu = menu.getPopupMenu();
button.addMouseListener(new MouseAdapter() {
+
/**
* {@inheritDoc}
* @noinspection RefusedBequest
Modified: trunk/src/app/net/sf/gridarta/gui/filter/FilterComponent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/filter/FilterComponent.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/filter/FilterComponent.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -50,6 +50,7 @@
active = new JCheckBoxMenuItem("active");
active.getModel().setSelected(this.config.isEnabled());
active.addChangeListener(new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
FilterComponent.this.config.setEnabled(active.getModel().isSelected());
@@ -59,6 +60,7 @@
inverted = new JCheckBoxMenuItem("invert");
inverted.getModel().setSelected(this.config.isInverted());
inverted.addChangeListener(new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
FilterComponent.this.config.setInverted(inverted.getModel().isSelected());
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -521,7 +521,7 @@
* Action method for "tile show".
* @return <code>true</code> if adjacent tiles are shown, or
* <code>false</code> if not
- * @noinspection MethodMayBeStatic,SameReturnValue
+ * @noinspection MethodMayBeStatic, SameReturnValue
*/
@ActionMethod
public boolean isTileShow() {
@@ -935,7 +935,7 @@
* @param tileShow whether adjacent tiles should be shown; ignored unless
* <code>performAction</code> is set
* @return whether the action was or can be performed
- * @noinspection MethodMayBeStatic,UnusedDeclaration,SameReturnValue
+ * @noinspection MethodMayBeStatic, UnusedDeclaration, SameReturnValue
*/
private boolean doTileShow(final boolean performAction, final boolean tileShow) {
return false; // XXX: not yet implemented
Modified: trunk/src/app/net/sf/gridarta/gui/misc/MainView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/MainView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/misc/MainView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -106,6 +106,7 @@
this.frame = frame;
frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
frame.addWindowListener(new WindowAdapter() {
+
@Override
public void windowClosing(final WindowEvent e) {
exitAction.actionPerformed(new ActionEvent(e.getSource(), 0, null));
Modified: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -50,17 +50,18 @@
*/
public ConnectionView(@NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final DelayedMapModelListenerManager<G, A, R> delayedMapModelListenerManager) {
super(new Comparator<Integer>() {
- @Override
- public int compare(@NotNull final Integer o1, @NotNull final Integer o2) {
- if (o1 < o2) {
- return -1;
+
+ @Override
+ public int compare(@NotNull final Integer o1, @NotNull final Integer o2) {
+ if (o1 < o2) {
+ return -1;
+ }
+ if (o1 > o2) {
+ return +1;
+ }
+ return 0;
}
- if (o1 > o2) {
- return +1;
- }
- return 0;
- }
- }, new ConnectionCellRenderer(), mapViewManager, delayedMapModelListenerManager);
+ }, new ConnectionCellRenderer(), mapViewManager, delayedMapModelListenerManager);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -54,6 +54,7 @@
this.view = view;
view.addListSelectionListener(new ListSelectionListener() {
+
@Override
public void valueChanged(final ListSelectionEvent e) {
highlightSelectedEntries();
@@ -61,6 +62,7 @@
});
view.addListMouseListener(new MouseAdapter() {
+
/**
* {@inheritDoc}
* @noinspection RefusedBequest
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -235,6 +235,7 @@
errorMsg.setEditable(false);
errorList.addListSelectionListener(listSelectionListener);
errorList.addMouseListener(new MouseAdapter() {
+
/**
* {@inheritDoc}
* @noinspection RefusedBequest
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptEditor.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptEditor.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -111,6 +111,7 @@
@NotNull
private final MouseListener cellMouseListener = new MouseListener() {
+
@Override
public void mouseClicked(final MouseEvent e) {
selectTableComponent((Component) e.getSource());
@@ -137,6 +138,7 @@
@NotNull
private final FocusListener cellFocusListener = new FocusListener() {
+
@Override
public void focusGained(final FocusEvent e) {
selectTableComponent((Component) e.getSource());
@@ -196,6 +198,7 @@
gbc.anchor = GridBagConstraints.WEST;
typeAutoRun = new JCheckBox("auto-run at application startup");
typeAutoRun.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
script.setAutoBoot(typeAutoRun.isSelected());
@@ -206,6 +209,7 @@
gbc.gridy = 2;
typeFilter = new JCheckBox("reference in the filters list");
typeFilter.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
script.setFilter(typeFilter.isSelected());
@@ -216,6 +220,7 @@
gbc.gridy = 3;
typeBash = new JCheckBox("reference in the manual run list");
typeBash.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
script.setScript(typeBash.isSelected());
@@ -228,6 +233,7 @@
final AbstractButton registerButton = new JButton("re-register script");
registerButton.setToolTipText("Force plugin manager to unregister this plugin from filter list, launch the auto-run (if plugin is auto-start) and re-register it (if filter plugin)");
registerButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
scriptModel.reRegister(script);
@@ -239,6 +245,7 @@
final AbstractButton exportButton = new JButton("Export script...");
exportButton.setToolTipText("Export the specified plugin as XML (for distribution)");
exportButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
scriptController.saveScriptAs(script, false);
@@ -250,6 +257,7 @@
paramTable = new JPanel(new GridBagLayout());
redrawTable();
script.addChangeListener(new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
redrawTable();
@@ -262,6 +270,7 @@
paramButtons.setLayout(new StackLayout(5));
final AbstractButton addParameter = new JButton("Add parameter");
addParameter.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
script.newParameter();
@@ -269,6 +278,7 @@
});
removeParameter = new JButton("Remove parameter");
removeParameter.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
if (selectedRow < 0) {
@@ -295,6 +305,7 @@
code.setText(script.getCode());
code.setFont(new Font("Monospaced", Font.PLAIN, 14));
code.getDocument().addDocumentListener(new DocumentListener() {
+
@Override
public void changedUpdate(final DocumentEvent e) {
script.setCode(code.getText());
@@ -316,6 +327,7 @@
final Container codeBottom = new JPanel(new FlowLayout());
final AbstractButton test = new JButton("Run Script...");
test.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
scriptController.runScript(script);
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptManager.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/ScriptManager.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -156,6 +156,7 @@
};
scripts = new JList(listModel);
scripts.addListSelectionListener(new ListSelectionListener() {
+
@Override
public void valueChanged(final ListSelectionEvent e) {
if (!e.getValueIsAdjusting()) {
@@ -171,6 +172,7 @@
left.add(scripts, BorderLayout.CENTER);
final AbstractButton addScriptBtn = new JButton("New...");
addScriptBtn.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
final String name = JOptionPane.showInputDialog(scripts, "Name of the new Beanshell plugin?");
@@ -187,6 +189,7 @@
});
final AbstractButton removeScriptBtn = new JButton("Remove");
removeScriptBtn.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
//JList does not use type parameters
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -116,6 +116,7 @@
gbc.gridx = 1;
final AbstractButton fromSelect = new JButton("From tile selection");
fromSelect.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
final BaseObject<G, A, R, ?> gameObject = objectChooser.getSelection();
@@ -129,6 +130,7 @@
editorPanel.add(fromSelect, gbc);
final AbstractButton fromActive = new JButton("From map selection");
fromActive.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
final BaseObject<G, A, R, ?> gameObject = gameObjectAttributesModel.getSelectedGameObject();
@@ -142,6 +144,7 @@
gbc.gridx = 2;
editorPanel.add(fromActive, gbc);
editor.addMouseListener(new MouseListener() {
+
@Override
public void mouseClicked(final MouseEvent e) {
}
@@ -177,6 +180,7 @@
});
editor.setEditable(true);
editor.getDocument().addDocumentListener(new DocumentListener() {
+
@Override
public void changedUpdate(final DocumentEvent e) {
archComboBox.editorEntryChange();
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxModel.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxModel.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -52,6 +52,7 @@
final Collection<R> archetypes = archetypeSet.getArchetypes();
archList = new ArrayList<Archetype<G, A, R>>(archetypes);
Collections.sort(archList, new Comparator<Archetype<G, A, R>>() {
+
@Override
public int compare(final Archetype<G, A, R> o1, final Archetype<G, A, R> o2) {
return o1.getArchetypeName().toLowerCase().compareTo(o2.getArchetypeName().toLowerCase());
@@ -116,6 +117,7 @@
@NotNull
public Archetype<G, A, R> getNearestMatch(@NotNull final String name) {
int pos = Collections.binarySearch(archList, name, new Comparator<Object>() {
+
@Override
public int compare(final Object o1, final Object o2) {
final String s1;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -55,6 +55,7 @@
parameter = param;
value.setSelectedItem(param.getValue());
value.addItemListener(new ItemListener() {
+
@Override
public void itemStateChanged(final ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/DoubleParameterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/DoubleParameterView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/DoubleParameterView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -58,6 +58,7 @@
} catch (final IllegalArgumentException e) {
}
value.addChangeListener(new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
parameter.setValue((Double) ((SpinnerNumberModel) value.getModel()).getNumber());
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/IntegerParameterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/IntegerParameterView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/IntegerParameterView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -56,6 +56,7 @@
} catch (final Exception ignored) {
}
value.addChangeListener(new ChangeListener() {
+
@Override
public void stateChanged(final ChangeEvent e) {
try {
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/MapParameterView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -50,6 +50,7 @@
value.setModel(myModel);
value.setRenderer(new MapParameterCellRenderer(mapManager));
value.addItemListener(new ItemListener() {
+
@Override
public void itemStateChanged(final ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterDescriptionEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterDescriptionEditor.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ParameterDescriptionEditor.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -37,6 +37,7 @@
parameter = param;
setText(param.getDescription());
getDocument().addDocumentListener(new DocumentListener() {
+
@Override
public void changedUpdate(final DocumentEvent e) {
change();
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/StringParameterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/StringParameterView.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/StringParameterView.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -47,6 +47,7 @@
linkedParameter = parameter;
final Document d = value.getDocument();
d.addDocumentListener(new DocumentListener() {
+
private void doIt() {
linkedParameter.setValue(value.getText());
}
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -233,6 +233,7 @@
final AbstractButton browseButton = new JButton("...");
browseButton.setMargin(new Insets(0, 10, 0, 10));
browseButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
final File home = mapManager.getLocalMapDir();
Modified: trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/treasurelist/CFTreasureListTree.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -266,6 +266,7 @@
final Container rightSide = new JPanel();
okButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
final String result = getSelectedTreasureList();
@@ -277,6 +278,7 @@
rightSide.add(okButton);
noneButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
// print "none" into the attribute dialog
@@ -287,6 +289,7 @@
final AbstractButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
assert frame != null;
@@ -297,6 +300,7 @@
final AbstractButton helpButton = new JButton("Help");
helpButton.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
new Help(parent, "treasurelists.html").setVisible(true);
Modified: trunk/src/app/net/sf/gridarta/gui/utils/AbstractDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/AbstractDialogManager.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/AbstractDialogManager.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -46,29 +46,29 @@
protected AbstractDialogManager(@NotNull final String actionName) {
ACTION_BUILDER.initAction(true, new AbstractAction() {
- /**
- * The serial version UID.
- */
- private static final long serialVersionUID = 1L;
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
- /** {@inheritDoc} */
- @Override
- public void actionPerformed(@NotNull final ActionEvent e) {
- showDialog();
- }
+ /** {@inheritDoc} */
+ @Override
+ public void actionPerformed(@NotNull final ActionEvent e) {
+ showDialog();
+ }
- /** {@inheritDoc} */
- @NotNull
- @Override
- public Object clone() {
- try {
- return super.clone();
- } catch (@NotNull CloneNotSupportedException ex) {
- throw new AssertionError(ex);
+ /** {@inheritDoc} */
+ @NotNull
+ @Override
+ public Object clone() {
+ try {
+ return super.clone();
+ } catch (@NotNull CloneNotSupportedException ex) {
+ throw new AssertionError(ex);
+ }
}
- }
- }, actionName);
+ }, actionName);
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/utils/AnimationComponent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/AnimationComponent.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/AnimationComponent.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -78,6 +78,7 @@
final AbstractButton button = new JButton(animTreeChooseAction);
button.setMargin(new Insets(0, 1, 0, 1));
textField.addFocusListener(new FocusListener() {
+
@Override
public void focusGained(final FocusEvent e) {
// ignore
Modified: trunk/src/app/net/sf/gridarta/gui/utils/AsynchronousProgress.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/AsynchronousProgress.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/AsynchronousProgress.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -53,6 +53,7 @@
public void finished() {
try {
EventQueue.invokeAndWait(new Runnable() {
+
/** {@inheritDoc} */
@Override
public void run() {
@@ -80,6 +81,7 @@
@Override
public void setLabel(final String msg, final int max) {
EventQueue.invokeLater(new Runnable() {
+
/** {@inheritDoc} */
@Override
public void run() {
@@ -94,6 +96,7 @@
@Override
public void setValue(final int value) {
EventQueue.invokeLater(new Runnable() {
+
/** {@inheritDoc} */
@Override
public void run() {
Modified: trunk/src/app/net/sf/gridarta/gui/utils/FaceComponent.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/FaceComponent.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/FaceComponent.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -78,6 +78,7 @@
final AbstractButton button = new JButton(faceTreeChooseAction);
button.setMargin(new Insets(0, 1, 0, 1));
textField.addFocusListener(new FocusListener() {
+
@Override
public void focusGained(final FocusEvent e) {
// ignore
Modified: trunk/src/app/net/sf/gridarta/gui/utils/GSplitPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/GSplitPane.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/GSplitPane.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -98,6 +98,7 @@
*/
@NotNull
private final HierarchyListener hierarchyListener = new HierarchyListener() {
+
@Override
public void hierarchyChanged(final HierarchyEvent e) {
if ((e.getChangeFlags() & (long) HierarchyEvent.SHOWING_CHANGED) != 0L && isShowing()) {
@@ -166,6 +167,7 @@
button.removeActionListener(actionListener);
if (actionListeners.size() == 1) {
button.addActionListener(new ActionListener() {
+
/** {@inheritDoc} */
@Override
public void actionPerformed(final ActionEvent e) {
@@ -175,6 +177,7 @@
});
} else {
button.addActionListener(new ActionListener() {
+
/** {@inheritDoc} */
@Override
public void actionPerformed(final ActionEvent e) {
Modified: trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/Location.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/Location.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/Location.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -36,7 +36,6 @@
* The location on the top side.
*/
TOP {
-
/**
* {@inheritDoc}
*/
@@ -136,7 +135,6 @@
* The location on the bottom side.
*/
BOTTOM {
-
/**
* {@inheritDoc}
*/
@@ -236,7 +234,6 @@
* The location on the left side.
*/
LEFT {
-
/**
* {@inheritDoc}
*/
@@ -336,7 +333,6 @@
* The location on the right side.
*/
RIGHT {
-
/**
* {@inheritDoc}
*/
Modified: trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateState.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateState.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateState.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -31,7 +31,6 @@
* The check box is not selected.
*/
DESELECTED {
-
/**
* {@inheritDoc}
*/
@@ -47,7 +46,6 @@
* The check box is in indeterminate state.
*/
INDETERMINATE {
-
/**
* {@inheritDoc}
*/
@@ -63,7 +61,6 @@
* The check box is selected.
*/
SELECTED {
-
/**
* {@inheritDoc}
*/
Modified: trunk/src/app/net/sf/gridarta/mainactions/DefaultExiter.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/DefaultExiter.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/app/net/sf/gridarta/mainactions/DefaultExiter.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -107,6 +107,7 @@
listener.appExitNotify();
}
final Thread thread = new Thread(new Runnable() {
+
/** {@inheritDoc} */
@Override
public void run() {
@@ -115,6 +116,7 @@
}
try {
SwingUtilities.invokeAndWait(new Runnable() {
+
/** {@inheritDoc} */
@Override
public void run() {
Modified: trunk/src/test/net/sf/gridarta/gui/utils/GSplitPaneTestApplication.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/utils/GSplitPaneTestApplication.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/src/test/net/sf/gridarta/gui/utils/GSplitPaneTestApplication.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -61,6 +61,7 @@
*/
public static void main(final String[] args) throws InterruptedException, InvocationTargetException {
SwingUtilities.invokeAndWait(new Runnable() {
+
@Override
public void run() {
final JPanel green = newPanel(MIN_SIZE, MIN_SIZE, Color.GREEN);
@@ -74,6 +75,7 @@
final AbstractButton button = new JButton("save divider locations and quit");
final Window frame = new JFrame();
button.addActionListener(new ActionListener() {
+
@Override
public void actionPerformed(final ActionEvent e) {
splitPane1.saveLocation();
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/InputHandler.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -214,7 +214,7 @@
/**
* If an action implements this interface, it should not be repeated.
* Instead, it will handle the repetition itself.
- * @noinspection MarkerInterface,PublicInnerClass
+ * @noinspection MarkerInterface, PublicInnerClass
*/
public interface NonRepeatable {
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -1500,6 +1500,7 @@
// the mouse is released
/** {@inheritDoc} */
SwingUtilities.invokeLater(new Runnable() {
+
@Override
public void run() {
if (e.getAdjustable() == vertical) {
Modified: trunk/utils/src/app/net/sf/gridarta/MainControl.java
===================================================================
--- trunk/utils/src/app/net/sf/gridarta/MainControl.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/utils/src/app/net/sf/gridarta/MainControl.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -22,7 +22,7 @@
/**
* Interface used as preferences location.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
- * @noinspection InterfaceNeverImplemented,MarkerInterface
+ * @noinspection InterfaceNeverImplemented, MarkerInterface
*/
public interface MainControl {
Modified: trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java
===================================================================
--- trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/utils/src/app/net/sf/gridarta/utils/ActionUtils.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -190,7 +190,7 @@
/**
* Creates new {@link Action} instances. Calls {@link
- * #newAction(ActionBuilder,String,Object,String)} for all keys.
+ * #newAction(ActionBuilder, String, Object, String)} for all keys.
* @param actionBuilder the action builder to use
* @param category the category to set
* @param object the object which defines the action method
@@ -204,7 +204,7 @@
/**
* Creates a new {@link Action} instance. It is basically the same as {@link
- * ActionBuilder#createAction(boolean,String,Object)} except that the
+ * ActionBuilder#createAction(boolean, String, Object)} except that the
* category is set.
* @param actionBuilder the action builder to use
* @param category the category to set
Modified: trunk/utils/src/test/net/sf/gridarta/utils/StringUtilsTest.java
===================================================================
--- trunk/utils/src/test/net/sf/gridarta/utils/StringUtilsTest.java 2011-08-06 13:01:20 UTC (rev 8950)
+++ trunk/utils/src/test/net/sf/gridarta/utils/StringUtilsTest.java 2011-08-06 13:06:46 UTC (rev 8951)
@@ -96,7 +96,8 @@
}
/**
- * Test case for {@link StringUtils#diffTextString(CharSequence,String,boolean)}.
+ * Test case for {@link StringUtils#diffTextString(CharSequence, String,
+ * boolean)}.
*/
@Test
public void testDiffTextString() {
@@ -114,7 +115,8 @@
}
/**
- * Checks two invocations of {@link StringUtils#diffTextString(CharSequence,String,boolean)}.
+ * Checks two invocations of {@link StringUtils#diffTextString(CharSequence,
+ * String, boolean)}.
* @param base the 'base' parameter to use
* @param str the 'str' parameter to use
* @param expectedFalse the expected return value if 'ignoreValues' is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-06 13:27:51
|
Revision: 8953
http://gridarta.svn.sourceforge.net/gridarta/?rev=8953&view=rev
Author: akirschbaum
Date: 2011-08-06 13:27:41 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Rename package names.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ConfirmErrorsDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeText.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/HelpActionListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/MaskChangeAL.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ScrollToVisibleFocusListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/StringKeyManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ViewTreasurelistAL.java
trunk/src/app/net/sf/gridarta/gui/dialog/golocation/GoLocationDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/golocation/GoLocationDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/gomap/MapListCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/dialog/mapproperties/MapPropertiesDialogFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/ArchetypeNameMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/MatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/ObjectNameMatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeUtils.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/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/AbstractGameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ArchTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListView.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListViewListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/EventsTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/FaceTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControlListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModel.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModelListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesTabListener.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/MsgTextTab.java
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/TextEditorTab.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBox.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java
trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/PluginParameterViewFactory.java
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/SelectedSquareControl.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
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/
trunk/src/app/net/sf/gridarta/gui/dialog/golocation/
trunk/src/app/net/sf/gridarta/gui/dialog/gomap/
trunk/src/app/net/sf/gridarta/gui/dialog/mapproperties/
trunk/src/app/net/sf/gridarta/gui/dialog/replace/
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/mappropertiesdialog/
trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/
trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/
trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/
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 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -22,7 +22,7 @@
import java.awt.Component;
import javax.swing.JFrame;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
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 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -22,7 +22,7 @@
import java.awt.Component;
import java.io.IOException;
import java.net.URL;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
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 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -22,7 +22,7 @@
import java.awt.Component;
import javax.swing.JFrame;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
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 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -20,7 +20,7 @@
package net.sf.gridarta.var.crossfire.maincontrol;
import java.awt.Component;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
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 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/gui/mappropertiesdialog/DefaultMapPropertiesDialogFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -22,7 +22,7 @@
import java.awt.Component;
import javax.swing.JFrame;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
import net.sf.gridarta.model.mapmanager.MapManager;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.model.mappathnormalizer.MapPathNormalizer;
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 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -22,7 +22,7 @@
import java.awt.Component;
import java.io.IOException;
import java.net.URL;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.dialog.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.dialog.prefs.AppPreferences;
import net.sf.gridarta.gui.dialog.prefs.AppPreferencesModel;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ConfirmErrorsDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ConfirmErrorsDialog.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ConfirmErrorsDialog.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import java.awt.Container;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttribute.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttribute.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.AttributeSet;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeAnimationName.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeAnimationName.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBitmask.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBitmask.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBool.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBool.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.AbstractButton;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeBoolSpec.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeBoolSpec.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.AbstractButton;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFaceName.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFaceName.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeFloat.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeFloat.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JFormattedTextField;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInt.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInt.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JFormattedTextField;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeInvSpell.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeInvSpell.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeList.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeList.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeLong.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeLong.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JFormattedTextField;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeMapPath.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeMapPath.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeScriptFile.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeScriptFile.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeSpell.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeSpell.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeString.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeString.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeText.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeText.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeText.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.text.Document;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeTreasure.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeTreasure.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JOptionPane;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/DialogAttributeZSpell.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/DialogAttributeZSpell.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialog.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialog.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.CardLayout;
import java.awt.Color;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GameObjectAttributesDialogFactory.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GameObjectAttributesDialogFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Window;
import java.util.HashMap;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/GuiInfo.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/GuiInfo.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import net.sf.gridarta.model.archetype.Archetype;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/HelpActionListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/HelpActionListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/HelpActionListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import java.awt.event.ActionEvent;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/MaskChangeAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/MaskChangeAL.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/MaskChangeAL.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Container;
import java.awt.GridLayout;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ScrollToVisibleFocusListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ScrollToVisibleFocusListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ScrollToVisibleFocusListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import java.awt.Rectangle;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/StringKeyManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/StringKeyManager.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/StringKeyManager.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import javax.swing.ComboBoxModel;
import javax.swing.JComboBox;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/TypesBoxItemListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ViewTreasurelistAL.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributesdialog/ViewTreasurelistAL.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/ViewTreasurelistAL.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gameobjectattributesdialog;
+package net.sf.gridarta.gui.dialog.gameobjectattributes;
import java.awt.Component;
import java.awt.event.ActionEvent;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/golocation/GoLocationDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialog.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/golocation/GoLocationDialog.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.golocationdialog;
+package net.sf.gridarta.gui.dialog.golocation;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/golocation/GoLocationDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/golocationdialog/GoLocationDialogManager.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/golocation/GoLocationDialogManager.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.golocationdialog;
+package net.sf.gridarta.gui.dialog.golocation;
import net.sf.gridarta.gui.map.AbstractPerMapDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/GoMapDialog.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialog.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gomapdialog;
+package net.sf.gridarta.gui.dialog.gomap;
import java.awt.BorderLayout;
import java.awt.Component;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/GoMapDialogManager.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gomap/GoMapDialogManager.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gomapdialog;
+package net.sf.gridarta.gui.dialog.gomap;
import java.awt.Window;
import net.sf.gridarta.gui.map.mapview.MapViewsManager;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gomap/MapListCellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gomapdialog/MapListCellRenderer.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gomap/MapListCellRenderer.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.gomapdialog;
+package net.sf.gridarta.gui.dialog.gomap;
import java.awt.Component;
import java.io.File;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/mapproperties/MapPropertiesDialogFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/mappropertiesdialog/MapPropertiesDialogFactory.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/mapproperties/MapPropertiesDialogFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.mappropertiesdialog;
+package net.sf.gridarta.gui.dialog.mapproperties;
import java.awt.Component;
import javax.swing.JFrame;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/replace/ArchetypeNameMatchCriteria.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ArchetypeNameMatchCriteria.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/replace/ArchetypeNameMatchCriteria.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.replacedialog;
+package net.sf.gridarta.gui.dialog.replace;
import java.util.regex.Pattern;
import net.sf.gridarta.model.archetype.Archetype;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/replace/MatchCriteria.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/MatchCriteria.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/replace/MatchCriteria.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.replacedialog;
+package net.sf.gridarta.gui.dialog.replace;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/replace/ObjectNameMatchCriteria.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ObjectNameMatchCriteria.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/replace/ObjectNameMatchCriteria.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.replacedialog;
+package net.sf.gridarta.gui.dialog.replace;
import java.util.regex.Pattern;
import net.sf.gridarta.model.archetype.Archetype;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ReplaceDialog.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialog.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.replacedialog;
+package net.sf.gridarta.gui.dialog.replace;
import java.awt.Component;
import java.awt.Container;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/replacedialog/ReplaceDialogManager.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/replace/ReplaceDialogManager.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.replacedialog;
+package net.sf.gridarta.gui.dialog.replace;
import java.awt.Component;
import net.sf.gridarta.gui.copybuffer.CopyBuffer;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/ShrinkMapSizeDialog.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialog.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.shrinkmapsizedialog;
+package net.sf.gridarta.gui.dialog.shrinkmapsize;
import java.awt.Component;
import java.awt.Window;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialogManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/ShrinkMapSizeDialogManager.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeDialogManager.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.shrinkmapsizedialog;
+package net.sf.gridarta.gui.dialog.shrinkmapsize;
import java.util.HashMap;
import java.util.Map;
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsizedialog/ShrinkMapSizeUtils.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/shrinkmapsize/ShrinkMapSizeUtils.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.dialog.shrinkmapsizedialog;
+package net.sf.gridarta.gui.dialog.shrinkmapsize;
import net.sf.gridarta.model.mapmodel.MapModel;
import net.sf.gridarta.utils.Size2D;
Modified: trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTab.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -19,8 +19,8 @@
package net.sf.gridarta.gui.mainwindow;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesControl;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesControlListener;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesControl;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesControlListener;
import net.sf.gridarta.gui.utils.Severity;
import net.sf.gridarta.gui.utils.borderpanel.Location;
import net.sf.gridarta.gui.utils.tabbedpanel.Tab;
Modified: trunk/src/app/net/sf/gridarta/gui/mainwindow/WarningsTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mainwindow/WarningsTab.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/mainwindow/WarningsTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -19,8 +19,8 @@
package net.sf.gridarta.gui.mainwindow;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.ErrorListView;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.ErrorListViewListener;
+import net.sf.gridarta.gui.panel.gameobjectattributes.ErrorListView;
+import net.sf.gridarta.gui.panel.gameobjectattributes.ErrorListViewListener;
import net.sf.gridarta.gui.utils.Severity;
import net.sf.gridarta.gui.utils.borderpanel.Location;
import net.sf.gridarta.gui.utils.tabbedpanel.Tab;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -32,8 +32,8 @@
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import javax.swing.filechooser.FileFilter;
-import net.sf.gridarta.gui.dialog.mappropertiesdialog.MapPropertiesDialogFactory;
-import net.sf.gridarta.gui.dialog.shrinkmapsizedialog.ShrinkMapSizeDialogManager;
+import net.sf.gridarta.gui.dialog.mapproperties.MapPropertiesDialogFactory;
+import net.sf.gridarta.gui.dialog.shrinkmapsize.ShrinkMapSizeDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
import net.sf.gridarta.gui.map.mapview.MapViewManagerListener;
Modified: trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/mapcursor/MapCursorActions.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -21,9 +21,9 @@
import java.awt.Point;
import javax.swing.Action;
-import net.sf.gridarta.gui.dialog.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
-import net.sf.gridarta.gui.dialog.golocationdialog.GoLocationDialog;
-import net.sf.gridarta.gui.dialog.golocationdialog.GoLocationDialogManager;
+import net.sf.gridarta.gui.dialog.gameobjectattributes.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.dialog.golocation.GoLocationDialog;
+import net.sf.gridarta.gui.dialog.golocation.GoLocationDialogManager;
import net.sf.gridarta.gui.map.AbstractPerMapDialogManager;
import net.sf.gridarta.gui.map.mapview.MapView;
import net.sf.gridarta.gui.map.mapview.MapViewManager;
Modified: trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/misc/MainViewActions.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -19,9 +19,9 @@
package net.sf.gridarta.gui.misc;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesControl;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesTab;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.TextEditorTab;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesControl;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesTab;
+import net.sf.gridarta.gui.panel.gameobjectattributes.TextEditorTab;
import net.sf.gridarta.gui.utils.tabbedpanel.Tab;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/AbstractGameObjectAttributesTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/AbstractGameObjectAttributesTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/AbstractGameObjectAttributesTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.Component;
import java.awt.event.FocusEvent;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ArchTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ArchTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ArchTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.Color;
import java.awt.Component;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListView.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListView.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.BorderLayout;
import java.awt.Point;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListViewListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/ErrorListViewListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/ErrorListViewListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.util.EventListener;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/EventsTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/EventsTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/EventsTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.BorderLayout;
import java.awt.Container;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/FaceTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/FaceTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/FaceTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.Component;
import java.awt.Container;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesControl.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControl.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.BorderLayout;
import java.awt.Component;
@@ -35,7 +35,7 @@
import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.SwingConstants;
-import net.sf.gridarta.gui.dialog.gameobjectattributesdialog.GameObjectAttributesDialogFactory;
+import net.sf.gridarta.gui.dialog.gameobjectattributes.GameObjectAttributesDialogFactory;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.gui.panel.selectedsquare.MapSquareSelection;
import net.sf.gridarta.gui.panel.selectedsquare.SelectedSquareModel;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControlListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesControlListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesControlListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.util.EventListener;
import net.sf.gridarta.gui.utils.Severity;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesModel.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModel.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.util.ArrayList;
import java.util.Collection;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModelListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesModelListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesModelListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import javax.swing.JPanel;
import net.sf.gridarta.gui.utils.Severity;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesTabListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/GameObjectAttributesTabListener.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/GameObjectAttributesTabListener.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import net.sf.gridarta.gui.utils.Severity;
import net.sf.gridarta.model.archetype.Archetype;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/MsgTextTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/MsgTextTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/MsgTextTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import java.awt.Color;
import java.awt.GridLayout;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/TextEditorTab.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributespanel/TextEditorTab.java 2011-08-06 13:06:46 UTC (rev 8951)
+++ trunk/src/app/net/sf/gridarta/gui/panel/gameobjectattributes/TextEditorTab.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-package net.sf.gridarta.gui.panel.gameobjectattributespanel;
+package net.sf.gridarta.gui.panel.gameobjectattributes;
import javax.swing.JPanel;
import net.sf.gridarta.gui.panel.gameobjecttexteditor.GameObjectTextEditor;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBox.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBox.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBox.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -22,7 +22,7 @@
import java.awt.Dimension;
import javax.swing.JComboBox;
import javax.swing.ListCellRenderer;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.archetype.ArchetypeSet;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchComboBoxEditor.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -41,7 +41,7 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.JTextComponent;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.baseobject.BaseObject;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/ArchParameterView.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -24,7 +24,7 @@
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JPanel;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.archetype.ArchetypeSet;
Modified: trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/PluginParameterViewFactory.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/PluginParameterViewFactory.java 2011-08-06 13:24:25 UTC (rev 8952)
+++ trunk/src/app/net/sf/gridarta/gui/panel/script/parameter/PluginParameterViewFactory.java 2011-08-06 13:27:41 UTC (rev 8953)
@@ -19,7 +19,7 @@
package net.sf.gridarta.gui.panel.script.parameter;
-import net.sf.gridarta.gui.panel.gameobjectattributespanel.GameObjectAttributesModel;
+import net.sf.gridarta.gui.panel.gameobjectattributes.GameObjectAttributesModel;
import net.sf.gridarta.gui.panel.objectchooser.ObjectChooser;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.archetype.ArchetypeSet;
Modified: trunk/src/app/net/sf/gridarta/...
[truncated message content] |
|
From: <aki...@us...> - 2011-08-06 14:54:48
|
Revision: 8956
http://gridarta.svn.sourceforge.net/gridarta/?rev=8956&view=rev
Author: akirschbaum
Date: 2011-08-06 14:54:38 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Distinguish between editor plugins ('plugin') and game scripts ('script').
Modified Paths:
--------------
trunk/atrinik/atrinik.iml
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/build.xml
trunk/crossfire/crossfire.iml
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/daimonin/daimonin.iml
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/gridarta.iml
trunk/gridarta.ipr
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/CloseableTabbedPane.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingIcon.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ClosingListener.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/StackLayout.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBox.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ArchParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/BooleanParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/DoubleParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/FilterParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/IntegerParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/MapParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterDescriptionEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterNameEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/ParameterTypeEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/PluginParameterViewFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/StringParameterView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/parameter/TooltipSpinner.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
Added Paths:
-----------
trunk/plugin/
trunk/plugin/plugin.iml
trunk/plugin/src/app/net/sf/gridarta/plugin/
trunk/plugin/src/app/net/sf/gridarta/plugin/BshThread.java
trunk/plugin/src/app/net/sf/gridarta/plugin/Plugin.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginConsole.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginExecException.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginExecutor.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginModel.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginModelListener.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginModelLoader.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginModelParser.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginParameters.java
trunk/plugin/src/app/net/sf/gridarta/plugin/PluginRunMode.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/AbstractPluginParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/ArchParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/BooleanConfig.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/BooleanParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleConfig.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/DoubleParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/FilterParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/IntegerConfig.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/IntegerParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/MapParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/NoSuchParameterException.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/PluginParameter.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/PluginParameterFactory.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/PluginParameterListener.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/PluginParameterVisitor.java
trunk/plugin/src/app/net/sf/gridarta/plugin/parameter/StringParameter.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginController.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginViewPane.java
Removed Paths:
-------------
trunk/plugin/script.iml
trunk/plugin/src/app/net/sf/gridarta/script/
trunk/script/
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ScriptController.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ScriptManager.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ScriptManagerFactory.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ScriptView.java
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/ScriptViewPane.java
trunk/src/app/net/sf/gridarta/gui/dialog/script/
Modified: trunk/atrinik/atrinik.iml
===================================================================
--- trunk/atrinik/atrinik.iml 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/atrinik/atrinik.iml 2011-08-06 14:54:38 UTC (rev 8956)
@@ -12,7 +12,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
- <orderEntry type="module" module-name="script" />
+ <orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="module-library">
<library>
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 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2011-08-06 14:54:38 UTC (rev 8956)
@@ -94,10 +94,10 @@
import net.sf.gridarta.model.validation.ValidatorPreferences;
import net.sf.gridarta.model.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.model.validation.checks.InvalidCheckException;
-import net.sf.gridarta.script.ScriptExecutor;
-import net.sf.gridarta.script.ScriptModel;
-import net.sf.gridarta.script.ScriptParameters;
-import net.sf.gridarta.script.parameter.PluginParameterFactory;
+import net.sf.gridarta.plugin.PluginExecutor;
+import net.sf.gridarta.plugin.PluginModel;
+import net.sf.gridarta.plugin.PluginParameters;
+import net.sf.gridarta.plugin.parameter.PluginParameterFactory;
import net.sf.gridarta.utils.GUIUtils;
import net.sf.gridarta.utils.GuiFileFilters;
import net.sf.gridarta.utils.IOUtils;
@@ -178,8 +178,8 @@
*/
@NotNull
@Override
- public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
- return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.pythonFileFilter, ".py", "Python", 0, IGUIConstants.SPELL_FILE, IGUIConstants.SCRIPTS_DIR, errorView, this, forceReadFromFiles, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, scriptModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
+ public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
+ return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.pythonFileFilter, ".py", "Python", 0, IGUIConstants.SPELL_FILE, IGUIConstants.SCRIPTS_DIR, errorView, this, forceReadFromFiles, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, pluginModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
}
/**
@@ -469,8 +469,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects<GameObject, MapArchObject, Archetype> animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(GuiFileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapModelFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubDirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new Direction[] { Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final PluginExecutor<GameObject, MapArchObject, Archetype> pluginExecutor, @NotNull final PluginParameters pluginParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final AnimationObjects<GameObject, MapArchObject, Archetype> animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
+ return mainControl.createGUIMainControl(GuiFileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapModelFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubDirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, pluginExecutor, pluginParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, pluginModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new Direction[] { Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
}
/**
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/build.xml 2011-08-06 14:54:38 UTC (rev 8956)
@@ -106,12 +106,12 @@
<pathelement location="${build.dir}/preferences/test"/>
</path>
- <path id="path.class.script.app">
- <pathelement location="${build.dir}/script/app"/>
+ <path id="path.class.plugin.app">
+ <pathelement location="${build.dir}/plugin/app"/>
</path>
- <path id="path.class.script.test">
- <path refid="path.class.script.app"/>
- <pathelement location="${build.dir}/script/test"/>
+ <path id="path.class.plugin.test">
+ <path refid="path.class.plugin.app"/>
+ <pathelement location="${build.dir}/plugin/test"/>
</path>
<path id="path.class.textedit.app">
@@ -191,7 +191,7 @@
<fileset dir="${build.dir}/gridarta/app"/>
<fileset dir="${build.dir}/model/app"/>
<fileset dir="${build.dir}/preferences/app"/>
- <fileset dir="${build.dir}/script/app"/>
+ <fileset dir="${build.dir}/plugin/app"/>
<fileset dir="${build.dir}/textedit/app"/>
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
@@ -229,7 +229,7 @@
<fileset dir="${build.dir}/gridarta/app"/>
<fileset dir="${build.dir}/model/app"/>
<fileset dir="${build.dir}/preferences/app"/>
- <fileset dir="${build.dir}/script/app"/>
+ <fileset dir="${build.dir}/plugin/app"/>
<fileset dir="${build.dir}/textedit/app"/>
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
@@ -267,7 +267,7 @@
<fileset dir="${build.dir}/gridarta/app"/>
<fileset dir="${build.dir}/model/app"/>
<fileset dir="${build.dir}/preferences/app"/>
- <fileset dir="${build.dir}/script/app"/>
+ <fileset dir="${build.dir}/plugin/app"/>
<fileset dir="${build.dir}/textedit/app"/>
<fileset dir="${build.dir}/utils/app"/>
<fileset dir="${build.dir}" includes="build.properties"/>
@@ -315,13 +315,13 @@
</echoproperties>
</target>
- <target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-script,compile-utils">
+ <target name="compile-atrinik" description="Compiles the atrinik module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/atrinik/app"/>
<javac srcdir="atrinik/src/app" destdir="${build.dir}/atrinik/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
- <path refid="path.class.script.app"/>
+ <path refid="path.class.plugin.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -352,13 +352,13 @@
</copy>
</target>
- <target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-script,compile-utils">
+ <target name="compile-crossfire" description="Compiles the crossfire module." depends="compile-gridarta,compile-model,compile-preferences,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/crossfire/app"/>
<javac srcdir="crossfire/src/app" destdir="${build.dir}/crossfire/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
- <path refid="path.class.script.app"/>
+ <path refid="path.class.plugin.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -389,13 +389,13 @@
</copy>
</target>
- <target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-script,compile-utils">
+ <target name="compile-daimonin" description="Compiles the daimonin module." depends="compile-gridarta,compile-model,compile-plugin,compile-utils">
<mkdir dir="${build.dir}/daimonin/app"/>
<javac srcdir="daimonin/src/app" destdir="${build.dir}/daimonin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.gridarta.app"/>
<path refid="path.class.model.app"/>
- <path refid="path.class.script.app"/>
+ <path refid="path.class.plugin.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
<path refid="path.lib.japi-swing-action"/>
@@ -424,13 +424,13 @@
</copy>
</target>
- <target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-script,compile-textedit,compile-utils">
+ <target name="compile-gridarta" description="Compiles the gridarta module." depends="compile-model,compile-preferences,compile-plugin,compile-textedit,compile-utils">
<mkdir dir="${build.dir}/gridarta/app"/>
<javac srcdir="src/app" destdir="${build.dir}/gridarta/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.preferences.app"/>
- <path refid="path.class.script.app"/>
+ <path refid="path.class.plugin.app"/>
<path refid="path.class.textedit.app"/>
<path refid="path.class.utils.app"/>
<path refid="path.lib.annotations"/>
@@ -530,9 +530,9 @@
</copy>
</target>
- <target name="compile-script" description="Compiles the script module." depends="compile-model,compile-utils">
- <mkdir dir="${build.dir}/script/app"/>
- <javac srcdir="script/src/app" destdir="${build.dir}/script/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
+ <target name="compile-plugin" description="Compiles the plugin module." depends="compile-model,compile-utils">
+ <mkdir dir="${build.dir}/plugin/app"/>
+ <javac srcdir="plugin/src/app" destdir="${build.dir}/plugin/app" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="${debug}">
<classpath>
<path refid="path.class.model.app"/>
<path refid="path.class.utils.app"/>
@@ -544,18 +544,18 @@
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/script/test">
- <fileset dir="script/src/test" includes="**/*.properties"/>
+ <copy todir="${build.dir}/plugin/test">
+ <fileset dir="plugin/src/test" includes="**/*.properties"/>
</copy>
- <mkdir dir="${build.dir}/script/test"/>
- <javac srcdir="script/src/test" destdir="${build.dir}/script/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
+ <mkdir dir="${build.dir}/plugin/test"/>
+ <javac srcdir="plugin/src/test" destdir="${build.dir}/plugin/test" encoding="${build.source.encoding}" source="${build.source.version}" target="${build.target.version}" includeantruntime="false" debug="yes">
<classpath>
- <path refid="path.class.script.app"/>
+ <path refid="path.class.plugin.app"/>
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
- <copy todir="${build.dir}/script/app">
- <fileset dir="script/src/app" includes="**/*.properties"/>
+ <copy todir="${build.dir}/plugin/app">
+ <fileset dir="plugin/src/app" includes="**/*.properties"/>
</copy>
</target>
@@ -674,7 +674,7 @@
<path refid="path.class.gridarta.test"/>
<path refid="path.class.model.test"/>
<path refid="path.class.preferences.test"/>
- <path refid="path.class.script.test"/>
+ <path refid="path.class.plugin.test"/>
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
@@ -690,8 +690,8 @@
<packageset dir="model/src/test" defaultexcludes="yes"/>
<packageset dir="preferences/src/app" defaultexcludes="yes"/>
<packageset dir="preferences/src/test" defaultexcludes="yes"/>
- <packageset dir="script/src/app" defaultexcludes="yes"/>
- <packageset dir="script/src/test" defaultexcludes="yes"/>
+ <packageset dir="plugin/src/app" defaultexcludes="yes"/>
+ <packageset dir="plugin/src/test" defaultexcludes="yes"/>
<packageset dir="textedit/src/app" defaultexcludes="yes"/>
<packageset dir="textedit/src/test" defaultexcludes="yes"/>
<packageset dir="utils/src/app" defaultexcludes="yes"/>
@@ -877,8 +877,8 @@
<fileset dir="model/src/test" includes="**/*.java"/>
<fileset dir="preferences/src/app" includes="**/*.java"/>
<fileset dir="preferences/src/test" includes="**/*.java"/>
- <fileset dir="script/src/app" includes="**/*.java"/>
- <fileset dir="script/src/test" includes="**/*.java"/>
+ <fileset dir="plugin/src/app" includes="**/*.java"/>
+ <fileset dir="plugin/src/test" includes="**/*.java"/>
<fileset dir="textedit/src/app" includes="**/*.java"/>
<fileset dir="textedit/src/test" includes="**/*.java"/>
<fileset dir="utils/src/app" includes="**/*.java"/>
@@ -917,7 +917,7 @@
<path refid="path.class.gridarta.test"/>
<path refid="path.class.model.test"/>
<path refid="path.class.preferences.test"/>
- <path refid="path.class.script.test"/>
+ <path refid="path.class.plugin.test"/>
<path refid="path.class.textedit.test"/>
<path refid="path.class.utils.test"/>
</sourcepath>
@@ -933,8 +933,8 @@
<packageset dir="model/src/test" defaultexcludes="yes"/>
<packageset dir="preferences/src/app" defaultexcludes="yes"/>
<packageset dir="preferences/src/test" defaultexcludes="yes"/>
- <packageset dir="script/src/app" defaultexcludes="yes"/>
- <packageset dir="script/src/test" defaultexcludes="yes"/>
+ <packageset dir="plugin/src/app" defaultexcludes="yes"/>
+ <packageset dir="plugin/src/test" defaultexcludes="yes"/>
<packageset dir="textedit/src/app" defaultexcludes="yes"/>
<packageset dir="textedit/src/test" defaultexcludes="yes"/>
<packageset dir="utils/src/app" defaultexcludes="yes"/>
@@ -969,7 +969,7 @@
<target name="test" description="Executes all tests." depends="test-junit,test-mapvalidator-atrinik,test-mapvalidator-crossfire,test-mapvalidator-daimonin"/>
- <target name="test-junit" description="Executes the junit tests." depends="test-atrinik,test-crossfire,test-daimonin,test-gridarta,test-model,test-preferences,test-script,test-textedit,test-utils">
+ <target name="test-junit" description="Executes the junit tests." depends="test-atrinik,test-crossfire,test-daimonin,test-gridarta,test-model,test-preferences,test-plugin,test-textedit,test-utils">
<junitreport todir="${docs.dir}/test">
<fileset dir="${docs.dir}/test">
<include name="TEST-*.xml"/>
@@ -1117,16 +1117,16 @@
</junit>
</target>
- <target name="test-script" depends="compile-script">
+ <target name="test-plugin" depends="compile-plugin">
<mkdir dir="${docs.dir}/test"/>
<junit printsummary="no" haltonfailure="yes">
<classpath>
- <path refid="path.class.script.test"/>
+ <path refid="path.class.plugin.test"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
<batchtest todir="${docs.dir}/test">
- <fileset dir="${build.dir}/script/test">
+ <fileset dir="${build.dir}/plugin/test">
<include name="**/*Test.class"/>
<exclude name="**/*$*"/>
<exclude name="**/Abstract*Test.class"/>
@@ -1176,21 +1176,21 @@
<target name="test-mapvalidator-atrinik" description="Executes the map validator tests using AtrinikEditor.jar." depends="jar-atrinik">
<java jar="AtrinikEditor.jar" failonerror="true" fork="true">
<arg value="--config=test-mapvalidator/atrinik/regtest.conf"/>
- <arg value="--script=MapValidator"/>
+ <arg value="--plugin=MapValidator"/>
</java>
</target>
<target name="test-mapvalidator-crossfire" description="Executes the map validator tests using CrossfireEditor.jar." depends="jar-crossfire">
<java jar="CrossfireEditor.jar" failonerror="true" fork="true">
<arg value="--config=test-mapvalidator/crossfire/regtest.conf"/>
- <arg value="--script=MapValidator"/>
+ <arg value="--plugin=MapValidator"/>
</java>
</target>
<target name="test-mapvalidator-daimonin" description="Executes the map validator tests using DaimoninEditor.jar." depends="jar-daimonin">
<java jar="DaimoninEditor.jar" failonerror="true" fork="true">
<arg value="--config=test-mapvalidator/daimonin/regtest.conf"/>
- <arg value="--script=MapValidator"/>
+ <arg value="--plugin=MapValidator"/>
</java>
</target>
Modified: trunk/crossfire/crossfire.iml
===================================================================
--- trunk/crossfire/crossfire.iml 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/crossfire/crossfire.iml 2011-08-06 14:54:38 UTC (rev 8956)
@@ -13,7 +13,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
- <orderEntry type="module" module-name="script" />
+ <orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="module-library">
<library>
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 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2011-08-06 14:54:38 UTC (rev 8956)
@@ -89,10 +89,10 @@
import net.sf.gridarta.model.validation.ValidatorPreferences;
import net.sf.gridarta.model.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.model.validation.checks.InvalidCheckException;
-import net.sf.gridarta.script.ScriptExecutor;
-import net.sf.gridarta.script.ScriptModel;
-import net.sf.gridarta.script.ScriptParameters;
-import net.sf.gridarta.script.parameter.PluginParameterFactory;
+import net.sf.gridarta.plugin.PluginExecutor;
+import net.sf.gridarta.plugin.PluginModel;
+import net.sf.gridarta.plugin.PluginParameters;
+import net.sf.gridarta.plugin.parameter.PluginParameterFactory;
import net.sf.gridarta.utils.ConfigFileUtils;
import net.sf.gridarta.utils.GUIUtils;
import net.sf.gridarta.utils.GuiFileFilters;
@@ -149,8 +149,8 @@
*/
@NotNull
@Override
- public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
- return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, IGUIConstants.SCRIPTS_DIR, errorView, this, false, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, scriptModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
+ public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
+ return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.pythonFileFilter, ".py", "Python", Archetype.TYPE_SPELL, null, IGUIConstants.SCRIPTS_DIR, errorView, this, false, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, pluginModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
}
/**
@@ -378,8 +378,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects<GameObject, MapArchObject, Archetype> animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(GuiFileFilters.pythonFileFilter, ".py", false, mapManager, pickmapManager, archetypeSet, mapModelFactory, null, "CrossfireEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, null, this, errorView, new DirectoryCacheFiles(ConfigFileUtils.getHomeFile("thumbnails"), ".png"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, 0, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, true, scriptedEventEditor, new Direction[] { Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final PluginExecutor<GameObject, MapArchObject, Archetype> pluginExecutor, @NotNull final PluginParameters pluginParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final AnimationObjects<GameObject, MapArchObject, Archetype> animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
+ return mainControl.createGUIMainControl(GuiFileFilters.pythonFileFilter, ".py", false, mapManager, pickmapManager, archetypeSet, mapModelFactory, null, "CrossfireEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_TRIGGER_ALTAR, Archetype.TYPE_DETECTOR, Archetype.TYPE_TRIGGER_MARKER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, null, this, errorView, new DirectoryCacheFiles(ConfigFileUtils.getHomeFile("thumbnails"), ".png"), configSourceFactory, rendererFactory, filterControl, pluginExecutor, pluginParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, 0, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, pluginModel, animationObjects, archetypeChooserModel, true, scriptedEventEditor, new Direction[] { Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
}
/**
Modified: trunk/daimonin/daimonin.iml
===================================================================
--- trunk/daimonin/daimonin.iml 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/daimonin/daimonin.iml 2011-08-06 14:54:38 UTC (rev 8956)
@@ -12,7 +12,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="gridarta" />
<orderEntry type="module" module-name="model" />
- <orderEntry type="module" module-name="script" />
+ <orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="utils" />
<orderEntry type="module-library">
<library>
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 2011-08-06 13:54:35 UTC (rev 8955)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java 2011-08-06 14:54:38 UTC (rev 8956)
@@ -94,10 +94,10 @@
import net.sf.gridarta.model.validation.ValidatorPreferences;
import net.sf.gridarta.model.validation.checks.AttributeRangeChecker;
import net.sf.gridarta.model.validation.checks.InvalidCheckException;
-import net.sf.gridarta.script.ScriptExecutor;
-import net.sf.gridarta.script.ScriptModel;
-import net.sf.gridarta.script.ScriptParameters;
-import net.sf.gridarta.script.parameter.PluginParameterFactory;
+import net.sf.gridarta.plugin.PluginExecutor;
+import net.sf.gridarta.plugin.PluginModel;
+import net.sf.gridarta.plugin.PluginParameters;
+import net.sf.gridarta.plugin.parameter.PluginParameterFactory;
import net.sf.gridarta.utils.GUIUtils;
import net.sf.gridarta.utils.GuiFileFilters;
import net.sf.gridarta.utils.IOUtils;
@@ -178,8 +178,8 @@
*/
@NotNull
@Override
- public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
- return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, IGUIConstants.SCRIPTS_DIR, errorView, this, forceReadFromFiles, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, scriptModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
+ public DefaultMainControl<GameObject, MapArchObject, Archetype> newMainControl(final boolean forceReadFromFiles, @NotNull final ErrorView errorView, @NotNull final GlobalSettings globalSettings, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final PathManager pathManager, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final AutojoinLists<GameObject, MapArchObject, Archetype> autojoinLists, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory, @NotNull final ValidatorPreferences validatorPreferences, @NotNull final MapWriter<GameObject, MapArchObject, Archetype> mapWriter) {
+ return new DefaultMainControl<GameObject, MapArchObject, Archetype>(GuiFileFilters.luaFileFilter, ".lua", "Lua", 0, IGUIConstants.SPELL_FILE, IGUIConstants.SCRIPTS_DIR, errorView, this, forceReadFromFiles, globalSettings, configSourceFactory, pathManager, gameObjectMatchers, gameObjectFactory, archetypeTypeSet, archetypeSet, archetypeChooserModel, autojoinLists, mapManager, pluginModel, validators, scriptedEventEditor, resources, numberSpells, gameObjectSpells, pluginParameterFactory, validatorPreferences, mapWriter);
}
/**
@@ -469,8 +469,8 @@
*/
@NotNull
@Override
- public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects<GameObject, MapArchObject, Archetype> animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(GuiFileFilters.luaFileFilter, ".lua", true, mapManager, pickmapManager, archetypeSet, mapModelFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "DaimoninEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubDirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new Direction[] { Direction.NORTH_EAST, Direction.SOUTH_EAST, Direction.SOUTH_WEST, Direction.NORTH_WEST, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, }, resources, gameObjectSpells, numberSpells, pluginParameterFactory);
+ public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final PluginExecutor<GameObject, MapArchObject, Archetype> pluginExecutor, @NotNull final PluginParameters pluginParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapModelFactory<GameObject, MapArchObject, Archetype> mapModelFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects<GameObject, MapArchObject, Archetype> faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final PluginModel<GameObject, MapArchObject, Archetype> pluginModel, @NotNull final AnimationObjects<GameObject, MapArchObject, Archetype> animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> nu...
[truncated message content] |
|
From: <aki...@us...> - 2011-08-06 20:09:44
|
Revision: 8957
http://gridarta.svn.sourceforge.net/gridarta/?rev=8957&view=rev
Author: akirschbaum
Date: 2011-08-06 20:09:37 +0000 (Sat, 06 Aug 2011)
Log Message:
-----------
Improve plugin editor.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/build.xml
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/gridarta.iml
trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
trunk/src/app/net/sf/gridarta/messages.properties
Added Paths:
-----------
trunk/lib/rsyntaxtextarea-1.5.1-README
trunk/lib/rsyntaxtextarea-1.5.1.jar
trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/atrinik/ChangeLog 2011-08-06 20:09:37 UTC (rev 8957)
@@ -1,3 +1,7 @@
+2011-08-06 Andreas Kirschbaum
+
+ * Improve plugin editor.
+
2011-07-16 Andreas Kirschbaum
* Support 'z' attribute for objects within spawn points.
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/build.xml 2011-08-06 20:09:37 UTC (rev 8957)
@@ -144,6 +144,7 @@
<path id="path.lib.jdom" location="lib/jdom.jar"/>
<path id="path.lib.log4j" location="lib/log4j-1.2.13.jar"/>
<path id="path.lib.junit" location="lib/junit-4.2.jar"/>
+ <path id="path.lib.rsyntaxtextarea" location="lib/rsyntaxtextarea-1.5.1.jar"/>
<path id="xsltpath">
<fileset dir="lib" includes="**/*.jar"/>
@@ -205,6 +206,7 @@
<include name="java-getopt-1.0.13.jar-LICENSE"/>
<include name="jdom.jar-LICENSE"/>
<include name="log4j-1.2.13.jar-LICENSE"/>
+ <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
<fileset dir="resource"/>
<fileset dir="atrinik/resource"/>
@@ -215,6 +217,7 @@
<zipfileset src="lib/java-getopt-1.0.13.jar"/>
<zipfileset src="lib/jdom.jar"/>
<zipfileset src="lib/log4j-1.2.13.jar"/>
+ <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
<zipgroupfileset dir="lib/" includes="japi-*.jar"/>
<manifest>
<attribute name="Main-Class" value="net.sf.gridarta.var.atrinik.maincontrol.AtrinikEditor"/>
@@ -243,6 +246,7 @@
<include name="java-getopt-1.0.13.jar-LICENSE"/>
<include name="jdom.jar-LICENSE"/>
<include name="log4j-1.2.13.jar-LICENSE"/>
+ <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
<fileset dir="resource"/>
<fileset dir="crossfire/resource"/>
@@ -253,6 +257,7 @@
<zipfileset src="lib/java-getopt-1.0.13.jar"/>
<zipfileset src="lib/jdom.jar" excludes="META-INF/**"/>
<zipfileset src="lib/log4j-1.2.13.jar"/>
+ <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
<zipgroupfileset dir="lib/" includes="japi-*.jar"/>
<manifest>
<attribute name="Main-Class" value="net.sf.gridarta.var.crossfire.maincontrol.CrossfireEditor"/>
@@ -281,6 +286,7 @@
<include name="java-getopt-1.0.13.jar-LICENSE"/>
<include name="jdom.jar-LICENSE"/>
<include name="log4j-1.2.13.jar-LICENSE"/>
+ <include name="rsyntaxtextarea-1.5.1.jar-LICENSE"/>
</fileset>
<fileset dir="resource"/>
<fileset dir="daimonin/resource"/>
@@ -291,6 +297,7 @@
<zipfileset src="lib/java-getopt-1.0.13.jar"/>
<zipfileset src="lib/jdom.jar"/>
<zipfileset src="lib/log4j-1.2.13.jar"/>
+ <zipfileset src="lib/rsyntaxtextarea-1.5.1.jar"/>
<zipgroupfileset dir="lib/" includes="japi-*.jar"/>
<manifest>
<attribute name="Main-Class" value="net.sf.gridarta.var.daimonin.maincontrol.DaimoninEditor"/>
@@ -445,6 +452,7 @@
<path refid="path.lib.japi-util"/>
<path refid="path.lib.jdom"/>
<path refid="path.lib.log4j"/>
+ <path refid="path.lib.rsyntaxtextarea"/>
</classpath>
<compilerarg line="${javac.args}"/>
</javac>
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/crossfire/ChangeLog 2011-08-06 20:09:37 UTC (rev 8957)
@@ -1,3 +1,7 @@
+2011-08-06 Andreas Kirschbaum
+
+ * Improve plugin editor.
+
2011-08-04 Andreas Kirschbaum
* Add "blessed" attribute for Treasure objects.
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/daimonin/ChangeLog 2011-08-06 20:09:37 UTC (rev 8957)
@@ -1,3 +1,7 @@
+2011-08-06 Andreas Kirschbaum
+
+ * Improve plugin editor.
+
2011-07-08 Andreas Kirschbaum
* Support 'system_system_object' matcher for auto-insertion mode.
Modified: trunk/gridarta.iml
===================================================================
--- trunk/gridarta.iml 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/gridarta.iml 2011-08-06 20:09:37 UTC (rev 8957)
@@ -169,6 +169,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
</component>
</module>
Added: trunk/lib/rsyntaxtextarea-1.5.1-README
===================================================================
--- trunk/lib/rsyntaxtextarea-1.5.1-README (rev 0)
+++ trunk/lib/rsyntaxtextarea-1.5.1-README 2011-08-06 20:09:37 UTC (rev 8957)
@@ -0,0 +1 @@
+http://fifesoft.com/rsyntaxtextarea/
Property changes on: trunk/lib/rsyntaxtextarea-1.5.1-README
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/lib/rsyntaxtextarea-1.5.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/lib/rsyntaxtextarea-1.5.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE
===================================================================
--- trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE (rev 0)
+++ trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE 2011-08-06 20:09:37 UTC (rev 8957)
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
Property changes on: trunk/lib/rsyntaxtextarea-1.5.1.jar-LICENSE
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/plugin/PluginEditor.java 2011-08-06 20:09:37 UTC (rev 8957)
@@ -43,7 +43,6 @@
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -65,6 +64,9 @@
import net.sf.gridarta.utils.SystemIcons;
import org.apache.log4j.Category;
import org.apache.log4j.Logger;
+import org.fife.ui.rsyntaxtextarea.RSyntaxTextArea;
+import org.fife.ui.rsyntaxtextarea.SyntaxConstants;
+import org.fife.ui.rtextarea.RTextScrollPane;
import org.jetbrains.annotations.NotNull;
public class PluginEditor<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends JPanel {
@@ -87,7 +89,7 @@
private final AbstractButton removeParameter;
@NotNull
- private final JTextArea code;
+ private final RSyntaxTextArea code;
@NotNull
private final PluginParameterFactory<G, A, R> pluginParameterFactory;
@@ -301,7 +303,7 @@
paramButtons.add(removeParameter);
parameterTab.add(paramButtons, BorderLayout.EAST);
tabs.addTab("Manual run parameters", parameterTab);
- code = new JTextArea();
+ code = new RSyntaxTextArea();
code.setText(plugin.getCode());
code.setFont(new Font("Monospaced", Font.PLAIN, 14));
code.getDocument().addDocumentListener(new DocumentListener() {
@@ -321,7 +323,8 @@
plugin.setCode(code.getText());
}
});
- final Component scrollPane2 = new JScrollPane(code);
+ code.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA);
+ final Component scrollPane2 = new RTextScrollPane(code);
final Container codePanel = new JPanel(new BorderLayout());
codePanel.add(scrollPane2, BorderLayout.CENTER);
final Container codeBottom = new JPanel(new FlowLayout());
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-08-06 14:54:38 UTC (rev 8956)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-08-06 20:09:37 UTC (rev 8957)
@@ -948,6 +948,8 @@
license.6.file=jdom.jar-LICENSE
license.7.title=GNU getopt
license.7.file=java-getopt-1.0.13.jar-LICENSE
+license.8.title=RSyntaxTextArea
+license.8.file=rsyntaxtextarea-1.5.1.jar-LICENSE
#################
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-26 18:28:55
|
Revision: 8958
http://gridarta.svn.sourceforge.net/gridarta/?rev=8958&view=rev
Author: akirschbaum
Date: 2011-08-26 18:28:48 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Reorganize project file: use libraries.
Modified Paths:
--------------
trunk/atrinik/atrinik.iml
trunk/crossfire/crossfire.iml
trunk/daimonin/daimonin.iml
trunk/gridarta.iml
trunk/gridarta.ipr
trunk/model/model.iml
trunk/plugin/plugin.iml
trunk/preferences/preferences.iml
trunk/textedit/textedit.iml
trunk/utils/utils.iml
Modified: trunk/atrinik/atrinik.iml
===================================================================
--- trunk/atrinik/atrinik.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/atrinik/atrinik.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -14,87 +14,15 @@
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-commands-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-misc-trunk-1398.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-prefs-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-tod-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-util-trunk-1410.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/junit-4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="bsh-commands" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-prefs" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-tod" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/crossfire/crossfire.iml
===================================================================
--- trunk/crossfire/crossfire.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/crossfire/crossfire.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -15,123 +15,19 @@
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-commands-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-core-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-util-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-misc-trunk-1398.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-prefs-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-tod-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-util-trunk-1410.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/java-getopt-1.0.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jdom.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/junit-4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="bsh-commands" level="project" />
+ <orderEntry type="library" name="bsh-core" level="project" />
+ <orderEntry type="library" name="bsh-util" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-prefs" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-tod" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="java-getopt" level="project" />
+ <orderEntry type="library" name="jdom" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/daimonin/daimonin.iml
===================================================================
--- trunk/daimonin/daimonin.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/daimonin/daimonin.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -14,87 +14,15 @@
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-commands-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-misc-trunk-1398.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-prefs-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-tod-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-util-trunk-1410.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/junit-4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="bsh-commands" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-prefs" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-tod" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/gridarta.iml
===================================================================
--- trunk/gridarta.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/gridarta.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -23,161 +23,23 @@
<orderEntry type="module" module-name="plugin" />
<orderEntry type="module" module-name="textedit" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/bsh-core-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/bsh-util-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/java-getopt-1.0.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-lang-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-swing-about-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="file://$MODULE_DIR$/../../japi/libs/swing-action/trunk/src/prj" />
- </SOURCES>
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-swing-extlib-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-swing-misc-trunk-1398.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-swing-prefs-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-swing-tod-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-util-trunk-1410.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/japi-lib-xml-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/jdom.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/junit-4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/lib/rsyntaxtextarea-1.5.1.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="bsh-core" level="project" />
+ <orderEntry type="library" name="bsh-util" level="project" />
+ <orderEntry type="library" name="java-getopt" level="project" />
+ <orderEntry type="library" name="japi-lib-lang" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-about" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-extlib" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-prefs" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-tod" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="japi-lib-xml" level="project" />
+ <orderEntry type="library" name="jdom" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
+ <orderEntry type="library" name="rsyntaxtextarea" level="project" />
</component>
</module>
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/gridarta.ipr 2011-08-26 18:28:48 UTC (rev 8958)
@@ -2274,6 +2274,134 @@
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
+ <component name="libraryTable">
+ <library name="annotations">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/annotations.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="bsh-commands">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/bsh-commands-2.0b4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="bsh-core">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/bsh-core-2.0b4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="bsh-util">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/bsh-util-2.0b4.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-lang">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-lang-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-swing-about">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-about-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-swing-action">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-action-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-swing-extlib">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-extlib-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-swing-misc">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-misc-trunk-1398.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-swing-prefs">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-prefs-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-swing-tod">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-swing-tod-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-util">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-util-trunk-1410.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="japi-lib-xml">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/japi-lib-xml-0.1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="java-getopt">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/java-getopt-1.0.13.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="jdom">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/jdom.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="junit">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/junit-4.2.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="log4j">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/log4j-1.2.13.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ <library name="rsyntaxtextarea">
+ <CLASSES>
+ <root url="jar://$PROJECT_DIR$/lib/rsyntaxtextarea-1.5.1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </component>
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="false" />
</component>
Modified: trunk/model/model.iml
===================================================================
--- trunk/model/model.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/model/model.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -9,78 +9,14 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-misc-trunk-1398.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-util-trunk-1410.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-xml-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jdom.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/junit-4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-misc" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="japi-lib-xml" level="project" />
+ <orderEntry type="library" name="jdom" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/plugin/plugin.iml
===================================================================
--- trunk/plugin/plugin.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/plugin/plugin.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -10,51 +10,11 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="model" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/jdom.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-core-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/bsh-util-2.0b4.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="bsh-core" level="project" />
+ <orderEntry type="library" name="bsh-util" level="project" />
+ <orderEntry type="library" name="jdom" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/preferences/preferences.iml
===================================================================
--- trunk/preferences/preferences.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/preferences/preferences.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -7,33 +7,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/textedit/textedit.iml
===================================================================
--- trunk/textedit/textedit.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/textedit/textedit.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -8,33 +8,9 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="utils" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
Modified: trunk/utils/utils.iml
===================================================================
--- trunk/utils/utils.iml 2011-08-06 20:09:37 UTC (rev 8957)
+++ trunk/utils/utils.iml 2011-08-26 18:28:48 UTC (rev 8958)
@@ -7,51 +7,11 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/annotations.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-swing-action-0.1.0.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/japi-lib-util-trunk-1410.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/junit-4.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../lib/log4j-1.2.13.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
+ <orderEntry type="library" name="annotations" level="project" />
+ <orderEntry type="library" name="japi-lib-swing-action" level="project" />
+ <orderEntry type="library" name="japi-lib-util" level="project" />
+ <orderEntry type="library" name="junit" level="project" />
+ <orderEntry type="library" name="log4j" level="project" />
</component>
</module>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-26 18:50:23
|
Revision: 8959
http://gridarta.svn.sourceforge.net/gridarta/?rev=8959&view=rev
Author: akirschbaum
Date: 2011-08-26 18:50:16 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Copy collection/array parameters or return values.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/tiles/TileLink.java
trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedMobOrSpawnPointError.java
trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java
trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.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/renderer/AbstractMapRenderer.java
Modified: trunk/model/src/app/net/sf/gridarta/model/tiles/TileLink.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/tiles/TileLink.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/model/src/app/net/sf/gridarta/model/tiles/TileLink.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -45,7 +45,7 @@
*/
public TileLink(@NotNull final String name, @NotNull final MapLink[] mapLinks, @NotNull final Direction revLink) {
this.name = name;
- this.mapLinks = mapLinks;
+ this.mapLinks = mapLinks.clone();
this.revLink = revLink;
}
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedMobOrSpawnPointError.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedMobOrSpawnPointError.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/errors/BlockedMobOrSpawnPointError.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -20,7 +20,9 @@
package net.sf.gridarta.model.validation.errors;
import java.awt.Component;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.maparchobject.MapArchObject;
@@ -61,8 +63,8 @@
*/
public BlockedMobOrSpawnPointError(@NotNull final MapSquare<G, A, R> mapSquare, @NotNull final Collection<G> blockers, @NotNull final Collection<G> mobsOrSpawnPoints) {
super(mapSquare);
- this.blockers = blockers;
- this.mobsOrSpawnPoints = mobsOrSpawnPoints;
+ this.blockers = new ArrayList<G>(blockers);
+ this.mobsOrSpawnPoints = new ArrayList<G>(mobsOrSpawnPoints);
}
/**
@@ -71,7 +73,7 @@
*/
@NotNull
public Collection<G> getBlockers() {
- return blockers;
+ return Collections.unmodifiableCollection(blockers);
}
/**
@@ -80,7 +82,7 @@
*/
@NotNull
public Collection<G> getMobsOrSpawnPoints() {
- return mobsOrSpawnPoints;
+ return Collections.unmodifiableCollection(mobsOrSpawnPoints);
}
/**
Modified: trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java
===================================================================
--- trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -79,7 +79,7 @@
*/
public AttachTiledMaps(@NotNull final MapManager<G, A, R> mapManager, @NotNull final TileLink[] tileLinks, @NotNull final MapPathNormalizer mapPathNormalizer) {
this.mapManager = mapManager;
- this.tileLinks = tileLinks;
+ this.tileLinks = tileLinks.clone();
this.mapPathNormalizer = mapPathNormalizer;
}
Modified: trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/src/app/net/sf/gridarta/gui/dialog/gameobjectattributes/TypesBoxItemListener.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -21,6 +21,7 @@
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
+import java.util.ArrayList;
import java.util.Collection;
import javax.swing.JComboBox;
import javax.swing.JOptionPane;
@@ -111,7 +112,7 @@
this.gameObject = gameObject;
this.type = type;
this.archetypeTypeSet = archetypeTypeSet;
- this.dialogAttributes = dialogAttributes;
+ this.dialogAttributes = new ArrayList<DialogAttribute<G, A, R, ?>>(dialogAttributes);
this.typeComboBox = typeComboBox;
this.archetypeType = archetypeType;
ignoreEvent = false;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -432,7 +432,7 @@
this.exitMatcher = exitMatcher;
this.mapFileFilter = mapFileFilter;
this.selectedSquareModel = selectedSquareModel;
- this.directionMap = directionMap;
+ this.directionMap = directionMap.clone();
this.allowRandomMapParameters = allowRandomMapParameters;
this.mapPropertiesDialogFactory = mapPropertiesDialogFactory;
this.mapViewSettings = mapViewSettings;
Modified: trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/src/app/net/sf/gridarta/gui/map/maptilepane/AbstractMapTilePane.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -140,7 +140,7 @@
protected AbstractMapTilePane(@NotNull final MapManager<G, A, R> mapManager, @NotNull final GlobalSettings globalSettings, @NotNull final MapModel<G, A, R> mapModel, @NotNull final MapLink[][] tileLink, @NotNull final Direction[] directionMapping, @NotNull final int[] nextFocus, @NotNull final FileFilter mapFileFilter, @NotNull final MapPathNormalizer mapPathNormalizer) {
this.globalSettings = globalSettings;
this.mapModel = mapModel;
- this.nextFocus = nextFocus;
+ this.nextFocus = nextFocus.clone();
this.mapFileFilter = mapFileFilter;
assert tileLink.length == 8;
tileLinks = new TileLink[] { newTileLink("mapNorth", tileLink[0], Direction.SOUTH), newTileLink("mapEast", tileLink[1], Direction.WEST), newTileLink("mapSouth", tileLink[2], Direction.NORTH), newTileLink("mapWest", tileLink[3], Direction.EAST), newTileLink("mapNorthEast", tileLink[4], Direction.SOUTH_WEST), newTileLink("mapSouthEast", tileLink[5], Direction.NORTH_WEST), newTileLink("mapSouthWest", tileLink[6], Direction.NORTH_EAST), newTileLink("mapNorthWest", tileLink[7], Direction.SOUTH_EAST), };
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractMapRenderer.java 2011-08-26 18:28:48 UTC (rev 8958)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractMapRenderer.java 2011-08-26 18:50:16 UTC (rev 8959)
@@ -24,6 +24,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import javax.imageio.ImageIO;
import javax.swing.JComponent;
@@ -98,7 +99,7 @@
* errors
*/
public void setErroneousMapSquares(@NotNull final Map<MapSquare<G, A, R>, ValidationError<G, A, R>> erroneousMapSquares) {
- this.erroneousMapSquares = erroneousMapSquares;
+ this.erroneousMapSquares = new HashMap<MapSquare<G, A, R>, ValidationError<G, A, R>>(erroneousMapSquares);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-26 19:00:20
|
Revision: 8964
http://gridarta.svn.sourceforge.net/gridarta/?rev=8964&view=rev
Author: akirschbaum
Date: 2011-08-26 19:00:14 +0000 (Fri, 26 Aug 2011)
Log Message:
-----------
Fix Javadoc issues.
Modified Paths:
--------------
trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/PropagateElevationTest.java
trunk/model/src/test/net/sf/gridarta/model/io/PathManagerTest.java
Modified: trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/PropagateElevationTest.java
===================================================================
--- trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/PropagateElevationTest.java 2011-08-26 18:56:42 UTC (rev 8963)
+++ trunk/crossfire/src/test/net/sf/gridarta/var/crossfire/model/gameobject/PropagateElevationTest.java 2011-08-26 19:00:14 UTC (rev 8964)
@@ -80,7 +80,7 @@
/**
* Checks that {@link GameObjectContainer#insertBefore(net.sf.gridarta.model.gameobject.GameObject,
- * GameObject)} does work correctly.
+ * net.sf.gridarta.model.gameobject.GameObject)} does work correctly.
*/
@Test
public void testInsertBefore() {
@@ -111,7 +111,7 @@
/**
* Checks that {@link GameObjectContainer#insertAfter(net.sf.gridarta.model.gameobject.GameObject,
- * GameObject)} does work correctly.
+ * net.sf.gridarta.model.gameobject.GameObject)} does work correctly.
*/
@Test
public void testInsertAfter() {
@@ -224,7 +224,7 @@
/**
* Checks that {@link GameObjectContainer#replace(net.sf.gridarta.model.gameobject.GameObject,
- * GameObject)} does work correctly.
+ * net.sf.gridarta.model.gameobject.GameObject)} does work correctly.
*/
@Test
public void testReplace() {
Modified: trunk/model/src/test/net/sf/gridarta/model/io/PathManagerTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/io/PathManagerTest.java 2011-08-26 18:56:42 UTC (rev 8963)
+++ trunk/model/src/test/net/sf/gridarta/model/io/PathManagerTest.java 2011-08-26 19:00:14 UTC (rev 8964)
@@ -29,7 +29,7 @@
public class PathManagerTest {
/**
- * Test case for {@link PathManager#path(String)}.
+ * Test case for {@link PathManager#path(CharSequence)}.
*/
@Test
public void testPath() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-27 06:50:36
|
Revision: 8966
http://gridarta.svn.sourceforge.net/gridarta/?rev=8966&view=rev
Author: akirschbaum
Date: 2011-08-27 06:50:28 +0000 (Sat, 27 Aug 2011)
Log Message:
-----------
Add "Exits" panel to main window.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionControl.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/LockedItemsControl.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterControl.java
trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsControl.java
trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsView.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/atrinik/ChangeLog 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1,3 +1,9 @@
+2011-08-27 Andreas Kirschbaum
+
+ * Add "Exits" panel to main window. It shows all exits leading
+ from the current map. Double-click on an entry opens the
+ destination map.
+
2011-08-06 Andreas Kirschbaum
* Improve plugin editor.
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/crossfire/ChangeLog 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1,3 +1,9 @@
+2011-08-27 Andreas Kirschbaum
+
+ * Add "Exits" panel to main window. It shows all exits leading
+ from the current map. Double-click on an entry opens the
+ destination map.
+
2011-08-06 Andreas Kirschbaum
* Improve plugin editor.
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/daimonin/ChangeLog 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1,3 +1,9 @@
+2011-08-27 Andreas Kirschbaum
+
+ * Add "Exits" panel to main window. It shows all exits leading
+ from the current map. Double-click on an entry opens the
+ destination map.
+
2011-08-06 Andreas Kirschbaum
* Improve plugin editor.
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -725,17 +725,17 @@
/**
* Enter a map wanted.
- * @param currentMapView the map view to leave
+ * @param mapView the map view to leave
* @param path path to map that should be loaded
* @param direction the direction to go
* @param destinationPoint the desired destination point on the map (pass
* 0|0 if unknown, and note that the point gets modified)
* @return whether the destination map has been entered
*/
- private boolean enterMap(@NotNull final MapView<G, A, R> currentMapView, @NotNull final String path, @NotNull final Direction direction, @Nullable final Point destinationPoint) {
+ private boolean enterMap(@NotNull final MapView<G, A, R> mapView, @NotNull final String path, @NotNull final Direction direction, @Nullable final Point destinationPoint) {
final File canonicalNewFile;
try {
- canonicalNewFile = mapPathNormalizer.normalizeMapPath(currentMapView.getMapControl().getMapModel(), path);
+ canonicalNewFile = mapPathNormalizer.normalizeMapPath(mapView.getMapControl().getMapModel(), path);
} catch (final InvalidPathException ex) {
ACTION_BUILDER.showMessageDialog(parent, "enterExitInvalidPath", ex.getFile().getAbsolutePath());
return false;
@@ -748,28 +748,51 @@
} catch (final SameMapException ignored) {
// path points to the same map
if (destinationPoint != null) {
- showLocation(currentMapView, destinationPoint);
+ showLocation(mapView, destinationPoint);
}
return true;
}
+ return enterMap(mapView, canonicalNewFile, destinationPoint, direction);
+ }
+ /**
+ * Enters a map.
+ * @param mapFile the map file to enter
+ * @param destinationPoint the desired destination point on the map or
+ * <code>null</code> for default
+ */
+ public void enterMap(@NotNull final File mapFile, @Nullable final Point destinationPoint) {
+ enterMap(currentMapView, mapFile, destinationPoint, Direction.NORTH);
+ }
+
+ /**
+ * Enters a map.
+ * @param mapView the current map view; may be closed it
+ * non-<code>null</code>
+ * @param mapFile the map file to enter
+ * @param destinationPoint the desired destination point on the map or
+ * <code>null</code> for default
+ * @param direction the direction to go
+ * @return whether the destination map has been entered
+ */
+ private boolean enterMap(@Nullable final MapView<G, A, R> mapView, @NotNull final File mapFile, @Nullable final Point destinationPoint, @NotNull final Direction direction) {
final MapView<G, A, R> newMapView;
try {
- newMapView = mapViewsManager.openMapFileWithView(canonicalNewFile, null, destinationPoint);
+ newMapView = mapViewsManager.openMapFileWithView(mapFile, null, destinationPoint);
} catch (final IOException ex) {
- fileControl.reportLoadError(canonicalNewFile, ex.getMessage());
+ fileControl.reportLoadError(mapFile, ex.getMessage());
return false;
}
if (destinationPoint != null) {
showLocation(newMapView, destinationPoint);
- } else {
- newMapView.getMapViewBasic().getScrollPane().getViewport().setViewPosition(calculateNewViewPosition(currentMapView.getMapViewBasic().getScrollPane(), newMapView.getMapViewBasic().getScrollPane(), direction));
+ } else if (mapView != null) {
+ newMapView.getMapViewBasic().getScrollPane().getViewport().setViewPosition(calculateNewViewPosition(mapView.getMapViewBasic().getScrollPane(), newMapView.getMapViewBasic().getScrollPane(), direction));
}
- if (ACTION_BUILDER.showOnetimeConfirmDialog(parent, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, "enterExitClose") == JOptionPane.YES_OPTION) {
+ if (mapView != null && ACTION_BUILDER.showOnetimeConfirmDialog(parent, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, "enterExitClose") == JOptionPane.YES_OPTION) {
// only close current map if a new file was opened and user wants to close it
- mapViewsManager.closeMapView(currentMapView);
+ mapViewsManager.closeMapView(mapView);
}
return true;
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapLocation.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -20,8 +20,13 @@
package net.sf.gridarta.gui.map.mapactions;
import java.awt.Point;
+import java.io.File;
import java.util.regex.Pattern;
import net.sf.gridarta.model.baseobject.BaseObject;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.io.PathManager;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapSquare;
import net.sf.gridarta.utils.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -70,10 +75,45 @@
* @throws NoExitPathException if the game object is not a valid exit
*/
public MapLocation(@NotNull final BaseObject<?, ?, ?, ?> gameObject, final boolean allowRandomMapParameters) throws NoExitPathException {
- this(getMapPath(gameObject, allowRandomMapParameters), gameObject.getAttributeInt(BaseObject.HP), gameObject.getAttributeInt(BaseObject.SP));
+ this(getMapPath(gameObject, allowRandomMapParameters), getMapX(gameObject), getMapY(gameObject));
}
/**
+ * Creates a new instance from a {@link BaseObject} instance. The new
+ * <code>MapLocation</code> instance includes an absolute map path.
+ * @param gameObject the game object
+ * @param allowRandomMapParameters whether random map parameters should be
+ * considered
+ * @param pathManager the path manager for converting relative path names
+ * @return the new map location instance
+ * @throws NoExitPathException if the game object is not a valid exit
+ */
+ @NotNull
+ public static MapLocation newAbsoluteMapLocation(@NotNull final GameObject<?, ?, ?> gameObject, final boolean allowRandomMapParameters, @NotNull final PathManager pathManager) throws NoExitPathException {
+ final String mapPath = getMapPath(gameObject, allowRandomMapParameters);
+ if (mapPath.isEmpty()) {
+ throw new NoExitPathException(gameObject);
+ }
+ final String baseMapPath;
+ final MapSquare<?, ?, ?> mapSquare = gameObject.getMapSquare();
+ if (mapSquare == null) {
+ baseMapPath = "/";
+ } else {
+ final MapModel<?, ?, ?> mapModel = mapSquare.getMapModel();
+ final File mapFile = mapModel.getMapFile();
+ if (mapFile == null) {
+ baseMapPath = "/";
+ } else {
+ baseMapPath = pathManager.getMapPath(mapFile);
+ }
+ }
+ final String canonicalMapPath = PathManager.relativeToAbsolute(baseMapPath, mapPath);
+ final int mapX = getMapX(gameObject);
+ final int mapY = getMapY(gameObject);
+ return new MapLocation(canonicalMapPath, mapX, mapY);
+ }
+
+ /**
* Returns the map path.
* @return the map path
*/
@@ -115,6 +155,24 @@
}
/**
+ * Returns the exit x coordinate of a {@link BaseObject}.
+ * @param gameObject the game object
+ * @return the exit x coordinate
+ */
+ private static int getMapY(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
+ return gameObject.getAttributeInt(BaseObject.SP);
+ }
+
+ /**
+ * Returns the exit y coordinate of a {@link BaseObject}.
+ * @param gameObject the game object
+ * @return the exit y coordinate
+ */
+ private static int getMapX(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
+ return gameObject.getAttributeInt(BaseObject.HP);
+ }
+
+ /**
* Returns the exit map path of a {@link BaseObject}.
* @param gameObject the game object
* @param allowRandomMapParameters whether random maps should be considered
@@ -159,4 +217,13 @@
return null;
}
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ public String toString() {
+ return mapCoordinate.x + "/" + mapCoordinate.y + "@" + mapPath;
+ }
+
} // class MapLocation
Modified: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionControl.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ConnectionControl.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -42,4 +42,12 @@
super(new ConnectionView<G, A, R>(mapViewManager, delayedMapModelListenerManager));
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doubleClick(@NotNull final Connection<Integer> connection) {
+ // ignore
+ }
+
} // class ConnectionControl
Modified: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/Control.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -22,6 +22,7 @@
import java.awt.Point;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.util.Iterator;
import javax.swing.JPanel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -70,11 +71,23 @@
@Override
public void mousePressed(final MouseEvent e) {
highlightSelectedEntries();
+ if (e.getClickCount() == 2) {
+ final Iterator<Connection<K>> it = view.getSelectedConnections().iterator();
+ if (it.hasNext()) {
+ doubleClick(it.next());
+ }
+ }
}
});
}
/**
+ * Called if an entry is double-clicked.
+ * @param connection the first selected connection
+ */
+ protected abstract void doubleClick(@NotNull final Connection<K> connection);
+
+ /**
* Returns the view for this controller.
* @return the view for this controller
*/
Added: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsControl.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsControl.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -0,0 +1,84 @@
+/*
+ * 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.panel.connectionview;
+
+import java.io.File;
+import net.sf.gridarta.gui.delayedmapmodel.DelayedMapModelListenerManager;
+import net.sf.gridarta.gui.map.mapactions.MapActions;
+import net.sf.gridarta.gui.map.mapactions.MapLocation;
+import net.sf.gridarta.gui.map.mapview.MapViewManager;
+import net.sf.gridarta.model.archetype.Archetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.io.PathManager;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.model.match.GameObjectMatcher;
+import net.sf.gridarta.model.settings.GlobalSettings;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The controller of the "Exits" panel.
+ * @author Andreas Kirschbaum
+ */
+public class ExitsControl<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends Control<MapLocation, G, A, R> {
+
+ /**
+ * The {@link GlobalSettings} instance.
+ */
+ @NotNull
+ private final GlobalSettings globalSettings;
+
+ /**
+ * The {@link MapActions} instance for entering maps.
+ */
+ @NotNull
+ private final MapActions<G, A, R> mapActions;
+
+ /**
+ * Create a new instance.
+ * @param mapViewManager the map view manager
+ * @param delayedMapModelListenerManager the delayed map model listener
+ * manager to use
+ * @param exitGameObjectMatcher the game object matcher for selecting exits
+ * @param pathManager the path manager for converting relative exit paths
+ * @param globalSettings the global settings instance
+ * @param mapActions the map actions instance for entering maps
+ */
+ public ExitsControl(@NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final DelayedMapModelListenerManager<G, A, R> delayedMapModelListenerManager, @NotNull final GameObjectMatcher exitGameObjectMatcher, @NotNull final PathManager pathManager, @NotNull final GlobalSettings globalSettings, @NotNull final MapActions<G, A, R> mapActions) {
+ super(new ExitsView<G, A, R>(mapViewManager, delayedMapModelListenerManager, exitGameObjectMatcher, pathManager));
+ this.globalSettings = globalSettings;
+ this.mapActions = mapActions;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doubleClick(@NotNull final Connection<MapLocation> connection) {
+ final MapLocation mapLocation = connection.getKey();
+ final String mapPath = mapLocation.getMapPath();
+ if (!mapPath.startsWith("/")) {
+ return;
+ }
+
+ final File mapFile = new File(globalSettings.getMapsDirectory().getAbsolutePath(), mapPath.substring(1));
+ mapActions.enterMap(mapFile, mapLocation.getMapCoordinate());
+ }
+
+} // class ExitsControl
Property changes on: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsControl.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Added: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsView.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsView.java (rev 0)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsView.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -0,0 +1,157 @@
+/*
+ * 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.panel.connectionview;
+
+import java.awt.Point;
+import java.util.Comparator;
+import net.sf.gridarta.gui.delayedmapmodel.DelayedMapModelListenerManager;
+import net.sf.gridarta.gui.map.mapactions.MapLocation;
+import net.sf.gridarta.gui.map.mapactions.NoExitPathException;
+import net.sf.gridarta.gui.map.mapview.MapViewManager;
+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.io.PathManager;
+import net.sf.gridarta.model.maparchobject.MapArchObject;
+import net.sf.gridarta.model.match.GameObjectMatcher;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The view part of the "Exits" panel.
+ * @author Andreas Kirschbaum
+ */
+public class ExitsView<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends View<MapLocation, G, A, R> {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * A {@link Comparator} that compares {@link MapLocation} instances by map
+ * path and map coordinate.
+ */
+ @NotNull
+ private static final Comparator<MapLocation> mapLocationComparator = new Comparator<MapLocation>() {
+
+ @Override
+ public int compare(@NotNull final MapLocation o1, @NotNull final MapLocation o2) {
+ final int cmp = o1.getMapPath().compareTo(o2.getMapPath());
+ if (cmp != 0) {
+ return cmp;
+ }
+
+ final Point p1 = o1.getMapCoordinate();
+ final Point p2 = o2.getMapCoordinate();
+ if (p1.x < p2.x) {
+ return -1;
+ }
+ if (p1.x > p2.x) {
+ return +1;
+ }
+ if (p1.y < p2.y) {
+ return -1;
+ }
+ if (p1.y > p2.y) {
+ return +1;
+ }
+
+ return 0;
+ }
+
+ };
+
+ /**
+ * The {@link GameObjectMatcher} for selecting exits.
+ */
+ @NotNull
+ private final GameObjectMatcher exitGameObjectMatcher;
+
+ /**
+ * The {@link PathManager} for converting relative exit paths.
+ */
+ @NotNull
+ private final PathManager pathManager;
+
+ /**
+ * Creates a new instance.
+ * @param mapViewManager the map view manager
+ * @param delayedMapModelListenerManager the delayed map model listener
+ * manager to use
+ * @param exitGameObjectMatcher the game object matcher for selecting exits
+ * @param pathManager the path manager for converting relative exit paths
+ */
+ public ExitsView(@NotNull final MapViewManager<G, A, R> mapViewManager, @NotNull final DelayedMapModelListenerManager<G, A, R> delayedMapModelListenerManager, @NotNull final GameObjectMatcher exitGameObjectMatcher, @NotNull final PathManager pathManager) {
+ super(mapLocationComparator, new ExitsCellRenderer(), mapViewManager, delayedMapModelListenerManager);
+ this.exitGameObjectMatcher = exitGameObjectMatcher;
+ this.pathManager = pathManager;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void scanGameObjectForConnections(@NotNull final G gameObject) {
+ if (!exitGameObjectMatcher.isMatching(gameObject)) {
+ return;
+ }
+
+ final MapLocation mapLocation;
+ try {
+ mapLocation = MapLocation.newAbsoluteMapLocation(gameObject, true, pathManager);
+ } catch (final NoExitPathException ignored) {
+ return;
+ }
+ addConnection(mapLocation, gameObject);
+ }
+
+ /**
+ * A {@link CellRenderer} for the locked items view.
+ * @author Andreas Kirschbaum
+ */
+ private static class ExitsCellRenderer extends CellRenderer<MapLocation> {
+
+ /**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ protected String formatKey(@NotNull final MapLocation key) {
+ final Point mapCoordinate = key.getMapCoordinate();
+ return key.getMapPath() + "@" + mapCoordinate.x + "/" + mapCoordinate.y;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @NotNull
+ @Override
+ protected String formatValue(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
+ return gameObject.getBestName();
+ }
+
+ }
+
+} // class ExitsView
Property changes on: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/ExitsView.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ LF
Modified: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/LockedItemsControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/LockedItemsControl.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/LockedItemsControl.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -43,4 +43,12 @@
super(new LockedItemsView<G, A, R>(mapViewManager, delayedMapModelListenerManager, typeNumbers));
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doubleClick(@NotNull final Connection<String> connection) {
+ // ignore
+ }
+
} // class LockedItemsControl
Modified: trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterControl.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/gui/panel/connectionview/MonsterControl.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -45,4 +45,12 @@
super(new MonsterView<G, A, R>(mapViewManager, delayedMapModelListenerManager, monsterMatcher));
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void doubleClick(@NotNull final Connection<GameObject<G, A, R>> connection) {
+ // ignore
+ }
+
} // class MonsterControl
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GUIMainControl.java 2011-08-27 06:50:28 UTC (rev 8966)
@@ -89,6 +89,7 @@
import net.sf.gridarta.gui.panel.archetypechooser.ArchetypeChooserControl;
import net.sf.gridarta.gui.panel.connectionview.ConnectionControl;
import net.sf.gridarta.gui.panel.connectionview.Control;
+import net.sf.gridarta.gui.panel.connectionview.ExitsControl;
import net.sf.gridarta.gui.panel.connectionview.LockedItemsControl;
import net.sf.gridarta.gui.panel.connectionview.MonsterControl;
import net.sf.gridarta.gui.panel.gameobjectattributes.ArchTab;
@@ -494,6 +495,8 @@
final MapPropertiesDialogFactory<G, A, R> mapPropertiesDialogFactory = editorFactory.newMapPropertiesDialogFactory(globalSettings, mapManager, mapPathNormalizer);
final DelayedMapModelListenerManager<G, A, R> delayedMapModelListenerManager = new DelayedMapModelListenerManager<G, A, R>(mapManager, exiter);
final Control<?, G, A, R> lockedItemsControl = new LockedItemsControl<G, A, R>(mapViewManager, delayedMapModelListenerManager, lockedItemsTypeNumbers);
+ final MapActions<G, A, R> mapActions = new MapActions<G, A, R>(mainViewFrame, mainViewFrame, mapManager, mapViewManager, exitMatcher, GuiFileFilters.mapFileFilter, selectedSquareModel, directionMap, allowRandomMapParameters, mapPropertiesDialogFactory, mapViewSettings, mapPathNormalizer, mapViewsManager, fileControl);
+ final Control<?, G, A, R> exitsControl = new ExitsControl<G, A, R>(mapViewManager, delayedMapModelListenerManager, exitGameObjectMatcher, pathManager, globalSettings, mapActions);
final GameObjectAttributesModel<G, A, R> gameObjectAttributesModel = new GameObjectAttributesModel<G, A, R>();
final GameObjectAttributesControl<G, A, R> gameObjectAttributesControl = new GameObjectAttributesControl<G, A, R>(gameObjectAttributesModel, gameObjectAttributesDialogFactory, objectChooser, mapManager, selectedSquareModel, selectedSquareView, gameObjectFactory);
final PluginParameterViewFactory<G, A, R> pluginParameterViewFactory = new PluginParameterViewFactory<G, A, R>(archetypeSet, gameObjectAttributesModel, objectChooser, mapManager, faceObjectProviders);
@@ -513,8 +516,6 @@
new UndoControl<G, A, R>(mapManager, gameObjectFactory, gameObjectMatchers);
final Action exitAction = ActionUtils.newAction(ACTION_BUILDER, "Other", this, "exit");
final MapFolderTreeActions<G, A, R> mapFolderTreeActions = new MapFolderTreeActions<G, A, R>(mapFolderTree, pickmapSettings, newMapDialogFactory, "createPickmapFolder", "deletePickmapFolder", "confirmDeletePickmapFolder", "deletePickmapFolderNotEmpty");
- //noinspection ResultOfObjectAllocationIgnored
- new MapActions<G, A, R>(mainViewFrame, mainViewFrame, mapManager, mapViewManager, exitMatcher, GuiFileFilters.mapFileFilter, selectedSquareModel, directionMap, allowRandomMapParameters, mapPropertiesDialogFactory, mapViewSettings, mapPathNormalizer, mapViewsManager, fileControl);
final ViewActions<G, A, R> viewActions = new ViewActions<G, A, R>(mapViewSettings, mapManager);
//noinspection ResultOfObjectAllocationIgnored
new MapFileActions<G, A, R>(imageCreator2, mapManager, mapViewsManager, mapViewManager, fileControl, mainViewFrame);
@@ -588,8 +589,9 @@
mainView.addTab(new Tab("monsters", new MonsterControl<G, A, R>(mapViewManager, delayedMapModelListenerManager, monsterMatcher).getView(), Location.BOTTOM, false, 4, false));
mainView.addTab(new Tab("connections", new ConnectionControl<G, A, R>(mapViewManager, delayedMapModelListenerManager).getView(), Location.BOTTOM, false, 5, false));
mainView.addTab(new Tab("lockedItems", lockedItemsControl.getView(), Location.BOTTOM, false, 6, false));
- mainView.addTab(new WarningsTab<G, A, R>("warnings", errorListView, Location.BOTTOM, false, 7, false));
- mainView.addTab(new GameObjectTextEditorTab<G, A, R>("textEditor", new GameObjectTextEditor(archetypeTypeSet), Location.RIGHT, true, 8, false, selectedSquareModel, mapManager));
+ mainView.addTab(new Tab("exits", exitsControl.getView(), Location.BOTTOM, false, 7, false));
+ mainView.addTab(new WarningsTab<G, A, R>("warnings", errorListView, Location.BOTTOM, false, 8, false));
+ mainView.addTab(new GameObjectTextEditorTab<G, A, R>("textEditor", new GameObjectTextEditor(archetypeTypeSet), Location.RIGHT, true, 9, false, selectedSquareModel, mapManager));
new ArchetypeValidator(animationObjects, faceObjects, errorView).validate(archetypeSet);
new AnimationValidator(faceObjects, errorView).validate(animationObjects);
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1643,6 +1643,9 @@
tabButton.lockedItems.title1=Locked Items
tabButton.lockedItems.title2={0}: Locked Items
tabButton.lockedItems.shortdescription=Display the locked items of the current map.
+tabButton.exits.title1=Exits
+tabButton.exits.title2={0}: Exits
+tabButton.exits.shortdescription=Display the exits from the current map.
tabButton.textEditor.title1=Text Editor
tabButton.textEditor.title2={0}: Text Editor
tabButton.textEditor.shortdescription=Display the game object text editor for the selected game object.
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1409,6 +1409,9 @@
tabButton.lockedItems.title1=Verriegelte Objekte
tabButton.lockedItems.title2={0}: Verriegelte Objekte
tabButton.lockedItems.shortdescription=Zeigt verriegelte T\u00fcren und Schl\u00fcssel in der aktuellen Karte.
+tabButton.exits.title1=Ausg\xE4nge
+tabButton.exits.title2={0}: Ausga\xE4nge
+tabButton.exits.shortdescription=Zeigt Ausg\xE4nge aus der aktuellen Karte.
tabButton.textEditor.title1=Text Editor
tabButton.textEditor.title2={0}: Text Editor
tabButton.textEditor.shortdescription=Zeigt den Objekt-Text des ausgew\u00e4hlten Objekts an.
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1398,6 +1398,9 @@
tabButton.lockedItems.title1=Objets verrouill\u00e9s
tabButton.lockedItems.title2={0} : Objets verrouill\u00e9s
#tabButton.lockedItems.shortdescription=
+#tabButton.exits.title1=
+#tabButton.exits.title2=
+#tabButton.exits.shortdescription=
#tabButton.textEditor.title1=
#tabButton.textEditor.title2=
#tabButton.textEditor.shortdescription=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-08-26 19:01:58 UTC (rev 8965)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-08-27 06:50:28 UTC (rev 8966)
@@ -1397,6 +1397,9 @@
#tabButton.lockedItems.title1=
#tabButton.lockedItems.title2=
#tabButton.lockedItems.shortdescription=
+#tabButton.exits.title1=
+#tabButton.exits.title2=
+#tabButton.exits.shortdescription=
#tabButton.textEditor.title1=
#tabButton.textEditor.title2=
#tabButton.textEditor.shortdescription=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-28 10:28:52
|
Revision: 8970
http://gridarta.svn.sourceforge.net/gridarta/?rev=8970&view=rev
Author: akirschbaum
Date: 2011-08-28 10:28:45 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Do not randomly mark map as modified when selection changes.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
trunk/utils/src/app/net/sf/gridarta/utils/StringUtils.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-08-28 10:14:51 UTC (rev 8969)
+++ trunk/atrinik/ChangeLog 2011-08-28 10:28:45 UTC (rev 8970)
@@ -1,3 +1,7 @@
+2011-08-28 Andreas Kirschbaum
+
+ * Do not randomly mark map as modified when selection changes.
+
2011-08-27 Andreas Kirschbaum
* Add "Exits" panel to main window. It shows all exits leading
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-08-28 10:14:51 UTC (rev 8969)
+++ trunk/crossfire/ChangeLog 2011-08-28 10:28:45 UTC (rev 8970)
@@ -1,3 +1,7 @@
+2011-08-28 Andreas Kirschbaum
+
+ * Do not randomly mark map as modified when selection changes.
+
2011-08-27 Andreas Kirschbaum
* Add "Exits" panel to main window. It shows all exits leading
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-08-28 10:14:51 UTC (rev 8969)
+++ trunk/daimonin/ChangeLog 2011-08-28 10:28:45 UTC (rev 8970)
@@ -1,3 +1,7 @@
+2011-08-28 Andreas Kirschbaum
+
+ * Do not randomly mark map as modified when selection changes.
+
2011-08-27 Andreas Kirschbaum
* Add "Exits" panel to main window. It shows all exits leading
Modified: trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2011-08-28 10:14:51 UTC (rev 8969)
+++ trunk/model/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2011-08-28 10:28:45 UTC (rev 8970)
@@ -800,8 +800,13 @@
*/
@Override
public void setObjectText(@NotNull final String objectText) {
- if (gameObjectText.getObjectText().equals(objectText)) {
- return;
+ final String oldObjectText = gameObjectText.getObjectText();
+ if (oldObjectText.length() == objectText.length()) {
+ final String oldSortedObjectText = StringUtils.sortLines(oldObjectText);
+ final String newSortedObjectText = StringUtils.sortLines(objectText);
+ if (oldSortedObjectText.equals(newSortedObjectText)) {
+ return;
+ }
}
beginGameObjectChange();
Modified: trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
===================================================================
--- trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java 2011-08-28 10:14:51 UTC (rev 8969)
+++ trunk/model/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java 2011-08-28 10:28:45 UTC (rev 8970)
@@ -19,6 +19,7 @@
package net.sf.gridarta.model.baseobject;
+import java.awt.Point;
import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.anim.TestAnimationObjects;
import net.sf.gridarta.model.archetype.TestArchetype;
@@ -28,6 +29,10 @@
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.gameobject.TestGameObject;
import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapmodel.InsertionMode;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
+import net.sf.gridarta.model.mapmodel.TopmostInsertionMode;
import net.sf.gridarta.utils.GUIUtils;
import net.sf.gridarta.utils.SystemIcons;
import org.jetbrains.annotations.NotNull;
@@ -440,6 +445,42 @@
}
/**
+ * Checks that {@link BaseObject#setObjectText(String)} ignores attribute
+ * ordering.
+ */
+ @Test
+ public void testSetObjectTextAttributeOrdering() {
+ final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> topmostInsertionMode = new TopmostInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>();
+ final TestMapModelCreator mapModelCreator = new TestMapModelCreator(false);
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapModelCreator.newMapModel(1, 1);
+ mapModel.beginTransaction("test");
+ try {
+ mapModelCreator.addGameObjectToMap(mapModel, "floor", "1", 0, 0, topmostInsertionMode);
+ } finally {
+ mapModel.endTransaction();
+ }
+ final TestGameObject gameObject = mapModel.getMapSquare(new Point(0, 0)).iterator().next();
+
+ mapModel.resetModified();
+ mapModel.beginTransaction("test");
+ try {
+ gameObject.setObjectText("a 1\nb 2\n");
+ } finally {
+ mapModel.endTransaction();
+ }
+ Assert.assertTrue(mapModel.isModified());
+
+ mapModel.resetModified();
+ mapModel.beginTransaction("test");
+ try {
+ gameObject.setObjectText("b 2\na 1\n");
+ } finally {
+ mapModel.endTransaction();
+ }
+ Assert.assertFalse(mapModel.isModified());
+ }
+
+ /**
* Checks that the {@link BaseObject#NAME} attribute of an {@link
* GameObject} contains the expected value.
* @param gameObject the game object to check
Modified: trunk/utils/src/app/net/sf/gridarta/utils/StringUtils.java
===================================================================
--- trunk/utils/src/app/net/sf/gridarta/utils/StringUtils.java 2011-08-28 10:14:51 UTC (rev 8969)
+++ trunk/utils/src/app/net/sf/gridarta/utils/StringUtils.java 2011-08-28 10:28:45 UTC (rev 8970)
@@ -19,6 +19,7 @@
package net.sf.gridarta.utils;
+import java.util.Arrays;
import java.util.regex.Pattern;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -178,4 +179,20 @@
return null;
}
+ /**
+ * Sorts newline separated lines in a string.
+ * @param string the string to sort
+ * @return the sorted string
+ */
+ @NotNull
+ public static String sortLines(@NotNull final CharSequence string) {
+ final String[] lines = PATTERN_NEWLINE.split(string, -1);
+ Arrays.sort(lines);
+ final StringBuilder sb = new StringBuilder();
+ for (final String line : lines) {
+ sb.append(line).append('\n');
+ }
+ return sb.toString();
+ }
+
} // class StringUtils
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-28 11:00:19
|
Revision: 8973
http://gridarta.svn.sourceforge.net/gridarta/?rev=8973&view=rev
Author: akirschbaum
Date: 2011-08-28 11:00:13 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Rename resource key name.
Modified Paths:
--------------
trunk/model/src/app/net/sf/gridarta/model/validation/DelegatingMapValidator.java
trunk/src/app/net/sf/gridarta/messages.properties
trunk/src/app/net/sf/gridarta/messages_de.properties
trunk/src/app/net/sf/gridarta/messages_fr.properties
trunk/src/app/net/sf/gridarta/messages_sv.properties
trunk/test-mapvalidator/atrinik/regtest.conf
trunk/test-mapvalidator/crossfire/regtest.conf
trunk/test-mapvalidator/daimonin/regtest.conf
Modified: trunk/model/src/app/net/sf/gridarta/model/validation/DelegatingMapValidator.java
===================================================================
--- trunk/model/src/app/net/sf/gridarta/model/validation/DelegatingMapValidator.java 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/model/src/app/net/sf/gridarta/model/validation/DelegatingMapValidator.java 2011-08-28 11:00:13 UTC (rev 8973)
@@ -45,7 +45,7 @@
* The default key.
*/
@NotNull
- public static final String DEFAULT_KEY = "MapValidator.All";
+ public static final String DEFAULT_KEY = "Validator.All";
/**
* Create a DelegatingMapValidator for the default key.
Modified: trunk/src/app/net/sf/gridarta/messages.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages.properties 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/src/app/net/sf/gridarta/messages.properties 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1135,7 +1135,6 @@
prefs.MainWindowMapArchPanel.dividerLocation=Specifies the layout of the main window.
prefs.mapDirectory=Maps directory.
prefs.MapSquareBottom=true=display Game Object Attribute Dialog at bottom, false=display at right side.
-prefs.MapValidator.All=Whether the map validator is enabled.
prefs.mapViewSettings.gridVisible=Whether the map grid is visible.
prefs.mapViewSettings.smoothing=Whether smoothing is active.
prefs.mapViewSettings.doubleFaces=Whether double faces are shown.
@@ -1162,6 +1161,7 @@
prefs.systemExit=If set to false, never exit the application; should always be set to true except for debugging purposes.
prefs.useImageSet=The image set to use.
prefs.username=The user name to use for new maps.
+prefs.Validator.All=Whether the map validator is enabled.
prefs.Validator.AttributeRange=Whether this map validator check is is enabled.
prefs.Validator.BlockedMobOrSpawnPoint=Whether this map validator check is is enabled.
prefs.Validator.BlockedSpawnPoint=Whether this map validator check is is enabled.
@@ -1292,8 +1292,8 @@
#################
# Map Validation
-MapValidator.All.default=true
-MapValidator.All.title=Enable this group
+Validator.All.default=true
+Validator.All.title=Enable this group
Validator.AttributeRange.default=true
Validator.AttributeRange.title=Suspicious attribute value
Modified: trunk/src/app/net/sf/gridarta/messages_de.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_de.properties 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/src/app/net/sf/gridarta/messages_de.properties 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1100,7 +1100,7 @@
#################
# Map Validation
-MapValidator.All.title=Kartenpr\u00fcfungen dieser Gruppe durchf\u00fchren
+Validator.All.title=Kartenpr\u00fcfungen dieser Gruppe durchf\u00fchren
Validator.AttributeRange.title=Fehlerhaftes Attribut
Validator.AttributeRange.msg=<html><h3>{0}</h3><p>Das Attribut "{4}" in {3} ist wahrscheinlich fehlerhaft. Der Wert ({5}) liegt nicht zwischen {6} und {7}.</p><p>Sie k\u00f6nnen:</p><ul><li>Das Problem ignorieren</li><li>Den Attributwert \u00e4ndern</li></ul>
Modified: trunk/src/app/net/sf/gridarta/messages_fr.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/src/app/net/sf/gridarta/messages_fr.properties 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1094,7 +1094,7 @@
#################
# Map Validation
-#MapValidator.All.title=
+#Validator.All.title=
#Validator.AttributeRange.title=
#Validator.AttributeRange.msg=
Modified: trunk/src/app/net/sf/gridarta/messages_sv.properties
===================================================================
--- trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/src/app/net/sf/gridarta/messages_sv.properties 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1098,7 +1098,7 @@
#################
# Map Validation
-#MapValidator.All.title=
+#Validator.All.title=
#Validator.AttributeRange.title=
#Validator.AttributeRange.msg=
Modified: trunk/test-mapvalidator/atrinik/regtest.conf
===================================================================
--- trunk/test-mapvalidator/atrinik/regtest.conf 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/test-mapvalidator/atrinik/regtest.conf 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1,9 +1,9 @@
+UpdaterAutoCheck=false
+
# Whether the map validator is enabled.
-MapValidator.All=true
+Validator.All=true
-UpdaterAutoCheck=false
-
# Whether this map validator check is is enabled.
Validator.AttributeRange=true
Modified: trunk/test-mapvalidator/crossfire/regtest.conf
===================================================================
--- trunk/test-mapvalidator/crossfire/regtest.conf 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/test-mapvalidator/crossfire/regtest.conf 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1,9 +1,9 @@
+UpdaterAutoCheck=false
+
# Whether the map validator is enabled.
-MapValidator.All=true
+Validator.All=true
-UpdaterAutoCheck=false
-
# Whether this map validator check is is enabled.
Validator.AttributeRange=true
Modified: trunk/test-mapvalidator/daimonin/regtest.conf
===================================================================
--- trunk/test-mapvalidator/daimonin/regtest.conf 2011-08-28 10:58:26 UTC (rev 8972)
+++ trunk/test-mapvalidator/daimonin/regtest.conf 2011-08-28 11:00:13 UTC (rev 8973)
@@ -1,9 +1,9 @@
+UpdaterAutoCheck=false
+
# Whether the map validator is enabled.
-MapValidator.All=true
+Validator.All=true
-UpdaterAutoCheck=false
-
# Whether this map validator check is is enabled.
Validator.AttributeRange=true
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2011-08-28 13:09:00
|
Revision: 8975
http://gridarta.svn.sourceforge.net/gridarta/?rev=8975&view=rev
Author: akirschbaum
Date: 2011-08-28 13:08:53 +0000 (Sun, 28 Aug 2011)
Log Message:
-----------
Fix incorrect contents of selected square view after deleting objects below multi-square tail parts.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelection.java
Added Paths:
-----------
trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionTest.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2011-08-28 11:02:33 UTC (rev 8974)
+++ trunk/atrinik/ChangeLog 2011-08-28 13:08:53 UTC (rev 8975)
@@ -1,5 +1,8 @@
2011-08-28 Andreas Kirschbaum
+ * Fix incorrect contents of selected square view after deleting
+ objects below multi-square tail parts.
+
* Do not randomly mark map as modified when selection changes.
2011-08-27 Andreas Kirschbaum
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2011-08-28 11:02:33 UTC (rev 8974)
+++ trunk/crossfire/ChangeLog 2011-08-28 13:08:53 UTC (rev 8975)
@@ -1,5 +1,8 @@
2011-08-28 Andreas Kirschbaum
+ * Fix incorrect contents of selected square view after deleting
+ objects below multi-square tail parts.
+
* Do not randomly mark map as modified when selection changes.
2011-08-27 Andreas Kirschbaum
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2011-08-28 11:02:33 UTC (rev 8974)
+++ trunk/daimonin/ChangeLog 2011-08-28 13:08:53 UTC (rev 8975)
@@ -1,5 +1,8 @@
2011-08-28 Andreas Kirschbaum
+ * Fix incorrect contents of selected square view after deleting
+ objects below multi-square tail parts.
+
* Do not randomly mark map as modified when selection changes.
2011-08-27 Andreas Kirschbaum
Modified: trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelection.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelection.java 2011-08-28 11:02:33 UTC (rev 8974)
+++ trunk/src/app/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelection.java 2011-08-28 13:08:53 UTC (rev 8975)
@@ -207,7 +207,15 @@
return false;
}
- return setMapSquare(gameObjectMapSquare, gameObject, 0);
+ final MapSquare<G, A, R> effectiveMapSquare;
+ if (gameObject == this.gameObject) {
+ effectiveMapSquare = mapSquare;
+ } else if (gameObject.isInContainer() && this.gameObject != null && this.gameObject.getHead().getTopContainer() == gameObject.getTopContainer()) {
+ effectiveMapSquare = mapSquare;
+ } else {
+ effectiveMapSquare = gameObjectMapSquare;
+ }
+ return setMapSquare(effectiveMapSquare, gameObject, 0);
}
/**
Added: trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionTest.java (rev 0)
+++ trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionTest.java 2011-08-28 13:08:53 UTC (rev 8975)
@@ -0,0 +1,187 @@
+/*
+ * 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.panel.selectedsquare;
+
+import java.awt.Point;
+import java.util.Iterator;
+import net.sf.gridarta.gui.map.mapview.MapView;
+import net.sf.gridarta.gui.map.mapview.MapViewFactory;
+import net.sf.gridarta.gui.map.mapview.TestMapViewFactory;
+import net.sf.gridarta.model.archetype.DuplicateArchetypeException;
+import net.sf.gridarta.model.archetype.TestArchetype;
+import net.sf.gridarta.model.gameobject.GameObject;
+import net.sf.gridarta.model.gameobject.TestGameObject;
+import net.sf.gridarta.model.maparchobject.TestMapArchObject;
+import net.sf.gridarta.model.mapcontrol.MapControl;
+import net.sf.gridarta.model.mapcontrol.TestMapControlCreator;
+import net.sf.gridarta.model.mapmodel.InsertionMode;
+import net.sf.gridarta.model.mapmodel.MapModel;
+import net.sf.gridarta.model.mapmodel.MapSquare;
+import net.sf.gridarta.model.mapmodel.TestMapModelCreator;
+import net.sf.gridarta.model.mapmodel.TopmostInsertionMode;
+import net.sf.gridarta.utils.Size2D;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Regression tests for {@link MapSquareSelection}.
+ * @author Andreas Kirschbaum
+ */
+public class MapSquareSelectionTest {
+
+ /**
+ * Checks that re-selecting an inventory object within a multi-square object
+ * retains the previously selected map square.
+ * @throws DuplicateArchetypeException if the test fails
+ */
+ @Test
+ public void testRetainMapSquare1() throws DuplicateArchetypeException {
+ final TestMapModelCreator mapModelCreator = newMapModelCreator();
+ final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> topmostInsertionMode = new TopmostInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>();
+ final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl = new TestMapControlCreator().newMapControl(null, "test", new Size2D(1, 2));
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapControl.getMapModel();
+
+ mapModel.beginTransaction("test");
+ final GameObject<TestGameObject, TestMapArchObject, TestArchetype> archHead;
+ try {
+ mapModelCreator.addGameObjectToMap(mapModel, "floor", "floor", 0, 1, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "arch", "arch", 0, 0, topmostInsertionMode);
+ archHead = mapModel.getMapSquare(new Point(0, 0)).iterator().next();
+ mapModelCreator.insertGameObject(archHead, "item", "item");
+ } finally {
+ mapModel.endTransaction();
+ }
+
+ final TestGameObject item = archHead.iterator().next();
+ final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquareTail = mapModel.getMapSquare(new Point(0, 1));
+ final MapSquareSelection<TestGameObject, TestMapArchObject, TestArchetype> mapSquareSelection = newMapSquareSelection(mapControl);
+
+ mapSquareSelection.setMapSquare(mapSquareTail, item, 0);
+ Assert.assertSame(mapSquareTail, mapSquareSelection.getMapSquare());
+ Assert.assertSame(item, mapSquareSelection.getGameObject());
+
+ mapSquareSelection.setSelectedGameObject(item);
+ Assert.assertSame(mapSquareTail, mapSquareSelection.getMapSquare());
+ Assert.assertSame(item, mapSquareSelection.getGameObject());
+ }
+
+ /**
+ * Checks that re-selecting an inventory object within a multi-square object
+ * retains the previously selected map square.
+ * @throws DuplicateArchetypeException if the test fails
+ */
+ @Test
+ public void testRetainMapSquare2() throws DuplicateArchetypeException {
+ final TestMapModelCreator mapModelCreator = newMapModelCreator();
+ final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> topmostInsertionMode = new TopmostInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>();
+ final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl = new TestMapControlCreator().newMapControl(null, "test", new Size2D(1, 2));
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapControl.getMapModel();
+
+ mapModel.beginTransaction("test");
+ final GameObject<TestGameObject, TestMapArchObject, TestArchetype> archHead;
+ try {
+ mapModelCreator.addGameObjectToMap(mapModel, "floor", "floor", 0, 1, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "arch", "arch", 0, 0, topmostInsertionMode);
+ archHead = mapModel.getMapSquare(new Point(0, 0)).iterator().next();
+ mapModelCreator.insertGameObject(archHead, "item", "item1");
+ mapModelCreator.insertGameObject(archHead, "item", "item2");
+ } finally {
+ mapModel.endTransaction();
+ }
+
+ final Iterator<TestGameObject> it = archHead.iterator();
+ final TestGameObject item1 = it.next();
+ final TestGameObject item2 = it.next();
+ final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquareTail = mapModel.getMapSquare(new Point(0, 1));
+ final MapSquareSelection<TestGameObject, TestMapArchObject, TestArchetype> mapSquareSelection = newMapSquareSelection(mapControl);
+
+ mapSquareSelection.setMapSquare(mapSquareTail, item1, 0);
+ Assert.assertSame(mapSquareTail, mapSquareSelection.getMapSquare());
+ Assert.assertSame(item1, mapSquareSelection.getGameObject());
+
+ mapSquareSelection.setSelectedGameObject(item2);
+ Assert.assertSame(mapSquareTail, mapSquareSelection.getMapSquare());
+ Assert.assertSame(item2, mapSquareSelection.getGameObject());
+ }
+
+ /**
+ * Checks that re-selecting an inventory object within a multi-square object
+ * retains the previously selected map square.
+ * @throws DuplicateArchetypeException if the test fails
+ */
+ @Test
+ public void testRetainMapSquare3() throws DuplicateArchetypeException {
+ final TestMapModelCreator mapModelCreator = newMapModelCreator();
+ final InsertionMode<TestGameObject, TestMapArchObject, TestArchetype> topmostInsertionMode = new TopmostInsertionMode<TestGameObject, TestMapArchObject, TestArchetype>();
+ final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl = new TestMapControlCreator().newMapControl(null, "test", new Size2D(1, 2));
+ final MapModel<TestGameObject, TestMapArchObject, TestArchetype> mapModel = mapControl.getMapModel();
+
+ mapModel.beginTransaction("test");
+ try {
+ mapModelCreator.addGameObjectToMap(mapModel, "floor", "floor", 0, 1, topmostInsertionMode);
+ mapModelCreator.addGameObjectToMap(mapModel, "arch", "arch", 0, 0, topmostInsertionMode);
+ } finally {
+ mapModel.endTransaction();
+ }
+
+ final MapSquare<TestGameObject, TestMapArchObject, TestArchetype> mapSquareTail = mapModel.getMapSquare(new Point(0, 1));
+ final TestGameObject archTail = mapSquareTail.iterator().next();
+ final MapSquareSelection<TestGameObject, TestMapArchObject, TestArchetype> mapSquareSelection = newMapSquareSelection(mapControl);
+
+ mapSquareSelection.setMapSquare(mapSquareTail, archTail, 0);
+ Assert.assertSame(mapSquareTail, mapSquareSelection.getMapSquare());
+ Assert.assertSame(archTail, mapSquareSelection.getGameObject());
+
+ mapSquareSelection.setSelectedGameObject(archTail);
+ Assert.assertSame(mapSquareTail, mapSquareSelection.getMapSquare());
+ Assert.assertSame(archTail, mapSquareSelection.getGameObject());
+ }
+
+ /**
+ * Creates a new {@link MapSquareSelection} instance.
+ * @param mapControl the new instance
+ * @return the new instance
+ */
+ @NotNull
+ private static MapSquareSelection<TestGameObject, TestMapArchObject, TestArchetype> newMapSquareSelection(@NotNull final MapControl<TestGameObject, TestMapArchObject, TestArchetype> mapControl) {
+ final MapViewFactory<TestGameObject, TestMapArchObject, TestArchetype> mapViewFactory = new TestMapViewFactory();
+ final MapView<TestGameObject, TestMapArchObject, TestArchetype> mapView = mapViewFactory.newMapView(mapControl, null, 0);
+ return new MapSquareSelection<TestGameObject, TestMapArchObject, TestArchetype>(mapView);
+ }
+
+ /**
+ * Creates a new {@link TestMapModelCreator} instance.
+ * @return the new instance
+ * @throws DuplicateArchetypeException if an internal error occurs
+ */
+ @NotNull
+ private static TestMapModelCreator newMapModelCreator() throws DuplicateArchetypeException {
+ final TestMapModelCreator mapModelCreator = new TestMapModelCreator(false);
+ final TestArchetype archetype = mapModelCreator.newArchetype("arch");
+ mapModelCreator.getArchetypeSet().addArchetype(archetype);
+ final TestArchetype tailArchetype = mapModelCreator.newArchetype("tail");
+ tailArchetype.setMultiX(1);
+ archetype.addTailPart(tailArchetype);
+ mapModelCreator.getArchetypeSet().addArchetype(tailArchetype);
+ return mapModelCreator;
+ }
+
+}
Property changes on: trunk/src/test/net/sf/gridarta/gui/panel/selectedsquare/MapSquareSelectionTest.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.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X