Menu
▾
▴
gridarta-commit — svn commit digest list (high traffic)
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(103) |
Jun
(121) |
Jul
(16) |
Aug
(67) |
Sep
(126) |
Oct
(161) |
Nov
(164) |
Dec
(588) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(394) |
Feb
(181) |
Mar
(131) |
Apr
(180) |
May
(255) |
Jun
(11) |
Jul
(79) |
Aug
(70) |
Sep
(274) |
Oct
(138) |
Nov
(195) |
Dec
(8) |
| 2008 |
Jan
(3) |
Feb
(142) |
Mar
(162) |
Apr
(124) |
May
(148) |
Jun
(157) |
Jul
(425) |
Aug
(373) |
Sep
(264) |
Oct
(315) |
Nov
(225) |
Dec
(6) |
| 2009 |
Jan
(67) |
Feb
(78) |
Mar
(279) |
Apr
(294) |
May
(92) |
Jun
(65) |
Jul
(134) |
Aug
(41) |
Sep
(138) |
Oct
(125) |
Nov
(126) |
Dec
(122) |
| 2010 |
Jan
(15) |
Feb
(48) |
Mar
(9) |
Apr
(195) |
May
(373) |
Jun
(507) |
Jul
(42) |
Aug
(16) |
Sep
(38) |
Oct
(81) |
Nov
(64) |
Dec
(18) |
| 2011 |
Jan
(13) |
Feb
(12) |
Mar
(39) |
Apr
(1) |
May
(2) |
Jun
(27) |
Jul
(27) |
Aug
(31) |
Sep
(14) |
Oct
(102) |
Nov
(20) |
Dec
(37) |
| 2012 |
Jan
(22) |
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(18) |
Jul
(6) |
Aug
(1) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
(1) |
Feb
(2) |
Mar
(1) |
Apr
(1) |
May
(47) |
Jun
(7) |
Jul
(107) |
Aug
|
Sep
|
Oct
(112) |
Nov
(31) |
Dec
(17) |
| 2014 |
Jan
(29) |
Feb
(111) |
Mar
(34) |
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(18) |
Dec
(10) |
|
From: <aki...@us...> - 2010-06-06 22:20:32
|
Revision: 8213
http://gridarta.svn.sourceforge.net/gridarta/?rev=8213&view=rev
Author: akirschbaum
Date: 2010-06-06 22:20:26 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Suppress warnings.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2010-06-06 22:18:17 UTC (rev 8212)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2010-06-06 22:20:26 UTC (rev 8213)
@@ -498,6 +498,7 @@
* Action method for "tile show".
* @return <code>true</code> if adjacent tiles are shown, or
* <code>false</code> if not
+ * @noinspection MethodMayBeStatic,SameReturnValue
*/
@ActionMethod
public boolean isTileShow() {
@@ -863,6 +864,7 @@
* @param gridVisible whether the grid should be visible; ignored unless
* <code>performAction</code> is set
* @return whether the action was or can be performed
+ * @noinspection SameReturnValue
*/
private boolean doGridVisible(final boolean performAction, final boolean gridVisible) {
if (performAction) {
@@ -893,6 +895,7 @@
* @param doubleFaces whether double faces should be shown; ignored unless
* <code>performAction</code> is set
* @return whether the action was or can be performed
+ * @noinspection SameReturnValue
*/
private boolean doDoubleFaces(final boolean performAction, final boolean doubleFaces) {
if (performAction) {
@@ -908,7 +911,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 // not yet implemented
+ * @noinspection MethodMayBeStatic,UnusedDeclaration,SameReturnValue
*/
private boolean doTileShow(final boolean performAction, final boolean tileShow) {
return false; // XXX: not yet implemented
@@ -956,6 +959,7 @@
* @param autoJoin whether autojoin should be enabled; ignored unless
* <code>performAction</code> is set
* @return whether the action was or can be performed
+ * @noinspection SameReturnValue
*/
private boolean doAutoJoin(final boolean performAction, final boolean autoJoin) {
if (performAction) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:18:23
|
Revision: 8212
http://gridarta.svn.sourceforge.net/gridarta/?rev=8212&view=rev
Author: akirschbaum
Date: 2010-06-06 22:18:17 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Add final modifiers.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
Modified: trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2010-06-06 22:16:57 UTC (rev 8211)
+++ trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java 2010-06-06 22:18:17 UTC (rev 8212)
@@ -117,21 +117,21 @@
private final TextAreaPainter painter;
@Nullable
- private JPopupMenu popup;
+ private final JPopupMenu popup;
- private boolean caretBlinks;
+ private final boolean caretBlinks;
private boolean caretVisible;
private boolean blink;
- private boolean editable;
+ private final boolean editable;
private int firstLine;
private int visibleLines;
- private int electricScroll;
+ private final int electricScroll;
private int horizontalOffset;
@@ -144,7 +144,7 @@
private boolean scrollBarsInitialized;
@NotNull
- private InputHandler inputHandler;
+ private final InputHandler inputHandler;
@Nullable
private SyntaxDocument document;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:14:11
|
Revision: 8210
http://gridarta.svn.sourceforge.net/gridarta/?rev=8210&view=rev
Author: akirschbaum
Date: 2010-06-06 22:14:05 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Update comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java
Modified: trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java 2010-06-06 22:13:04 UTC (rev 8209)
+++ trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java 2010-06-06 22:14:05 UTC (rev 8210)
@@ -58,6 +58,9 @@
@NotNull
private final IsoMapSquareInfo isoMapSquareInfo;
+ /**
+ * The icon for unknown squares.
+ */
@NotNull
private final ImageIcon unknownSquareIcon;
@@ -97,14 +100,12 @@
final int x = xStart - multiPositionData.getXOffset(node.getArchetype().getMultiShapeID(), tmpNode == null ? node.getArchetype().getMultiPartNr() : tmpNode.getArchetype().getMultiPartNr());
final int y = yStart - yOff + multiPositionData.getYOffset(node.getArchetype().getMultiShapeID(), tmpNode == null ? node.getArchetype().getMultiPartNr() : tmpNode.getArchetype().getMultiPartNr());
graphics2D.drawImage(img.getImage(), x, y, img.getImageObserver());
- //img.paintIcon(this, graphics, xStart - MultiPositionData.getXOffset(node.getMultiShapeID(), tmpNode == null ? node.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOff + MultiPositionData.getYOffset(node.getMultiShapeID(), tmpNode == null ? node.getMultiPartNr() : tmpNode.getMultiPartNr()));
} else {
final BaseObject<G, A, R, ?> env = node.getContainerGameObject();
if (env != null && env.getTypeNo() == spawnPointTypeNo) {
final int x = xStart - multiPositionData.getXOffset(node.getArchetype().getMultiShapeID(), tmpNode == null ? node.getArchetype().getMultiPartNr() : tmpNode.getArchetype().getMultiPartNr());
final int y = yStart - yOff + multiPositionData.getYOffset(node.getArchetype().getMultiShapeID(), tmpNode == null ? node.getArchetype().getMultiPartNr() : tmpNode.getArchetype().getMultiPartNr());
graphics2D.drawImage(img.getImage(), x, y, img.getImageObserver());
- //img.paintIcon(this, graphics, xStart - MultiPositionData.getXOffset(node.getMultiShapeID(), tmpNode == null ? node.getMultiPartNr() : tmpNode.getMultiPartNr()), yStart - yOff + MultiPositionData.getYOffset(node.getMultiShapeID(), tmpNode == null ? node.getMultiPartNr() : tmpNode.getMultiPartNr()));
}
}
} else {
@@ -112,9 +113,9 @@
if (img.getIconWidth() > isoMapSquareInfo.getXLen()) {
xOff = (img.getIconWidth() - isoMapSquareInfo.getXLen()) / 2;
}
- //img.paintIcon(this, graphics, xStart - xOff, yStart - yOff);
graphics2D.drawImage(img.getImage(), xStart - xOff, yStart - yOff, img.getImageObserver());
}
+
// Paint first object (most likely a mob) in spawn points.
if (node.getTypeNo() == spawnPointTypeNo) {
final G mob = node.getFirst();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:09:10
|
Revision: 8205
http://gridarta.svn.sourceforge.net/gridarta/?rev=8205&view=rev
Author: akirschbaum
Date: 2010-06-06 22:06:06 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Rename function name.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/FilesResourcesReader.java
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/FilesResourcesReader.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/FilesResourcesReader.java 2010-06-06 22:05:21 UTC (rev 8204)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/FilesResourcesReader.java 2010-06-06 22:06:06 UTC (rev 8205)
@@ -121,7 +121,7 @@
addPNGFace(new File(archDirectory, "dev/editor/bug.101.png").getAbsolutePath(), "/dev/editor", "bug.101.png", errorView, archFaceProvider);
final ErrorViewCollector archDirectoryErrorViewCollector = new ErrorViewCollector(errorView, archDirectory);
loadArchetypesFromFiles(archDirectoryErrorViewCollector, archetypeParser, "", archDirectory, 0, "default", "default", false, invObjects, archFaceProvider, errorView, animFiles); // load arches & images from individual files
- loadAnimsFromFiles(archDirectoryErrorViewCollector, animFiles);
+ loadAnimationsFromFiles(archDirectoryErrorViewCollector, animFiles);
if (log.isInfoEnabled()) {
log.info("Loaded " + (animationObjects.size() - animationObjectsSize) + " animations from '" + archDirectory + "'.");
}
@@ -209,7 +209,7 @@
* @param errorViewCollector the error view collector for reporting errors
* @param animFiles the animation files
*/
- private void loadAnimsFromFiles(@NotNull final ErrorViewCollector errorViewCollector, @NotNull final Iterable<Pair<String, File>> animFiles) {
+ private void loadAnimationsFromFiles(@NotNull final ErrorViewCollector errorViewCollector, @NotNull final Iterable<Pair<String, File>> animFiles) {
for (final Pair<String, File> pair : animFiles) {
final String animPath = pair.getFirst();
final File animFile = pair.getSecond();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:08:59
|
Revision: 8199
http://gridarta.svn.sourceforge.net/gridarta/?rev=8199&view=rev
Author: akirschbaum
Date: 2010-06-06 21:40:29 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Fix checkstyle issues.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
trunk/src/app/net/sf/gridarta/gui/scripts/ScriptTask.java
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-06-06 21:37:19 UTC (rev 8198)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-06-06 21:40:29 UTC (rev 8199)
@@ -135,7 +135,7 @@
try {
smoothFaces.add(new SmoothFace(tmp[0], tmp[1]));
} catch (final DuplicateSmoothFaceException ex) {
- errorViewCollector.addWarning(ErrorViewCategory.ARCHETYPE_INVALID, archetypeBuilder.getArchetypeName() + ": duplicate " + SMOOTHFACE +" '" + ex.getMessage() + "': " + line);
+ errorViewCollector.addWarning(ErrorViewCategory.ARCHETYPE_INVALID, archetypeBuilder.getArchetypeName() + ": duplicate " + SMOOTHFACE + " '" + ex.getMessage() + "': " + line);
}
} else {
errorViewCollector.addWarning(ErrorViewCategory.ARCHETYPE_INVALID, archetypeBuilder.getArchetypeName() + ": invalid " + SMOOTHFACE + " info: " + line);
Modified: trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-06 21:37:19 UTC (rev 8198)
+++ trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/GameObjectAttributesDialog.java 2010-06-06 21:40:29 UTC (rev 8199)
@@ -864,7 +864,7 @@
StyleConstants.setForeground(summaryTextStyle, Color.black);
faceObjectProviders.addFaceObjectProvidersListener(faceObjectProvidersListener);
-
+
setMessage(contentPanel);
}
Modified: trunk/src/app/net/sf/gridarta/gui/scripts/ScriptTask.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/scripts/ScriptTask.java 2010-06-06 21:37:19 UTC (rev 8198)
+++ trunk/src/app/net/sf/gridarta/gui/scripts/ScriptTask.java 2010-06-06 21:40:29 UTC (rev 8199)
@@ -19,13 +19,10 @@
package net.sf.gridarta.gui.scripts;
-import java.awt.Frame;
-import javax.swing.JList;
-import net.sf.gridarta.mapmanager.MapManager;
-
/**
* Parameter for operation to perform in {@link ScriptArchDataUtils#modifyEventScript(int,
- * int, JList, MapManager, Frame, Iterable)}.
+ * ScriptTask, javax.swing.JList, net.sf.gridarta.mapmanager.MapManager,
+ * java.awt.Frame, Iterable)}.
* @author Andreas Kirschbaum
*/
public enum ScriptTask {
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:37:19 UTC (rev 8198)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:40:29 UTC (rev 8199)
@@ -106,8 +106,8 @@
boolean inAnim = false;
String animName = null;
final StringBuilder animText = new StringBuilder();
- int lineNumber;
- for (lineNumber = 1; ; lineNumber++) {
+ int lineNumber = 1;
+ while (true) {
final String line2 = in.readLine();
if (line2 == null) {
break;
@@ -152,6 +152,8 @@
} else if (!ignoreOtherText) {
throw new AnimationParseException(startKey + "...", line, lineNumber);
}
+
+ lineNumber++;
}
if (inAnim) {
throw new AnimationParseException("mina", null, lineNumber);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:07:57
|
Revision: 8207
http://gridarta.svn.sourceforge.net/gridarta/?rev=8207&view=rev
Author: akirschbaum
Date: 2010-06-06 22:07:50 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Fix typos.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java
trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java
trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
trunk/src/app/net/sf/gridarta/model/archetype/ArchetypeParser.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-06-06 22:06:40 UTC (rev 8206)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeParser.java 2010-06-06 22:07:50 UTC (rev 8207)
@@ -193,7 +193,7 @@
*/
@Override
protected boolean addToPanel(final boolean isInternPath, @Nullable final String editorFolder, @NotNull final Archetype archetype) {
- return !isInternPath && !(editorFolder != null && editorFolder.contains(net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN)) && !archetype.getArchetypeName().equals(STARTARCH_NAME);
+ return !isInternPath && !(editorFolder != null && editorFolder.contains(net.sf.gridarta.model.gameobject.GameObject.EDITOR_FOLDER_INTERN)) && !archetype.getArchetypeName().equals(START_ARCH_NAME);
}
} // class ArchetypeParser
Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java 2010-06-06 22:06:40 UTC (rev 8206)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeParser.java 2010-06-06 22:07:50 UTC (rev 8207)
@@ -174,14 +174,14 @@
} else if (thisLine.startsWith("magicmap ")) {
errorViewCollector.addWarning(ErrorViewCategory.ARCHETYPE_INVALID, "Ignoring obsolete 'magicmap' attribute: " + archetypeBuilder.getArchetypeName());
} else if (thisLine.startsWith("x ")) {
- if (!archMore && !archetypeBuilder.getArchetypeName().equals(STARTARCH_NAME)) {
+ if (!archMore && !archetypeBuilder.getArchetypeName().equals(START_ARCH_NAME)) {
errorViewCollector.addWarning(ErrorViewCategory.ARCHETYPE_INVALID, ACTION_BUILDER.format("logFoundCoordInDefArchSingleSquareOrHead", "x", archetypeBuilder.getArchetypeName()));
archetypeBuilder.addObjectText(thisLine);
} else {
archetypeBuilder.setMultiX(Integer.parseInt(thisLine.substring(2)));
}
} else if (thisLine.startsWith("y ")) {
- if (!archMore && !archetypeBuilder.getArchetypeName().equals(STARTARCH_NAME)) {
+ if (!archMore && !archetypeBuilder.getArchetypeName().equals(START_ARCH_NAME)) {
errorViewCollector.addWarning(ErrorViewCategory.ARCHETYPE_INVALID, ACTION_BUILDER.format("logFoundCoordInDefArchSingleSquareOrHead", "y", archetypeBuilder.getArchetypeName()));
archetypeBuilder.addObjectText(thisLine);
} else {
Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java 2010-06-06 22:06:40 UTC (rev 8206)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeSet.java 2010-06-06 22:07:50 UTC (rev 8207)
@@ -277,7 +277,7 @@
continue;
}
- if (arch.getArchetypeName().equals(ArchetypeParser.STARTARCH_NAME)) {
+ if (arch.getArchetypeName().equals(ArchetypeParser.START_ARCH_NAME)) {
// process map arch
collectStartArch(arch, out);
count++;
@@ -307,7 +307,7 @@
}
/**
- * Processes the special archetype {@link ArchetypeParser#STARTARCH_NAME}.
+ * Processes the special archetype {@link ArchetypeParser#START_ARCH_NAME}.
* @param archetype the archetype
* @param out the writer collecting into
* @throws IOException if an I/O error occurs
@@ -318,7 +318,7 @@
// map object hack: x/y is normally a reference for multi
// part arches - i include this hack until we rework the
// arch objects with more useful script names
- if (archetype.getArchetypeName().equals(ArchetypeParser.STARTARCH_NAME)) {
+ if (archetype.getArchetypeName().equals(ArchetypeParser.START_ARCH_NAME)) {
out.append("x ").append(Integer.toString(archetype.getMultiX())).append('\n');
out.append("y ").append(Integer.toString(archetype.getMultiY())).append('\n');
}
Modified: trunk/src/app/net/sf/gridarta/model/archetype/ArchetypeParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/ArchetypeParser.java 2010-06-06 22:06:40 UTC (rev 8206)
+++ trunk/src/app/net/sf/gridarta/model/archetype/ArchetypeParser.java 2010-06-06 22:07:50 UTC (rev 8207)
@@ -37,11 +37,11 @@
/**
* Name of the system-archetype containing path of starting map.
*/
- String STARTARCH_NAME = "map";
+ String START_ARCH_NAME = "map";
/**
- * Here we read an Archetype from a filestream, parse the data and put the
- * result in the ArchetypeSet in CMainControl.
+ * Here we read an Archetype from a {@link BufferedReader}, parse the data
+ * and put the result in the ArchetypeSet in CMainControl.
* @param in <code>BufferedReader</code> file stream of archetype data
* @param prototype Prototype Archetype (only for artifacts)
* @param line first line, pre-parsed (only for artifacts)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:06:46
|
Revision: 8206
http://gridarta.svn.sourceforge.net/gridarta/?rev=8206&view=rev
Author: akirschbaum
Date: 2010-06-06 22:06:40 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Remove unused code.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/anim/AnimationParseException.java
Modified: trunk/src/app/net/sf/gridarta/model/anim/AnimationParseException.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/anim/AnimationParseException.java 2010-06-06 22:06:06 UTC (rev 8205)
+++ trunk/src/app/net/sf/gridarta/model/anim/AnimationParseException.java 2010-06-06 22:06:40 UTC (rev 8206)
@@ -19,9 +19,7 @@
package net.sf.gridarta.model.anim;
-import java.net.URI;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
/**
* This exception is thrown when parsing an animation definition file
@@ -38,13 +36,6 @@
private static final long serialVersionUID = 1L;
/**
- * The resource that caused the error.
- * @serial include
- */
- @Nullable
- private final URI uri;
-
- /**
* The line number that caused the error.
* @serial include
*/
@@ -58,22 +49,10 @@
*/
public AnimationParseException(@NotNull final String expected, @NotNull final String actual, final int lineNumber) {
super("Expected \"" + expected + "\", got \"" + actual + "\" in line " + lineNumber);
- uri = null;
this.lineNumber = lineNumber;
}
/**
- * Create an AnimationParseException.
- * @param cause Exception causing this exception
- * @param uri Resource containing the error
- */
- public AnimationParseException(@NotNull final AnimationParseException cause, @NotNull final URI uri) {
- super(cause.getMessage() + " of resource " + uri, cause);
- this.uri = uri;
- lineNumber = cause.lineNumber;
- }
-
- /**
* Get the number of the erroneous line.
* @return number of erroneous line
*/
@@ -81,13 +60,4 @@
return lineNumber;
}
- /**
- * Get the file that was erroneous.
- * @return erroneous file or <code>null</code> if file unknown
- */
- @Nullable
- public URI getURI() {
- return uri;
- }
-
} // class AnimationParseException
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 22:05:27
|
Revision: 8204
http://gridarta.svn.sourceforge.net/gridarta/?rev=8204&view=rev
Author: akirschbaum
Date: 2010-06-06 22:05:21 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Clean up animation parser.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:46:49 UTC (rev 8203)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 22:05:21 UTC (rev 8204)
@@ -91,11 +91,11 @@
* non-<code>null</code>
* @param animations maps animation name to animation path; either
* <code>path</code> or this parameter must be non-<code>null</code>
- * @throws IOException in case of I/O errors
* @throws AnimationParseException in case parsing the animation reveals
* errors
+ * @throws IOException in case of I/O errors
*/
- public static void loadAnimations(@NotNull final AnimationObjects animationObjects, @NotNull final ErrorViewCollector errorViewCollector, final Reader reader, @NotNull final String startKey, final boolean ignoreOtherText, @Nullable final String path, @Nullable final Map<String, String> animations) throws IOException, AnimationParseException {
+ public static void loadAnimations(@NotNull final AnimationObjects animationObjects, @NotNull final ErrorViewCollector errorViewCollector, final Reader reader, @NotNull final String startKey, final boolean ignoreOtherText, @Nullable final String path, @Nullable final Map<String, String> animations) throws AnimationParseException, IOException {
if (path == null && animations == null) {
throw new IllegalArgumentException();
}
@@ -104,9 +104,6 @@
}
final BufferedReader in = new BufferedReader(reader);
try {
- boolean inAnim = false;
- String animName = null;
- final StringBuilder animText = new StringBuilder();
int lineNumber = 1;
while (true) {
final String line2 = in.readLine();
@@ -117,50 +114,98 @@
if (line.startsWith("#") || line.length() == 0) {
/* ignore comment lines. */
} else if (line.startsWith(startKey)) {
- if (inAnim) {
- throw new AnimationParseException("mina", line, lineNumber);
- }
- inAnim = true;
- animName = line.substring(startKey.length());
- animText.setLength(0);
- } else if ("mina".equals(line)) {
- if (!inAnim) {
- throw new AnimationParseException(startKey + "...", line, lineNumber);
- }
- inAnim = false;
- final String animPath;
- if (path != null) {
- animPath = path;
- } else {
- final String tmp = animations.get(animName);
- if (tmp == null) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "no path found for animation: " + animName);
- animPath = "/" + animName;
- } else {
- animPath = tmp;
- }
- }
- try {
- animationObjects.addAnimationObject(animName, animText.toString(), animPath);
- } catch (final DuplicateAnimationException ex) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, ex.getMessage());
- } catch (final IllegalAnimationException ex) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "illegal animation: " + ex.getAnimationObject().getPath());
- }
- } else if (inAnim) {
- animText.append(line).append('\n');
+ lineNumber += processAnimation(line.substring(startKey.length()), lineNumber, in, startKey, animationObjects, errorViewCollector, path, animations);
+ } else if (line.equals("mina")) {
+ throw new AnimationParseException(startKey + "...", line2, lineNumber);
} else if (!ignoreOtherText) {
- throw new AnimationParseException(startKey + "...", line, lineNumber);
+ throw new AnimationParseException(startKey + "...", line2, lineNumber);
}
lineNumber++;
}
- if (inAnim) {
- throw new AnimationParseException("mina", "<end of file>", lineNumber);
- }
} finally {
in.close();
}
}
+ /**
+ * Processes an anim..mina block.
+ * @param animName the name of this animation
+ * @param startLineNumber the line number of the anim line
+ * @param in the reader to read from
+ * @param startKey the "anim" tag name
+ * @param animationObjects the animation objects to update
+ * @param errorViewCollector the error view collector for reporting errors
+ * @param path Path relative to the arch directory, used to create tree
+ * information; either <code>animations</code> or this parameter must be
+ * non-<code>null</code>
+ * @param animations maps animation name to animation path; either
+ * <code>path</code> or this parameter must be non-<code>null</code>
+ * @return the number of processed lines
+ * @throws AnimationParseException in case parsing the animation reveals
+ * errors
+ * @throws IOException in case of I/O errors
+ */
+ private static int processAnimation(@NotNull final String animName, final int startLineNumber, @NotNull final BufferedReader in, @NotNull final String startKey, @NotNull final AnimationObjects animationObjects, @NotNull final ErrorViewCollector errorViewCollector, @Nullable final String path, @Nullable final Map<String, String> animations) throws AnimationParseException, IOException {
+ int lineNumber = startLineNumber;
+ final StringBuilder animText = new StringBuilder();
+ while (true) {
+ lineNumber++;
+ final String line3 = in.readLine();
+ if (line3 == null) {
+ throw new AnimationParseException("mina", "<end of file>", lineNumber);
+ }
+ final String line4 = line3.trim();
+ if (line4.startsWith("#") || line4.length() == 0) {
+ /* ignore comment lines. */
+ } else if (line4.startsWith(startKey)) {
+ throw new AnimationParseException("mina", line4, lineNumber);
+ } else if ("mina".equals(line4)) {
+ processAnimationLine(animationObjects, errorViewCollector, path, animations, animName, animText.toString());
+ break;
+ } else {
+ animText.append(line4).append('\n');
+ }
+ }
+ return lineNumber - startLineNumber;
+ }
+
+ /**
+ * Processes a single line of an anim..mina block.
+ * @param animationObjects the animation objects to update
+ * @param errorViewCollector the error view collector for reporting errors
+ * @param path Path relative to the arch directory, used to create tree
+ * information; either <code>animations</code> or this parameter must be
+ * non-<code>null</code>
+ * @param animations maps animation name to animation path; either
+ * <code>path</code> or this parameter must be non-<code>null</code>
+ * @param animName the name of this animation
+ * @param animText the contents of the anim..mina block without comments
+ */
+ private static void processAnimationLine(@NotNull final AnimationObjects animationObjects, @NotNull final ErrorViewCollector errorViewCollector, @Nullable final String path, @Nullable final Map<String, String> animations, @NotNull final String animName, @NotNull final String animText) {
+ if (path == null && animations == null) {
+ throw new IllegalArgumentException();
+ }
+
+ final String animPath;
+ if (path != null) {
+ animPath = path;
+ } else {
+ final String tmp = animations.get(animName);
+ if (tmp == null) {
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "no path found for animation: " + animName);
+ animPath = "/" + animName;
+ } else {
+ animPath = tmp;
+ }
+ }
+ try {
+ animationObjects.addAnimationObject(animName, animText, animPath);
+ } catch (final DuplicateAnimationException ex) {
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, ex.getMessage());
+ } catch (final IllegalAnimationException ex) {
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "illegal animation: " + ex.getAnimationObject().getPath());
+ }
+ }
+
} // class AnimationObjectsReader
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:46:56
|
Revision: 8203
http://gridarta.svn.sourceforge.net/gridarta/?rev=8203&view=rev
Author: akirschbaum
Date: 2010-06-06 21:46:49 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Fix possible file handle leak.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:44:48 UTC (rev 8202)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:46:49 UTC (rev 8203)
@@ -102,61 +102,65 @@
if (path != null && animations != null) {
throw new IllegalArgumentException();
}
- final BufferedReader in = reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(reader);
- boolean inAnim = false;
- String animName = null;
- final StringBuilder animText = new StringBuilder();
- int lineNumber = 1;
- while (true) {
- final String line2 = in.readLine();
- if (line2 == null) {
- break;
- }
- final String line = line2.trim();
- if (line.startsWith("#") || line.length() == 0) {
- /* ignore comment lines. */
- } else if (line.startsWith(startKey)) {
- if (inAnim) {
- throw new AnimationParseException("mina", line, lineNumber);
+ final BufferedReader in = new BufferedReader(reader);
+ try {
+ boolean inAnim = false;
+ String animName = null;
+ final StringBuilder animText = new StringBuilder();
+ int lineNumber = 1;
+ while (true) {
+ final String line2 = in.readLine();
+ if (line2 == null) {
+ break;
}
- inAnim = true;
- animName = line.substring(startKey.length());
- animText.setLength(0);
- } else if ("mina".equals(line)) {
- if (!inAnim) {
- throw new AnimationParseException(startKey + "...", line, lineNumber);
- }
- inAnim = false;
- final String animPath;
- if (path != null) {
- animPath = path;
- } else {
- final String tmp = animations.get(animName);
- if (tmp == null) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "no path found for animation: " + animName);
- animPath = "/" + animName;
+ final String line = line2.trim();
+ if (line.startsWith("#") || line.length() == 0) {
+ /* ignore comment lines. */
+ } else if (line.startsWith(startKey)) {
+ if (inAnim) {
+ throw new AnimationParseException("mina", line, lineNumber);
+ }
+ inAnim = true;
+ animName = line.substring(startKey.length());
+ animText.setLength(0);
+ } else if ("mina".equals(line)) {
+ if (!inAnim) {
+ throw new AnimationParseException(startKey + "...", line, lineNumber);
+ }
+ inAnim = false;
+ final String animPath;
+ if (path != null) {
+ animPath = path;
} else {
- animPath = tmp;
+ final String tmp = animations.get(animName);
+ if (tmp == null) {
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "no path found for animation: " + animName);
+ animPath = "/" + animName;
+ } else {
+ animPath = tmp;
+ }
}
+ try {
+ animationObjects.addAnimationObject(animName, animText.toString(), animPath);
+ } catch (final DuplicateAnimationException ex) {
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, ex.getMessage());
+ } catch (final IllegalAnimationException ex) {
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "illegal animation: " + ex.getAnimationObject().getPath());
+ }
+ } else if (inAnim) {
+ animText.append(line).append('\n');
+ } else if (!ignoreOtherText) {
+ throw new AnimationParseException(startKey + "...", line, lineNumber);
}
- try {
- animationObjects.addAnimationObject(animName, animText.toString(), animPath);
- } catch (final DuplicateAnimationException ex) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, ex.getMessage());
- } catch (final IllegalAnimationException ex) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "illegal animation: " + ex.getAnimationObject().getPath());
- }
- } else if (inAnim) {
- animText.append(line).append('\n');
- } else if (!ignoreOtherText) {
- throw new AnimationParseException(startKey + "...", line, lineNumber);
+
+ lineNumber++;
}
-
- lineNumber++;
+ if (inAnim) {
+ throw new AnimationParseException("mina", "<end of file>", lineNumber);
+ }
+ } finally {
+ in.close();
}
- if (inAnim) {
- throw new AnimationParseException("mina", "<end of file>", lineNumber);
- }
}
} // class AnimationObjectsReader
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:44:57
|
Revision: 8202
http://gridarta.svn.sourceforge.net/gridarta/?rev=8202&view=rev
Author: akirschbaum
Date: 2010-06-06 21:44:48 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Fix possible @NotNull violation.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:43:55 UTC (rev 8201)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:44:48 UTC (rev 8202)
@@ -155,7 +155,7 @@
lineNumber++;
}
if (inAnim) {
- throw new AnimationParseException("mina", null, lineNumber);
+ throw new AnimationParseException("mina", "<end of file>", lineNumber);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:44:01
|
Revision: 8201
http://gridarta.svn.sourceforge.net/gridarta/?rev=8201&view=rev
Author: akirschbaum
Date: 2010-06-06 21:43:55 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Do not ignore caught exception.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:43:08 UTC (rev 8200)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:43:55 UTC (rev 8201)
@@ -142,7 +142,7 @@
try {
animationObjects.addAnimationObject(animName, animText.toString(), animPath);
} catch (final DuplicateAnimationException ex) {
- errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "duplicate animation: " + animName);
+ errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, ex.getMessage());
} catch (final IllegalAnimationException ex) {
errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "illegal animation: " + ex.getAnimationObject().getPath());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:43:15
|
Revision: 8200
http://gridarta.svn.sourceforge.net/gridarta/?rev=8200&view=rev
Author: akirschbaum
Date: 2010-06-06 21:43:08 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Remove statically checkable assertion.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:40:29 UTC (rev 8199)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:43:08 UTC (rev 8200)
@@ -131,7 +131,6 @@
if (path != null) {
animPath = path;
} else {
- assert animations != null;
final String tmp = animations.get(animName);
if (tmp == null) {
errorViewCollector.addWarning(ErrorViewCategory.ANIMATIONS_ENTRY_INVALID, "no path found for animation: " + animName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:37:25
|
Revision: 8198
http://gridarta.svn.sourceforge.net/gridarta/?rev=8198&view=rev
Author: akirschbaum
Date: 2010-06-06 21:37:19 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Remove nested assignment.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:35:36 UTC (rev 8197)
+++ trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java 2010-06-06 21:37:19 UTC (rev 8198)
@@ -106,9 +106,12 @@
boolean inAnim = false;
String animName = null;
final StringBuilder animText = new StringBuilder();
- String line2;
int lineNumber;
- for (lineNumber = 1; (line2 = in.readLine()) != null; lineNumber++) {
+ for (lineNumber = 1; ; lineNumber++) {
+ final String line2 = in.readLine();
+ if (line2 == null) {
+ break;
+ }
final String line = line2.trim();
if (line.startsWith("#") || line.length() == 0) {
/* ignore comment lines. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:35:42
|
Revision: 8197
http://gridarta.svn.sourceforge.net/gridarta/?rev=8197&view=rev
Author: akirschbaum
Date: 2010-06-06 21:35:36 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Clean up regression test.
Modified Paths:
--------------
trunk/src/test/net/sf/gridarta/gui/map/cursor/MapCursorTest.java
Modified: trunk/src/test/net/sf/gridarta/gui/map/cursor/MapCursorTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/map/cursor/MapCursorTest.java 2010-06-06 21:08:34 UTC (rev 8196)
+++ trunk/src/test/net/sf/gridarta/gui/map/cursor/MapCursorTest.java 2010-06-06 21:35:36 UTC (rev 8197)
@@ -27,49 +27,52 @@
import net.sf.gridarta.utils.CommonConstants;
import net.sf.gridarta.utils.Size2D;
import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.junit.AfterClass;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
* Unit test for {@link MapCursor}.
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author <a href="mailto:dlv...@gm...">Daniel Viegas</a>
+ * @author Andreas Kirschbaum
*/
-public class MapCursorTest implements MapCursorListener {
+public class MapCursorTest {
- @Nullable
- private static MapCursor cursor;
-
+ /**
+ * The size of the map grid for the tested cursor.
+ */
+ @NotNull
private static final Size2D gridSize = new Size2D(6, 7);
- private static final MapGrid grid = new MapGrid(gridSize);
+ /**
+ * A {@link MapCursorListener} that counts the number of callbacks.
+ */
+ @NotNull
+ private static final TestMapCursorListener listener = new TestMapCursorListener();
- private static int changedPosCounter = 0;
-
- private static int changedModeCounter = 0;
-
- @BeforeClass
- public static void createCursor() {
- cursor = new MapCursor(grid);
- final MapCursorListener listener = new MapCursorTest();
+ /**
+ * Creates a new {@link MapCursor} instance. No more than one instance may
+ * exist concurrently.
+ * @param grid the underlying map grid
+ * @return the new map cursor instance
+ */
+ @NotNull
+ public static MapCursor createCursor(@NotNull final MapGrid grid) {
+ final MapCursor cursor = new MapCursor(grid);
cursor.addMapCursorListener(listener);
Assert.assertFalse("MapCursor has to be disabled when created.", cursor.isActive());
+ listener.changedPosCounter = 0;
+ listener.changedModeCounter = 0;
+ return cursor;
}
- @Before
- public void deactivateCursor() {
- cursor.deactivate();
- Assert.assertFalse("MapCursor should be deactivated", cursor.isActive());
- changedPosCounter = 0;
- changedModeCounter = 0;
- }
-
+ /**
+ * Checks that settings the cursor outside of the grid behaves as expected.
+ */
@Test
public void setOutside() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
final Point p = new Point();
for (int i = -2; i < gridSize.getWidth() + 2; i++) {
p.setLocation(i, -1);
@@ -105,8 +108,13 @@
}
}
+ /**
+ * Checks that settings the cursor within the map grid behaves as expected.
+ */
@Test
public void setInside() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
boolean first = true;
final Point p = new Point();
for (int j = 0; j < gridSize.getHeight(); j++) {
@@ -129,8 +137,14 @@
}
}
+ /**
+ * Checks that settings the cursor to the same location does not generate
+ * excess events.
+ */
@Test
public void setSameLocation() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
final Point p = new Point(-1, -1);
Assert.assertFalse("setLocation(null) should return false", cursor.setLocation(null));
testEvents(0, 0);
@@ -156,8 +170,13 @@
testEvents(0, 0);
}
+ /**
+ * Checks {@link MapCursor#setLocationSafe(Point)}.
+ */
@Test
public void setLocationSafe() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
final Point p = new Point(-1, -1);
Assert.assertFalse("setLocationSafe(null) should return false", cursor.setLocationSafe(null));
testEvents(0, 0);
@@ -187,8 +206,13 @@
testEvents(0, 0);
}
+ /**
+ * Checks {@link MapCursor#isOnGrid(Point)}.
+ */
@Test
public void testIsOnGrid() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
final Point p = new Point();
for (int j = -2; j < gridSize.getHeight() + 2; j++) {
for (int i = -2; i < gridSize.getWidth() + 2; i++) {
@@ -203,8 +227,13 @@
Assert.assertFalse("Null should not be on the grid.", cursor.isOnGrid(null));
}
+ /**
+ * Checks {@link MapCursor#goTo(int)}.
+ */
@Test
public void testGoTo() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
for (int dir = 0; dir < 8; dir++) {
Assert.assertFalse("go(" + dir + ") should return false.", cursor.goTo(dir));
testEvents(0, 0);
@@ -223,8 +252,13 @@
Assert.assertEquals("Moving in a circle.", pStart, cursor.getLocation());
}
+ /**
+ * Checks the dragging related functions of {@link MapCursor}.
+ */
@Test
public void dragging() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
Assert.assertFalse("MapCursor should not drag while deactivated.", cursor.isDragging());
cursor.dragStart();
testEvents(0, 0);
@@ -248,17 +282,26 @@
cursor.dragStart();
testEvents(0, 1);
Assert.assertEquals("Wrong offset", offset, cursor.getDragOffset());
- dragTo(CommonConstants.WEST, dragStart, p, offset);
- dragTo(CommonConstants.EAST, dragStart, p, offset);
- dragTo(CommonConstants.EAST, dragStart, p, offset);
- dragTo(CommonConstants.NORTH_WEST, dragStart, p, offset);
- dragTo(CommonConstants.SOUTH, dragStart, p, offset);
- dragTo(CommonConstants.SOUTH, dragStart, p, offset);
- dragTo(CommonConstants.WEST, dragStart, p, offset);
- dragTo(CommonConstants.NORTH_EAST, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.WEST, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.EAST, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.EAST, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.NORTH_WEST, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.SOUTH, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.SOUTH, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.WEST, dragStart, p, offset);
+ dragTo(cursor, grid, CommonConstants.NORTH_EAST, dragStart, p, offset);
}
- private static void dragTo(final int dir, final Point start, final Point p, final Dimension offset) {
+ /**
+ * Calls {@link MapCursor#dragTo(Point)} and checks for expected results.
+ * @param cursor the map cursor to affect
+ * @param grid the associated map grid
+ * @param dir the direction to drag
+ * @param start the starting location
+ * @param p the destination location
+ * @param offset the expected dragging offset
+ */
+ private static void dragTo(@NotNull final MapCursor cursor, @NotNull final MapGrid grid, final int dir, @NotNull final Point start, @NotNull final Point p, @NotNull final Dimension offset) {
final Point d = new Point(MapCursor.direction[dir][0], MapCursor.direction[dir][1]);
p.x += d.x;
p.y += d.y;
@@ -269,10 +312,17 @@
offset.width = p.x - start.x;
offset.height = p.y - start.y;
Assert.assertEquals("Wrong offset", offset, cursor.getDragOffset());
- assertPreSelection(start, p);
+ assertPreSelection(grid, start, p);
}
- private static void assertPreSelection(final Point start, final Point end) {
+ /**
+ * Checks that a {@link MapGrid} includes a rectangle of {@link
+ * MapGrid#GRID_FLAG_SELECTING}.
+ * @param grid the map grid to check
+ * @param start one corner of the rectangle
+ * @param end the diagonally opposite corner of the rectangle
+ */
+ private static void assertPreSelection(@NotNull final MapGrid grid, @NotNull final Point start, @NotNull final Point end) {
final int minX = Math.min(start.x, end.x);
final int maxX = Math.max(start.x, end.x);
final int minY = Math.min(start.y, end.y);
@@ -293,7 +343,16 @@
}
}
- private static void assertSelection(final Point start, final Point end, final boolean flag) {
+ /**
+ * Checks that a {@link MapGrid} includes a rectangle of {@link
+ * MapGrid#GRID_FLAG_SELECTION}. Squares outside the rectangle are not
+ * checked.
+ * @param grid the map grid to check
+ * @param start one corner of the rectangle
+ * @param end the diagonally opposite corner of the rectangle
+ * @param flag the expected selection state
+ */
+ private static void assertSelection(@NotNull final MapGrid grid, @NotNull final Point start, @NotNull final Point end, final boolean flag) {
final int minX = Math.min(start.x, end.x);
final int maxX = Math.max(start.x, end.x);
final int minY = Math.min(start.y, end.y);
@@ -302,12 +361,17 @@
for (int i = minX; i <= maxX; i++) {
Assert.assertSame("Selection", flag, (grid.getFlags(i, j) & MapGrid.GRID_FLAG_SELECTION) > 0);
}
-
}
}
+ /**
+ * Checks for correct behavior of {@link MapGrid#GRID_FLAG_SELECTING} flags
+ * during selecting.
+ */
@Test
public void selecting() {
+ final MapGrid grid = new MapGrid(gridSize);
+ final MapCursor cursor = createCursor(grid);
final Point start = new Point(2, 3);
final Point end = new Point(4, 5);
final Point gridMaxIndex = new Point(gridSize.getWidth() - 1, gridSize.getHeight() - 1);
@@ -340,12 +404,12 @@
cursor.dragTo(end);
testEvents(1, 0);
Assert.assertTrue("MapCursor should be in drag mode.", cursor.isDragging());
- assertSelection(new Point(0, 0), gridMaxIndex, false);
+ assertSelection(grid, new Point(0, 0), gridMaxIndex, false);
cursor.dragSelect(SelectionMode.ADD);
testEvents(0, 1);
- assertSelection(start, end, true);
+ assertSelection(grid, start, end, true);
//Check if nothing is preselected
- assertPreSelection(new Point(-1, -1), new Point(-1, -1));
+ assertPreSelection(grid, new Point(-1, -1), new Point(-1, -1));
cursor.setLocation(start);
testEvents(1, 0);
cursor.dragStart();
@@ -354,7 +418,7 @@
testEvents(1, 0);
cursor.dragSelect(SelectionMode.SUB);
testEvents(0, 1);
- assertSelection(new Point(0, 0), gridMaxIndex, false);
+ assertSelection(grid, new Point(0, 0), gridMaxIndex, false);
cursor.setLocation(start);
testEvents(1, 0);
cursor.dragStart();
@@ -363,7 +427,7 @@
testEvents(1, 0);
cursor.dragSelect(SelectionMode.FLIP);
testEvents(0, 1);
- assertSelection(start, end, true);
+ assertSelection(grid, start, end, true);
start.setLocation(3, 4);
end.setLocation(5, 1);
cursor.setLocation(start);
@@ -374,43 +438,66 @@
testEvents(1, 0);
cursor.dragSelect(SelectionMode.FLIP);
testEvents(0, 1);
- assertSelection(start, new Point(4, 4), false);
- assertSelection(new Point(3, 2), end, true);
- assertSelection(new Point(5, 3), new Point(5, 4), true);
+ assertSelection(grid, start, new Point(4, 4), false);
+ assertSelection(grid, new Point(3, 2), end, true);
+ assertSelection(grid, new Point(5, 3), new Point(5, 4), true);
cursor.deactivate();
testEvents(1, 1);
- assertSelection(new Point(0, 0), gridMaxIndex, false);
+ assertSelection(grid, new Point(0, 0), gridMaxIndex, false);
}
- @AfterClass
- public static void deleteCursor() {
- cursor = null;
- }
-
- @Override
- public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
- changedPosCounter++;
- }
-
- @Override
- public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
- changedModeCounter++;
- }
-
/**
- * Test if number of events fired is correct.
- * @param nPos number of position events.
- * @param nMode number of mode events.
+ * Checks if the number of events fired is correct.
+ * @param nPos the expected number of position events
+ * @param nMode the expected number of mode events
*/
private static void testEvents(final int nPos, final int nMode) {
- Assert.assertEquals("Position change event", nPos, changedPosCounter);
- changedPosCounter = 0;
- Assert.assertEquals("Mode change event", nMode, changedModeCounter);
- changedModeCounter = 0;
+ Assert.assertEquals("Position change event", nPos, listener.changedPosCounter);
+ listener.changedPosCounter = 0;
+ Assert.assertEquals("Mode change event", nMode, listener.changedModeCounter);
+ listener.changedModeCounter = 0;
}
+ /**
+ * Returns a new test suite containing this test.
+ * @return the new test suite
+ */
+ @NotNull
public static junit.framework.Test suite() {
return new JUnit4TestAdapter(MapCursorTest.class);
}
+ /**
+ * A {@link MapCursorListener} that counts the number of event callbacks.
+ */
+ private static class TestMapCursorListener implements MapCursorListener {
+
+ /**
+ * The number of calls to {@link #mapCursorChangedPos(MapCursorEvent)}.
+ */
+ private int changedPosCounter = 0;
+
+ /**
+ * The number of calls to {@link #mapCursorChangedMode(MapCursorEvent)}.
+ */
+ private int changedModeCounter = 0;
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void mapCursorChangedPos(@NotNull final MapCursorEvent e) {
+ changedPosCounter++;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void mapCursorChangedMode(@NotNull final MapCursorEvent e) {
+ changedModeCounter++;
+ }
+
+ } // class TestMapCursorListener
+
} // class MapCursorTest
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:08:41
|
Revision: 8196
http://gridarta.svn.sourceforge.net/gridarta/?rev=8196&view=rev
Author: akirschbaum
Date: 2010-06-06 21:08:34 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Suppress warning.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-06 21:07:39 UTC (rev 8195)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-06 21:08:34 UTC (rev 8196)
@@ -127,6 +127,8 @@
final int emy = 1 + dy[i];
if (layerNode[emx][emy] == null || layerNode[emx][emy].getAttributeInt("smoothlevel", true) <= level) {
sLevels[i] = 0;
+ //false warning: cannot annotate with @Nullable
+ //noinspection AssignmentToNull
sFaces[i] = null; /*black picture*/
} else {
sLevels[i] = layerNode[emx][emy].getAttributeInt("smoothlevel", true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:07:45
|
Revision: 8195
http://gridarta.svn.sourceforge.net/gridarta/?rev=8195&view=rev
Author: akirschbaum
Date: 2010-06-06 21:07:39 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Suppress warnings.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/MapSquare.java
Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java 2010-06-06 21:04:53 UTC (rev 8194)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.java 2010-06-06 21:07:39 UTC (rev 8195)
@@ -130,6 +130,7 @@
/**
* Finishes archetype construction.
* @return the constructed archetype
+ * @noinspection TypeMayBeWeakened
*/
@NotNull
public R finish() {
Modified: trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java 2010-06-06 21:04:53 UTC (rev 8194)
+++ trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java 2010-06-06 21:07:39 UTC (rev 8195)
@@ -104,6 +104,9 @@
return 0;
}
+ /**
+ * @noinspection TypeMayBeWeakened
+ */
@NotNull
public R getArchetype(final int index) {
return archetypes.get(index);
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/MapSquare.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/MapSquare.java 2010-06-06 21:04:53 UTC (rev 8194)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/MapSquare.java 2010-06-06 21:07:39 UTC (rev 8195)
@@ -162,6 +162,7 @@
* @param gameObjectMatcher the matcher to use
* @return the game object after the last match, or <code>null</code> if no
* such game object exists
+ * @noinspection TypeMayBeWeakened
*/
@Nullable
public G getAfterLast(@NotNull final GameObjectMatcher gameObjectMatcher) {
@@ -180,6 +181,7 @@
* @param gameObjectMatcher the matcher to use
* @return the first match, or <code>null</code> if no such game object
* exists
+ * @noinspection TypeMayBeWeakened
*/
@Nullable
public G getFirst(@NotNull final GameObjectMatcher gameObjectMatcher) {
@@ -197,6 +199,7 @@
* @param gameObjectMatcher the matcher to use
* @return the game object before the first match, or <code>null</code> if
* no such game object exists
+ * @noinspection TypeMayBeWeakened
*/
@Nullable
public G getBeforeFirst(@NotNull final GameObjectMatcher gameObjectMatcher) {
@@ -216,6 +219,7 @@
* @param gameObjectMatcher the matcher to use
* @return the result or <code>null</code> if the first game object does not
* match <code>gameObjectMatcher</code>
+ * @noinspection TypeMayBeWeakened
*/
@Nullable
public G getLastOfLeadingSpan(@NotNull final GameObjectMatcher gameObjectMatcher) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:04:59
|
Revision: 8194
http://gridarta.svn.sourceforge.net/gridarta/?rev=8194&view=rev
Author: akirschbaum
Date: 2010-06-06 21:04:53 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Weaken types.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/archetypechooser/DirectionPane.java
trunk/src/app/net/sf/gridarta/model/filter/FilterParser.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java
trunk/src/app/net/sf/gridarta/script/ScriptExecutor.java
Modified: trunk/src/app/net/sf/gridarta/gui/archetypechooser/DirectionPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/archetypechooser/DirectionPane.java 2010-06-06 21:01:10 UTC (rev 8193)
+++ trunk/src/app/net/sf/gridarta/gui/archetypechooser/DirectionPane.java 2010-06-06 21:04:53 UTC (rev 8194)
@@ -25,6 +25,7 @@
import net.sf.gridarta.model.archetypechooser.ArchetypeChooserModel;
import net.sf.gridarta.model.archetypechooser.ArchetypeChooserModelListener;
import net.sf.gridarta.model.archetypechooser.ArchetypeChooserPanel;
+import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import org.jetbrains.annotations.NotNull;
@@ -99,10 +100,10 @@
/**
* Enables/disables the direction buttons for a given archetype.
- * @param archetype the archetype to check
+ * @param baseObject the archetype to check
*/
- private void updateEnabled(@Nullable final Archetype<?, ?, ?> archetype) {
- updateEnabled(archetype != null && archetype.usesDirection());
+ private void updateEnabled(@Nullable final BaseObject<?, ?, ?, ?> baseObject) {
+ updateEnabled(baseObject != null && baseObject.usesDirection());
}
/**
Modified: trunk/src/app/net/sf/gridarta/model/filter/FilterParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/filter/FilterParser.java 2010-06-06 21:01:10 UTC (rev 8193)
+++ trunk/src/app/net/sf/gridarta/model/filter/FilterParser.java 2010-06-06 21:04:53 UTC (rev 8194)
@@ -149,7 +149,7 @@
* @return the exported settings
*/
@NotNull
- public Element toXML(@NotNull final FilterConfig<?, ?> filterConfig) {
+ public Content toXML(@NotNull final FilterConfig<?, ?> filterConfig) {
final Element prevElement = element;
try {
element = null;
Modified: trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java 2010-06-06 21:01:10 UTC (rev 8193)
+++ trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java 2010-06-06 21:04:53 UTC (rev 8194)
@@ -22,6 +22,7 @@
import java.util.Enumeration;
import java.util.List;
import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.MutableTreeNode;
import net.sf.japi.util.EnumerationIterator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -56,7 +57,7 @@
* Return a new cloned instance of this object.
* @return a new cloned instance of this object
*/
- public TreasureTreeNode getClone(final boolean processSecondLinking, @Nullable final List<TreasureTreeNode> needSecondLink) {
+ public MutableTreeNode getClone(final boolean processSecondLinking, @Nullable final List<TreasureTreeNode> needSecondLink) {
// clone this object
final TreasureTreeNode clone = new TreasureTreeNode(content);
Modified: trunk/src/app/net/sf/gridarta/script/ScriptExecutor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/ScriptExecutor.java 2010-06-06 21:01:10 UTC (rev 8193)
+++ trunk/src/app/net/sf/gridarta/script/ScriptExecutor.java 2010-06-06 21:04:53 UTC (rev 8194)
@@ -179,7 +179,7 @@
} catch (final EvalError e) {
throw new ScriptExecException("evaluation error: " + e.getMessage());
}
- final BshThread<G, A, R> scriptThread = new BshThread<G, A, R>(script.getName(), script, runner);
+ final Thread scriptThread = new BshThread<G, A, R>(script.getName(), script, runner);
scriptThread.start();
return scriptThread;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 21:01:17
|
Revision: 8193
http://gridarta.svn.sourceforge.net/gridarta/?rev=8193&view=rev
Author: akirschbaum
Date: 2010-06-06 21:01:10 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Add @NotNull/@Nullable annotations.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
Modified: trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java 2010-06-06 20:49:51 UTC (rev 8192)
+++ trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java 2010-06-06 21:01:10 UTC (rev 8193)
@@ -29,19 +29,24 @@
import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
public class ArchComboBoxModel<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends AbstractListModel implements ComboBoxModel {
+ @Nullable
private Object value = null;
+ @NotNull
private final Archetype<G, A, R>[] archList; /*the current list*/
// FIXME: This constant looks pretty pointless.
+ @NotNull
private static final String CURRENT_FILTER = "";
private static final long serialVersionUID = 1L;
- public ArchComboBoxModel(final ArchetypeSet<G, A, R> archetypeSet) {
+ public ArchComboBoxModel(@NotNull final ArchetypeSet<G, A, R> archetypeSet) {
final Collection<R> archetypes = archetypeSet.getArchetypes();
archList = archetypes.toArray((Archetype<G, A, R>[]) new Archetype<?, ?, ?>[archetypes.size()]);
Arrays.sort(archList, new Comparator<Archetype<G, A, R>>() {
@@ -52,6 +57,7 @@
});
}
+ @Nullable
@Override
public Object getSelectedItem() {
return value;
@@ -67,12 +73,13 @@
return archList.length;
}
+ @NotNull
@Override
public Object getElementAt(final int index) {
return archList[index];
}
- public void setFilter(final String filter) {
+ public void setFilter(@NotNull final String filter) {
if (filter.startsWith(CURRENT_FILTER)) {
narrowFilter(filter);
} else if (CURRENT_FILTER.startsWith(filter)) {
@@ -85,7 +92,7 @@
fireContentsChanged(this, 0, archList.length);
}
- private static int getCommonPrefix(final CharSequence s1, final CharSequence s2) {
+ private static int getCommonPrefix(@NotNull final CharSequence s1, @NotNull final CharSequence s2) {
int i = 0;
while (s1.length() > i && s2.length() > i && s1.charAt(i) == s2.charAt(i)) {
i++;
@@ -93,15 +100,16 @@
return i;
}
- private void enlargeFilter(final String filter) {
+ private void enlargeFilter(@NotNull final String filter) {
// "abcd" -> "abc"
}
- private void narrowFilter(final String filter) {
+ private void narrowFilter(@NotNull final String filter) {
// "abc" -> "abcd"
}
- public Archetype<G, A, R> getNearestMatch(final String name) {
+ @NotNull
+ public Archetype<G, A, R> getNearestMatch(@NotNull final String name) {
int pos = Arrays.binarySearch(archList, name, new Comparator<Object>() {
@Override
public int compare(final Object o1, final Object o2) {
Modified: trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java 2010-06-06 20:49:51 UTC (rev 8192)
+++ trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java 2010-06-06 21:01:10 UTC (rev 8193)
@@ -44,6 +44,7 @@
/**
* The Logger for printing log messages.
*/
+ @NotNull
private static final Category log = Logger.getLogger(AutojoinList.class);
/**
@@ -66,6 +67,7 @@
//means: 0, N, E, NE, S, NS, ES, NES, W, WN, WE, WNE, SW, SWN, ESW, NESW
// (0 = no connection, N = north, E = east, S = south, W = west)
+ @NotNull
private final List<R> archetypes;
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 20:49:58
|
Revision: 8192
http://gridarta.svn.sourceforge.net/gridarta/?rev=8192&view=rev
Author: akirschbaum
Date: 2010-06-06 20:49:51 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Fix typos.
Modified Paths:
--------------
trunk/INSTALL
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/crossfire/ChangeLog.old
trunk/daimonin/ChangeLog
trunk/gridarta.ipr
trunk/src/doc/dev/changelog.xslt
trunk/src/doc/dev/typeParameters.xhtml
trunk/src/doc/ref/GameObjectMatcher.xhtml
trunk/src/doc/sitestyle.css
Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/INSTALL 2010-06-06 20:49:51 UTC (rev 8192)
@@ -19,8 +19,8 @@
* Java Runtime Environment 5.0 or newer
-Howto Build
------------
+How to Build
+------------
Change to the directory of the version you want to build and run "ant".
To find out options about building Gridarta, run "ant -projecthelp".
@@ -37,14 +37,14 @@
ant
-Howto Run
----------
+How to Run
+----------
java -jar AtrinikEditor.jar
java -jar CrossfireEditor.jar
java -jar DaimoninEditor.jar
-Howto Generate Documentation (Javadoc)
---------------------------------------
+How to Generate Documentation (Javadoc)
+---------------------------------------
Change to the main directory and run "ant javadoc". The documentation will be
placed in dest/doc/api/.
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/atrinik/ChangeLog 2010-06-06 20:49:51 UTC (rev 8192)
@@ -2,7 +2,7 @@
* Drop recent menu entries for maps with non-existent map files.
- * Do not flag tail parts of monsters in shops as "pait items".
+ * Do not flag tail parts of monsters in shops as "paid items".
* Fix "reload faces".
@@ -75,7 +75,7 @@
* Do not event objects having incorrect parameters when loading
maps.
- * Implement #1717845 (Multitile paste) as File|Paste Tiled: paste
+ * Implement #1717845 (Multi-square paste) as File|Paste Tiled: paste
the copy buffer into the selection. If the selection is larger
than the copy buffer, tiling happens.
@@ -118,7 +118,7 @@
* Implement #2385930 (Alert when adding items in to a shop): add
new map validator "Shop square contains paid item" that checks for
- shop sqaures that contain at least one paid item.
+ shop squares that contain at least one paid item.
2010-05-13 Andreas Kirschbaum
@@ -349,8 +349,8 @@
2009-09-25 Andreas Kirschbaum
- * Implement #2861454 (object filtering to work on invs): Add <Env>
- element to GameObjectMatchers.
+ * Implement #2861454 (object filtering to work on inventories):
+ Add <Env> element to GameObjectMatchers.
2009-09-21 Andreas Kirschbaum
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/crossfire/ChangeLog 2010-06-06 20:49:51 UTC (rev 8192)
@@ -2,7 +2,7 @@
* Drop recent menu entries for maps with non-existent map files.
- * Do not flag tail parts of monsters in shops as "pait items".
+ * Do not flag tail parts of monsters in shops as "paid items".
* Fix "reload faces".
@@ -65,7 +65,7 @@
* Do not remove event objects having incorrect parameters when
loading maps.
- * Implement #1717845 (Multitile paste) as File|Paste Tiled: paste
+ * Implement #1717845 (Multi-square paste) as File|Paste Tiled: paste
the copy buffer into the selection. If the selection is larger
than the copy buffer, tiling happens.
@@ -106,7 +106,7 @@
* Implement #2385930 (Alert when adding items in to a shop): add
new map validator "Shop square contains paid item" that checks for
- shop sqaures that contain at least one paid item.
+ shop squares that contain at least one paid item.
2010-05-13 Andreas Kirschbaum
@@ -340,8 +340,8 @@
* Add map validator "Shop tile allows magic and/or prayers":
reports shop tiles that allow casting spells or prayers.
- * Implement #2861454 (object filtering to work on invs): Add <Env>
- element to GameObjectMatchers.
+ * Implement #2861454 (object filtering to work on inventories):
+ Add <Env> element to GameObjectMatchers.
2009-09-21 Andreas Kirschbaum
@@ -479,7 +479,7 @@
* Fix possible NullPointerException while parsing types.xml.
- * Remove support for doublelist types in types.xml.
+ * Remove support for double-list types in types.xml.
2009-05-08 Andreas Kirschbaum
@@ -671,13 +671,13 @@
2009-01-08 Andreas Kirschbaum
* Fix #1842541 (File Options... Paths and Resources): always save
- absolute path names; suppress spurious "Prefs changed" dialog.
+ absolute path names; suppress spurious "Preferences changed" dialog.
2009-01-07 Andreas Kirschbaum
* Fix #1965884 (Display issue).
- * Fix #2430127 (Lost shoprace information when editting, then
+ * Fix #2430127 (Lost shoprace information when editing, then
saving a map).
* Fix object choice display for pickmap chooser.
@@ -773,7 +773,7 @@
* Do not crash when validating unsaved maps containing exits.
- * Fix spells combobox in game object attributes dialog.
+ * Fix spells combo box in game object attributes dialog.
2008-10-28 Andreas Kirschbaum
@@ -1189,7 +1189,7 @@
2007-11-04 Andreas Kirschbaum
* Implement #1555828 (Uses old spell numbers for the spell list
- dropdown).
+ drop down).
2007-11-03 Andreas Kirschbaum
@@ -1232,7 +1232,7 @@
* Allow multi-part objects in inventory. This allows generators
spawning multi-part monsters.
- * Suppress spurious error message "Multipart expansion for a
+ * Suppress spurious error message "Multi-part expansion for a
GameObject inside a container requested." when loading maps with
multi-parts in inventories.
@@ -1272,7 +1272,7 @@
* Make scripts work if Gridarta is run outside the source
directory:
- - Load scripts from <mapdir>/editor/scripts; remove built-in
+ - Load scripts from <map_dir>/editor/scripts; remove built-in
scripts.
- Store scripts in separate .xml files instead in an aggregated
scripts.xml file.
@@ -1284,7 +1284,7 @@
2007-10-09 Andreas Kirschbaum
- * Load pickmaps from <mapdir>/editor/pickmaps; remove built-in
+ * Load pickmaps from <map_dir>/editor/pickmaps; remove built-in
pickmaps. This makes pickmaps work if Gridarta is run outside the
source directory.
@@ -1568,7 +1568,7 @@
2007-04-09 Andreas Kirschbaum
- * Allow to replace from copybuffer in replace dialog.
+ * Allow to replace from copy buffer in replace dialog.
2007-04-06 Andreas Kirschbaum
@@ -1597,7 +1597,7 @@
* Do not crash in "random fill above" when not filling from
pickmap.
- * Use different algorithm for floodfill. The new algorithm does
+ * Use different algorithm for flood-fill. The new algorithm does
not anymore create out of memory errors for complicated fill
areas.
@@ -1622,7 +1622,7 @@
2007-03-23 Andreas Kirschbaum
- * Remove special handling of multipart objects when writing map
+ * Remove special handling of multi-part objects when writing map
files.
2007-03-22 Andreas Kirschbaum
@@ -1724,7 +1724,7 @@
* Fix #1613731 (Arch list tabs sometimes blank).
- * Use pickmap selection for insert, replace, fill, floodfill.
+ * Use pickmap selection for insert, replace, fill, flood-fill.
* Add context menu to pickmap chooser.
@@ -1752,7 +1752,7 @@
* Do not reflect filter settings into pickmaps.
- * Fix #1621873 (Analyze menus misrender on multi-tile objects).
+ * Fix #1621873 (Analyze menus mis-render on multi-tile objects).
* Fix #1613729 (Monsters appear as "weak wall (0)"). (Previous fix
did miss the game object attributes panel.)
@@ -1838,13 +1838,13 @@
2006-12-18 Andreas Kirschbaum
- * Fix crash when pasting multipart objects.
+ * Fix crash when pasting multi-part objects.
* Accelerate map drawing speed.
2006-12-17 Andreas Kirschbaum
- * Split fill and floodfill into separate functions in user
+ * Split fill and flood-fill into separate functions in user
interface.
* Add replace of non-rectangular selections; make replacement of
@@ -1980,7 +1980,7 @@
2006-09-23 Andreas Kirschbaum
* Make insertion and deletion in the map tile panel work
- correctly. (Note that multipart objects from pickmaps still cannot
+ correctly. (Note that multi-part objects from pickmaps still cannot
be inserted in the map tile panel.)
2006-09-18 Andreas Kirschbaum
Modified: trunk/crossfire/ChangeLog.old
===================================================================
--- trunk/crossfire/ChangeLog.old 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/crossfire/ChangeLog.old 2010-06-06 20:49:51 UTC (rev 8192)
@@ -26,7 +26,7 @@
--- 27/06/2001 ---
-add script parsing to
+add script parsing to
archText & some minor insanity checks for read/write maps
--- 29/06/2001 ---
@@ -47,7 +47,7 @@
The classification of objects used to be based on the
"editable" value from the archetype (default arch). But that
-was not useful, because it was so unrelyable. E.g. floor arches
+was not useful, because it was so unreliable. E.g. floor arches
can be changed into secret exits, the archetype won't indicate
that.
That's why I changed the editable values to be calculated at
@@ -63,7 +63,7 @@
doubled background tiles.
I corrected a bug in the parser that prevented the
-"type" - attribute from being modified (Parser ignored it).
+"type" - attribute from being modified (Parser ignored it).
Finally, I inserted a new menu under "view"-> "Reset View".
This works basically as a "Show All" for the view setting.
@@ -73,7 +73,7 @@
--- 30/07/2001 ---
Remove bug when map windows are cycled. Add x 16/y 16 hack
-to map object in archfiles
+to map object in archetype files
--- 02/08/2001 ---
@@ -87,9 +87,9 @@
There are two different fill-modes:
- For rectangular fill, left click and drag to highlight
a rectangular area. Then invoke fill.
- - For floodfill, left click on an empty spot and do not
+ - For flood-fill, left click on an empty spot and do not
drag. By invoking fill all connected empty squares are
- floodfilled.
+ flood-filled.
3) Delete (middle mouse button):
When you click on the map with the middle mouse button,
@@ -129,11 +129,11 @@
Besides, Cut/Copy/Paste now works with containers and
their inventory.
-o I seperated the map arch from the ordinary arch objects.
+o I separated the map arch from the ordinary arch objects.
This was a big biiiig load of work.
('map arch' = first arch object in the file, containing map attributes
like width, height etc). The map arch now has it's own class
- (MapArchObject.java) with own fileparser and -writer methods.
+ (MapArchObject.java) with own file parser and -writer methods.
This has a lot of advantages: The code is better organized,
the map attributes are easy accessible, and the map arch can be
expanded with new attributes at will without causing trouble.
@@ -142,7 +142,7 @@
new (width, height, swap_time etc). Even the map_tiling paths.
Still missing however is the proper user-interface for the map attributes.
That's gonna be the next step...
-
+
o On my way diving through the code, I did a lot of cosmetics and
minor stuff. The file-modified '*' is now displayed a lot more
accurate, panel background is now green... stuff like that.
@@ -184,7 +184,7 @@
at this point. Today he sent me the last piece
I needed to make it all work.
-I'm sorry for the mess with the cvs directorys. CVS
+I'm sorry for the mess with the cvs directories. CVS
is hell of an inconvenient program when it comes
to directory-management.
@@ -212,7 +212,7 @@
Completed the "enter exit" feature. It works
very similar to Crossedit: Select and exit on
-the map, activate menu "enter exit" (Strg-E) and the
+the map, activate menu "enter exit" (Ctrl-E) and the
destination map gets loaded.
--AndreasV
@@ -220,7 +220,7 @@
--- 21/09/2001 ---
I've reworked some parts of the layout. Icon-Toolbar
-is now left and the arch-message window is on a seperate
+is now left and the arch-message window is on a separate
panel, for better size.
Besides I optimized some code a bit to speed up dragging for
insert/delete objects.
@@ -234,7 +234,7 @@
then any walls will join in the right way (similar
to crossedit).
The "joining-definitions" are written in an easily
-customizable textfile called "autojoin.txt".
+customizable text file called "autojoin.txt".
This feature is very fast and memory-efficient. It
does not increase the loading time.
@@ -244,8 +244,8 @@
--- 29/09/2001 ---
Another big update for the CFJavaEditor:
-Multipart objects are now saved and loaded according to the
-"new" map format as head-arches only. That was neccessary
+Multi-part objects are now saved and loaded according to the
+"new" map format as head-arches only. That was necessary
for the JavaEditor in order to cope with maps generated
by recent versions of Crossedit.
It also makes map-files a good deal shorter.
@@ -264,12 +264,12 @@
map loading but when the settings are actually needed instead.
Other optimizations followed.
-In the process I tweaked the map-loading methods to be resistent
-against numerous kinds of corrupt mapfiles.
+In the process I tweaked the map-loading methods to be resistant
+against numerous kinds of corrupt map files.
Besides, I included a small new feature: The inventory of
-multipart objects is now always stored in the multipart-head.
-Every tile of a multipart now shows the one and same inventory.
+multi-part objects is now always stored in the multi-part-head.
+Every tile of a multi-part now shows the one and same inventory.
--Andreas V.
@@ -280,7 +280,7 @@
actions like select/insert/delete objects.
Basically what I did was reducing the redraw actions of the
-mapview to a minimum. Instead of drawing the entire map,
+map view to a minimum. Instead of drawing the entire map,
only the tiles that changed get redrawn.
This works well for the standard (rectangular) view.
@@ -289,19 +289,19 @@
I believe there is still an open end for speed improvements,
though the editor is already quite fast now. Only the arch
-loading is still awefull...
+loading is still awful...
--Andreas V.
--- 02/10/2001 ---
-Further improvements and finetuning to the new
+Further improvements and fine-tuning to the new
drawing methods:
-Due to the direct drawing on the mapview, the tiles
+Due to the direct drawing on the map view, the tiles
used to "flicker" slightly when objects got drawn over
each other. To prevent this, tiles are now drawn into
-a temporare buffer, then displayed as a whole.
+a temporary buffer, then displayed as a whole.
This does not considerably slow anything down.
Also corrected problems for tiles without background.
@@ -311,7 +311,7 @@
--- 03/10/2001 ---
I extended the cut/copy/paste methods to enable
-copying of multisquare objects. So they are finally
+copying of multi-square objects. So they are finally
completed now, allowing to copy everything.
I also did a few speed optimizations to the arch/image
@@ -324,22 +324,22 @@
I've added a proper online help document to the CFJavaEditor.
It's html, but I kept the style rather simple so far.
-The online docu can be viewed by selecting the menu
+The online documentation can be viewed by selecting the menu
"Help->Online Help". (Of course the .html files can as well
be viewed directly, with a browser).
The online help so far describes how to use the editor, provides
-some troubleshooting (->faq) and a few general guidelines
+some troubleshooting (->faq) and a few general guidelines
for map-making.
I also added a file "INSTALL.txt" to the main folder, providing
information on how to install (= compile and run) the editor.
---Andreas V.
+--Andreas V.
--- 5/11/01 ---
-editor had collect bad archfiles.
+editor had collect bad archetype files.
Now he can write negatives offsets.
--Michael T.
@@ -359,7 +359,7 @@
--- 27/11/01 ---
-Fixed some minor flaws in the archtext parser.
+Fixed some minor flaws in the archetype text parser.
--Andreas V.
@@ -367,7 +367,7 @@
Added the attribute dialog feature, an interface
that provides an "easy" layer over the terrible true
-crossfire archtext syntax.
+crossfire archetype text syntax.
The syntax definitions are read from a well-readable plain
text data file. Not all forms of input-values are supported
yet, but the foundation is laid and the rest will follow.
@@ -391,7 +391,7 @@
which caused JDK 1.4 to try producing a greyed-out
icon from a png-imageProducer that didn't exist.
This resulted in runtime errors whenever clicking
-on the mapview. Fixed now.
+on the map view. Fixed now.
--AndreasV
@@ -417,7 +417,7 @@
--- 19/02/2002 ---
Great new feature in the JavaEditor:
-Spellnumbers now get handled by the editor internally.
+Spell numbers now get handled by the editor internally.
In the attribute-window the mapmaker can choose
spells by name conveniently, from a list.
@@ -435,15 +435,15 @@
Added four new kinds of attributes for "types.txt":
-- customized bool: for customizeable true/false values
+- customized bool: for customizable true/false values
instead of 1/0
- direction: for a list of CF direction values
(north, northeast, east, ..., northwest)
-- weapontype: for a list of CF weapontypes
- (see weapotype code by Garbled)
+- weapontype: for a list of CF weapon types
+ (see weapon type code by Garbled)
- mood: for a list of CF moods (see moodfloor code)
-The last three appear as choosebox-lists, like spells.
+The last three appear as choose box-lists, like spells.
With the help of these features, affected attributes
are a lot more intuitive and easier to understand.
@@ -475,7 +475,7 @@
Now the type definitions for the editor include
almost everything that a mapmaker will need.
-- A doubleclick on an archobject in the right-side
+- A double-click on an archetype object in the right-side
window of the editor now opens an attribute-dialog
for this object. This works faster and is more
convenient than pressing the "attribute"-button
@@ -493,7 +493,7 @@
Added ant build files for the JavaEditor,
also from Josh.
-Extended the online help docu a little bit to
+Extended the online help documentation a little bit to
cover latest features.
--AndreasV
@@ -503,7 +503,7 @@
New version of the JavaEditor: featuring support for
custom fonts. You can now choose a font from the "View->Choose Font"-menu.
This is very helpful for using larger screen resolutions
-(like with flatscreens), where the default fonts are too small.
+(like with flat screens), where the default fonts are too small.
Also done a lot of code cleanups, minor improvements and
correcting of javadoc comments.
@@ -515,7 +515,7 @@
I've added support for bitmask values in the
attribute-dialog.
No longer do mapmakers need to calculate those
-ugly attacktype-, material- and spellpath values.
+ugly attacktype-, material- and spell path values.
The attribute-dialog GUI presents the bitmasks in
text form now (like "physical, fire, cold" or "paper, iron")
and they can be modified conveniently by an array of
@@ -537,12 +537,12 @@
Added patches and new code concerning the attribute-dialog:
There used to be a problem with arch-attributes that are
not recognized from the type-definitions (in "types.txt").
-Such entrys in the archtext were deleted by the JavaEditor
+Such entries in the archetype text were deleted by the JavaEditor
when using the attribute-dialog interface.
-Now this handled in a better way: Entrys which are not
+Now this handled in a better way: Entries which are not
recognized are framed "syntax errors" and the user is
-able to choose wether to keep or dump them.
+able to choose whether to keep or dump them.
This is interesting as it often shows real errors
in maps that would otherwise be overlooked.
@@ -561,12 +561,12 @@
list only the most important ones here:
o It is now possible to change (object-)types in the
- attribute-dialog. Just select one from the choosebox!
+ attribute-dialog. Just select one from the choose box!
The attribute dialog GUI will automatically change
to show all sections and values for the new type.
o Created a new CFileReader class which allows to
- load the resource-textfiles from the jar archive if they
+ load the resource-text files from the jar archive if they
don't exist in the directory.
(Removed the ugly broken code that was trying to do this before)
@@ -574,7 +574,7 @@
the CFJavaEditor for the first time on his machine.
This used to be real twisted, now it looks as it should.
-Also renamed the file "typdef.def" to "typenumbers.def".
+Also renamed the file "typedef.def" to "typenumbers.def".
The old name no longer fits, as the file will never get
extended to contain more than type numbers.
@@ -586,7 +586,7 @@
--- 04/05/2002, Version 0.975 ---
-o Seperated map name from file name. When I first
+o Separated map name from file name. When I first
coded this, I misunderstood the concept of map names.
It is now possible to have a different map name
and map file-name, as it should be.
@@ -628,27 +628,27 @@
The JavaEditor can now load arches from collected files. This
reduces loading time to about one third! It is still an option
-to load from individual archfiles (See menu "File->Options").
+to load from individual archetype files (See menu "File->Options").
And, to combine both, you can even collect arches
(menu "Collect->Collect CF Arches"). So you don't need to worry
when your collected files get outdated for example.
From now on the JavaEditor has a collected version of the
-archfiles included. That means you no longer need to worry about
+archetype files included. That means you no longer need to worry about
arches at all unless you want to create custom arches or images.
Added "Fill Below" menu option. This is also a feature that
had been requested a while ago. Works similar to the same thing
known from Crossedit.
-Updated the online help docu to cover latest features
+Updated the online help documentation to cover latest features
an changed functionality.
This reminds me, I've also created a documentation version-number.
Every time this number is increased, when a user updates his
-editor and runs for the first time, the docu will popup automatically.
+editor and runs for the first time, the documentation will popup automatically.
In this way, I hope to get users more aware of the documentation
and eventual changes/additions to it. In the past many users
-did not know that a docu existed, even after long use of the editor.
+did not know that a documentation existed, even after long use of the editor.
--AndreasV
@@ -659,7 +659,7 @@
Users are now able to pick arches either from the
conventional arch-list, or from various pickmaps.
-Both can be found in the archpanel to the left side.
+Both can be found in the archetype panel to the left side.
Use of pickmaps saves a lot of time, as pickmaps can
show a lot more objects at once, in logical groups.
@@ -680,29 +680,29 @@
In the previous version is was not possible to insert objects
from a pickmap directly to the map-tile-window.
-Now this can be done.
+Now this can be done.
I updated the type-definitions "types.txt" to support some
-of the most important new attributes that have been added lately.
+of the most important new attributes that have been added lately.
Also updated the collected arch files to stay in sync
-with CVS arches.
+with CVS arches.
--AndreasV
--- 05/10/2002, Version 0.982 ---
In the "Map"-menu there are now commands to move quickly between
-tiled maps. This nice patch was contributed by Mark Wedel.
+tiled maps. This nice patch was contributed by Mark Wedel.
New Feature: It is now possible to create a full size png-image
-from any map in the editor. Not necessary for mapmaking, but maybe
+from any map in the editor. Not necessary for map-making, but maybe
handsome for Crossfire fans who want to tile their bathroom with
-map-images... who knows ;-)
+map-images... who knows ;-)
While selecting tiles on a map (left-click and drag mouse), the
dimensions of the highlighted rectangle are now displayed in the
-status-bar (bottom of window).
+status-bar (bottom of window).
Lots of bug fixes since last version of the editor.
@@ -716,14 +716,14 @@
Of course this is also integrated into the attribute dialog: Just
click on the "treasurelist" attribute and the treasurelist-view is
directly opened. I have also included a fairly extensive piece of
-online documenattion (for mapmakers) regarding this treasurelist-feature.
-Lots of bug fixes since last version of the editor.
+online documentation (for mapmakers) regarding this treasurelist-feature.
+Lots of bug fixes since last version of the editor.
I have applied a lot of GUI-improvements, but most of them
-are not eye-catching changes.
+are not eye-catching changes.
Updated "types.txt" file with corrections about ac and run_away,
-as well as some other minor corrections.
+as well as some other minor corrections.
--AndreasV
@@ -732,17 +732,17 @@
The CFJavaEditor now features support for the python scripting plugin!
Look at the "script" tab on the bottom-mid frame: All scripted events
are fully managed in the editor. You can create/remove and edit
-scripted events. But that's not all...
+scripted events. But that's not all...
CFJavaEditor now has it's very own ascii editor for viewing and
writing python scripts. It has real python syntax highlighting,
-even an auto-complete popup menu for the CFPython package functions.
+even an auto-complete popup menu for the CFPython package functions.
--AndreasV
--- 26/04/2003, Version 0.984 ---
-The primary datafile format is XML from now on.
+The primary data file format is XML from now on.
I have chosen to included the Crimson XML parser for this purpose,
due to it's small size. The code is not dependant on this particular
parser however - it could be exchanged by any other java XML parser.
@@ -761,14 +761,14 @@
Added basic support for lore to the CFJavaEditor.
In the map properties window (select menu "Map->Map Properties"),
-there now is a lore tab with a textarea for map lore.
+there now is a lore tab with a text area for map lore.
For now, arch-lore gets parsed but not displayed, which
practically disables lore in map-objects.
The "replace" command is also new, which can be found in the
edit menu. This allows to replace (or delete) all objects matching
-a certain name or archtype. This makes it very easy to accomplish
+a certain name or archetype. This makes it very easy to accomplish
tasks like "replace all woodfloor with flagstones" or
"delete all no_spell arches".
@@ -781,7 +781,7 @@
pickmap with right-click, and delete from pickmaps with middle-
click. That means pickmaps can be modified much like normal
maps - Shifting objects between map and pickmap, in both ways,
-becomes very easy and fast. It even works for multiparts too.
+becomes very easy and fast. It even works for multi-parts too.
There is an entire new menu "Pickmaps" in the menu bar.
It offers commands to create new pickmaps, save pickmaps,
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/daimonin/ChangeLog 2010-06-06 20:49:51 UTC (rev 8192)
@@ -2,7 +2,7 @@
* Drop recent menu entries for maps with non-existent map files.
- * Do not flag tail parts of monsters in shops as "pait items".
+ * Do not flag tail parts of monsters in shops as "paid items".
* Fix "reload faces".
@@ -70,7 +70,7 @@
* Do not remove event objects having incorrect parameters when
loading maps.
- * Implement #1717845 (Multitile paste) as File|Paste Tiled: paste
+ * Implement #1717845 (Multi-square paste) as File|Paste Tiled: paste
the copy buffer into the selection. If the selection is larger
than the copy buffer, tiling happens.
@@ -113,7 +113,7 @@
* Implement #2385930 (Alert when adding items in to a shop): add
new map validator "Shop square contains paid item" that checks for
- shop sqaures that contain at least one paid item.
+ shop squares that contain at least one paid item.
2010-05-13 Andreas Kirschbaum
@@ -336,8 +336,8 @@
* Add support for map validator "Shop tile allows magic and/or
prayers": reports shop tiles that allow casting spells or prayers.
- * Implement #2861454 (object filtering to work on invs): Add <Env>
- element to GameObjectMatchers.
+ * Implement #2861454 (object filtering to work on inventories):
+ Add <Env> element to GameObjectMatchers.
2009-09-21 Andreas Kirschbaum
@@ -484,7 +484,7 @@
* Fix possible NullPointerException while parsing types.xml.
- * Remove support for doublelist types in types.xml.
+ * Remove support for double-list types in types.xml.
2009-05-14 Andreas Kirschbaum
@@ -673,7 +673,7 @@
2009-01-08 Andreas Kirschbaum
* Fix #1842541 (File Options... Paths and Resources): always save
- absolute path names; suppress spurious "Prefs changed" dialog.
+ absolute path names; suppress spurious "Preferences changed" dialog.
2009-01-07 Andreas Kirschbaum
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/gridarta.ipr 2010-06-06 20:49:51 UTC (rev 8192)
@@ -1126,6 +1126,7 @@
<words>
<w>accel</w>
<w>agentlib</w>
+ <w>angelion</w>
<w>animname</w>
<w>animtree</w>
<w>antilure</w>
@@ -1135,20 +1136,28 @@
<w>args</w>
<w>asmlinkage</w>
<w>atrinik</w>
+ <w>attlist</w>
<w>attribute's</w>
<w>autojoin</w>
<w>autojoining</w>
<w>backbuffer</w>
<w>baseobject</w>
+ <w>batchpng</w>
<w>beanshell</w>
<w>bitmask</w>
<w>bitmasks</w>
<w>blitting</w>
+ <w>blog</w>
<w>bmaps</w>
<w>bmentry</w>
+ <w>bonczkowski</w>
<w>bool</w>
+ <w>bulgrien</w>
<w>callees</w>
+ <w>cfeditor</w>
+ <w>cfpython</w>
<w>checkboxes</w>
+ <w>checklink</w>
<w>checkstyle</w>
<w>christianhujer</w>
<w>cloneable</w>
@@ -1156,17 +1165,25 @@
<w>collectable</w>
<w>collectable...</w>
<w>collectables</w>
+ <w>collectarches</w>
<w>conf</w>
<w>covariant</w>
+ <w>crossedit</w>
+ <w>cvsroot</w>
<w>daimonin</w>
+ <w>daimonin's</w>
+ <w>debian</w>
<w>dedit</w>
<w>derivates</w>
+ <w>dest</w>
<w>djava</w>
<w>doctype</w>
<w>encodings</w>
<w>endlore</w>
<w>endmsg</w>
<w>enums</w>
+ <w>ergonomy</w>
+ <w>everyone's</w>
<w>exiter</w>
<w>externalizable</w>
<w>facename</w>
@@ -1177,20 +1194,27 @@
<w>fixme</w>
<w>focusability</w>
<w>formatter</w>
+ <w>freenode</w>
<w>freshmeat</w>
<w>g...</w>
<w>gameobject</w>
<w>gameobjectmatchers</w>
<w>getenv</w>
+ <w>glibc</w>
+ <w>gnomovision</w>
<w>goto</w>
<w>gridarta</w>
<w>gridarta's</w>
<w>gridder</w>
+ <w>guildmaster</w>
+ <w>hotkey</w>
<w>hprof</w>
+ <w>https</w>
<w>hujer</w>
<w>iconification</w>
<w>iconified</w>
<w>iconify</w>
+ <w>iconized</w>
<w>ignorelists</w>
<w>inconvertible</w>
<w>indices</w>
@@ -1200,21 +1224,34 @@
<w>javascript</w>
<w>javax</w>
<w>jvmti</w>
+ <w>keränen</w>
+ <w>lally</w>
+ <w>licensor</w>
<w>lifesteal</w>
<w>listentry</w>
+ <w>logentry</w>
<w>longdescription</w>
<w>lookups</w>
<w>magicmap</w>
+ <w>mailto</w>
+ <w>mandriva</w>
<w>mapcontrol</w>
<w>matchers</w>
<w>megaxslt</w>
+ <w>metalforge</w>
<w>microsystems</w>
<w>missorted</w>
<w>mmorpg</w>
<w>mpart</w>
<w>multi</w>
<w>nesw</w>
+ <w>nmtoken</w>
+ <w>nodeps</w>
+ <w>nogui</w>
+ <w>nokleberg</w>
+ <w>ohloh</w>
<w>online</w>
+ <w>outfile</w>
<w>oversized</w>
<w>overstrike</w>
<w>overstrikes</w>
@@ -1226,32 +1263,45 @@
<w>pickmaps</w>
<w>plugins</w>
<w>popup</w>
+ <w>projecthelp</w>
<w>psionic</w>
<w>recents</w>
<w>recurse</w>
<w>recursing</w>
+ <w>redistributors</w>
+ <w>relativize</w>
<w>renderers</w>
+ <w>resettime</w>
<w>resize</w>
<w>resized</w>
<w>resizes</w>
<w>rethrown</w>
<w>revivable</w>
+ <w>riedquat</w>
<w>rsync</w>
<w>scansize</w>
<w>screenshot</w>
+ <w>screenshots</w>
<w>script<?, ?, ?></w>
<w>sdefault</w>
+ <w>searchable</w>
+ <w>seikel</w>
<w>shortdescription</w>
<w>shortdescriptionformat</w>
+ <w>siddharta</w>
<w>sigint</w>
+ <w>singlepng</w>
+ <w>sixlegs</w>
<w>slava</w>
<w>smoothface</w>
<w>smtp</w>
<w>solaris</w>
<w>sourceforge</w>
+ <w>spawnpoint</w>
<w>startup</w>
<w>stoneglow</w>
<w>strncmp</w>
+ <w>sublicense</w>
<w>sweeped</w>
<w>switchcheck</w>
<w>teleporter</w>
@@ -1261,6 +1311,7 @@
<w>tileset</w>
<w>timestamp</w>
<w>toennies</w>
+ <w>tokar</w>
<w>tokenize</w>
<w>tokenized</w>
<w>tokenizes</w>
@@ -1271,9 +1322,13 @@
<w>treasurelists</w>
<w>tristate</w>
<w>typedefs</w>
+ <w>typenumbers</w>
+ <w>tönnies</w>
+ <w>unapplied</w>
<w>unconstructable</w>
<w>undoable</w>
<w>unexperienced</w>
+ <w>unislash</w>
<w>unregister</w>
<w>unregistering</w>
<w>unsets</w>
@@ -1281,16 +1336,25 @@
<w>validator's</w>
<w>validator...</w>
<w>variable's</w>
+ <w>viegas</w>
+ <w>viewcvs</w>
<w>viewport</w>
<w>vogl</w>
<w>waypoint</w>
+ <w>webstart</w>
+ <w>wedel</w>
<w>whitespaces</w>
+ <w>wiki</w>
+ <w>wildcards</w>
<w>xdebug</w>
<w>xhtml</w>
<w>xlint</w>
+ <w>xmlns</w>
<w>xnoagent</w>
<w>xrunhprof</w>
<w>xrunjdwp</w>
+ <w>yoyodyne</w>
+ <w>zergus</w>
</words>
</dictionary>
</component>
Modified: trunk/src/doc/dev/changelog.xslt
===================================================================
--- trunk/src/doc/dev/changelog.xslt 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/src/doc/dev/changelog.xslt 2010-06-06 20:49:51 UTC (rev 8192)
@@ -39,7 +39,7 @@
<th>Rev</th>
<th>Developer</th>
<th>Date</th>
- <th>Commit Message / Changeset Description</th>
+ <th>Commit Message / Change Set Description</th>
</tr>
</thead>
<tbody>
Modified: trunk/src/doc/dev/typeParameters.xhtml
===================================================================
--- trunk/src/doc/dev/typeParameters.xhtml 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/src/doc/dev/typeParameters.xhtml 2010-06-06 20:49:51 UTC (rev 8192)
@@ -36,10 +36,10 @@
<li>R: A<strong>r</strong>chetype</li>
<li>A: Map<strong>A</strong>rchObject</li>
<li>M: Map<strong>M</strong>odel</li>
- <li>T: <em><strong>T</strong>ype</em> - Some abstract specific datatype,
+ <li>T: <em><strong>T</strong>ype</em> - Some abstract specific data type,
usually in non-collection sense.
</li>
- <li>E: <em><strong>E</strong>lement</em> - Some unspecific datatype, usually
+ <li>E: <em><strong>E</strong>lement</em> - Some unspecific data type, usually
in collection sense.
</li>
</ul>
Modified: trunk/src/doc/ref/GameObjectMatcher.xhtml
===================================================================
--- trunk/src/doc/ref/GameObjectMatcher.xhtml 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/src/doc/ref/GameObjectMatcher.xhtml 2010-06-06 20:49:51 UTC (rev 8192)
@@ -120,7 +120,7 @@
</li>
<li>
The insertion and deletion tools use the 'system_wall' (or
- fallback 'wall') matcher for selecing wall game objects.
+ fallback 'wall') matcher for selecting wall game objects.
</li>
<li>
The deletion tool uses the 'system_monster' (or fallback
@@ -247,7 +247,7 @@
Matchers of type 'Attrib' check an game object attribute's value.
-The 'name' attribute specifies the game object attribute's name; it is reqired.
+The 'name' attribute specifies the game object attribute's name; it is required.
The 'value' attribute specifies the expected attribute value; it's value
defaults to "1".
Modified: trunk/src/doc/sitestyle.css
===================================================================
--- trunk/src/doc/sitestyle.css 2010-06-06 20:30:47 UTC (rev 8191)
+++ trunk/src/doc/sitestyle.css 2010-06-06 20:49:51 UTC (rev 8192)
@@ -12,7 +12,7 @@
background-position: 0 0;
background-repeat: no-repeat;*/
font-family: Helvetica, "Trebuchet MS", Arial, sans-serif;
- font-size: 1em; /* setting base font to user's prefered size */
+ font-size: 1em; /* setting base font to user's preferred size */
line-height: 130%;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 20:30:54
|
Revision: 8191
http://gridarta.svn.sourceforge.net/gridarta/?rev=8191&view=rev
Author: akirschbaum
Date: 2010-06-06 20:30:47 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Drop recent menu entries for maps with non-existent map files.
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-06-06 20:27:24 UTC (rev 8190)
+++ trunk/atrinik/ChangeLog 2010-06-06 20:30:47 UTC (rev 8191)
@@ -1,5 +1,7 @@
2010-06-06 Andreas Kirschbaum
+ * Drop recent menu entries for maps with non-existent map files.
+
* Do not flag tail parts of monsters in shops as "pait items".
* Fix "reload faces".
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-06-06 20:27:24 UTC (rev 8190)
+++ trunk/crossfire/ChangeLog 2010-06-06 20:30:47 UTC (rev 8191)
@@ -1,5 +1,7 @@
2010-06-06 Andreas Kirschbaum
+ * Drop recent menu entries for maps with non-existent map files.
+
* Do not flag tail parts of monsters in shops as "pait items".
* Fix "reload faces".
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-06-06 20:27:24 UTC (rev 8190)
+++ trunk/daimonin/ChangeLog 2010-06-06 20:30:47 UTC (rev 8191)
@@ -1,5 +1,7 @@
2010-06-06 Andreas Kirschbaum
+ * Drop recent menu entries for maps with non-existent map files.
+
* Do not flag tail parts of monsters in shops as "pait items".
* Fix "reload faces".
Modified: trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java 2010-06-06 20:27:24 UTC (rev 8190)
+++ trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java 2010-06-06 20:30:47 UTC (rev 8191)
@@ -75,9 +75,11 @@
public void init() {
final int numRecents = preferences.getInt("recentNum", 0);
for (int i = numRecents - 1; i >= 0; i--) {
- final String title = getTitle(i);
final File mapFile = getMapFile(i);
- addMapMenuEntryInt(title, mapFile);
+ if (mapFile.exists()) {
+ final String title = getTitle(i);
+ addMapMenuEntryInt(title, mapFile);
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 20:27:31
|
Revision: 8190
http://gridarta.svn.sourceforge.net/gridarta/?rev=8190&view=rev
Author: akirschbaum
Date: 2010-06-06 20:27:24 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Remove doSave parameters from MapMenuPreferences classes.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/mapmenu/AbstractMapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/BookmarksMapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuManager.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuPreferences.java
trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java
trunk/src/test/net/sf/gridarta/gui/mapmenu/MapMenuManagerTest.java
Modified: trunk/src/app/net/sf/gridarta/gui/mapmenu/AbstractMapMenuPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapmenu/AbstractMapMenuPreferences.java 2010-06-06 19:57:49 UTC (rev 8189)
+++ trunk/src/app/net/sf/gridarta/gui/mapmenu/AbstractMapMenuPreferences.java 2010-06-06 20:27:24 UTC (rev 8190)
@@ -121,13 +121,12 @@
}
/**
- * Adds a {@link MapMenuEntry}.
+ * Adds a {@link MapMenuEntry}. The change is not saved to preferences.
* @param index the insertion index
* @param mapMenuEntry the map menu entry
*/
- protected void addMapMenuEntry(final int index, @NotNull final MapMenuEntry<G, A, R> mapMenuEntry) {
+ protected void addMapMenuEntryInt(final int index, @NotNull final MapMenuEntry<G, A, R> mapMenuEntry) {
mapMenuEntries.add(index, mapMenuEntry);
- save();
fireIntervalAdded(this, index, index);
}
@@ -135,14 +134,38 @@
* {@inheritDoc}
*/
@Override
+ public void addMapMenuEntry(@NotNull final String title, @NotNull final File mapFile) {
+ addMapMenuEntryInt(title, mapFile);
+ save();
+ }
+
+ /**
+ * Adds a {@link MapMenuEntry}. The change is not saved to preferences.
+ * @param title the entry's title
+ * @param mapFile the entry's short map file
+ */
+ protected abstract void addMapMenuEntryInt(@NotNull String title, @NotNull File mapFile);
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
public void removeMapMenuEntry(@NotNull final MapMenuEntry<G, A, R> mapMenuEntry) {
+ removeMapMenuEntryInt(mapMenuEntry);
+ save();
+ }
+
+ /**
+ * Removes a {@link MapMenuEntry}. The change is not saved to preferences.
+ * @param mapMenuEntry the map menu entry
+ */
+ protected void removeMapMenuEntryInt(@NotNull final MapMenuEntry<G, A, R> mapMenuEntry) {
final int index = mapMenuEntries.indexOf(mapMenuEntry);
if (index == -1) {
return;
}
mapMenuEntries.remove(index);
- save();
fireIntervalRemoved(this, index, index);
}
Modified: trunk/src/app/net/sf/gridarta/gui/mapmenu/BookmarksMapMenuPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapmenu/BookmarksMapMenuPreferences.java 2010-06-06 19:57:49 UTC (rev 8189)
+++ trunk/src/app/net/sf/gridarta/gui/mapmenu/BookmarksMapMenuPreferences.java 2010-06-06 20:27:24 UTC (rev 8190)
@@ -76,7 +76,7 @@
for (int i = 0; i < numRecents; i++) {
final String title = getTitle(i);
final File mapFile = getMapFile(i);
- addMapMenuEntry(title, mapFile, false);
+ addMapMenuEntryInt(title, mapFile);
}
}
@@ -126,11 +126,8 @@
* {@inheritDoc}
*/
@Override
- public void addMapMenuEntry(@NotNull final String title, @NotNull final File mapFile, final boolean doSave) {
- addMapMenuEntry(getSize(), newMapMenuEntry(title, mapFile));
- if (doSave) {
- save();
- }
+ protected void addMapMenuEntryInt(@NotNull final String title, @NotNull final File mapFile) {
+ addMapMenuEntryInt(getSize(), newMapMenuEntry(title, mapFile));
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuManager.java 2010-06-06 19:57:49 UTC (rev 8189)
+++ trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuManager.java 2010-06-06 20:27:24 UTC (rev 8190)
@@ -160,7 +160,7 @@
return;
}
- mapMenuPreferences.addMapMenuEntry(title, mapFile, true);
+ mapMenuPreferences.addMapMenuEntry(title, mapFile);
updateRecent();
}
Modified: trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuPreferences.java 2010-06-06 19:57:49 UTC (rev 8189)
+++ trunk/src/app/net/sf/gridarta/gui/mapmenu/MapMenuPreferences.java 2010-06-06 20:27:24 UTC (rev 8190)
@@ -68,9 +68,8 @@
* Adds a {@link MapMenuEntry}.
* @param title the entry's title
* @param mapFile the entry's short map file
- * @param doSave whether to save the change to preferences
*/
- void addMapMenuEntry(@NotNull String title, @NotNull File mapFile, boolean doSave);
+ void addMapMenuEntry(@NotNull String title, @NotNull File mapFile);
/**
* Removes a {@link MapMenuEntry}.
Modified: trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java 2010-06-06 19:57:49 UTC (rev 8189)
+++ trunk/src/app/net/sf/gridarta/gui/mapmenu/RecentMapMenuPreferences.java 2010-06-06 20:27:24 UTC (rev 8190)
@@ -77,7 +77,7 @@
for (int i = numRecents - 1; i >= 0; i--) {
final String title = getTitle(i);
final File mapFile = getMapFile(i);
- addMapMenuEntry(title, mapFile, false);
+ addMapMenuEntryInt(title, mapFile);
}
}
@@ -112,10 +112,10 @@
* {@inheritDoc}
*/
@Override
- public void addMapMenuEntry(@NotNull final String title, @NotNull final File mapFile, final boolean doSave) {
+ protected void addMapMenuEntryInt(@NotNull final String title, @NotNull final File mapFile) {
final MapMenuEntry<G, A, R> mapMenuEntry = newMapMenuEntry(title, mapFile);
- removeMapMenuEntry(mapMenuEntry); // remove old entry to get new entry at first pos.
- addMapMenuEntry(0, mapMenuEntry);
+ removeMapMenuEntryInt(mapMenuEntry); // remove old entry to get new entry at first pos.
+ addMapMenuEntryInt(0, mapMenuEntry);
// Now remove those that are too many.
// Please keep this while loop as the constant 10 might be replaced by a preferences var
int i = 0;
@@ -125,9 +125,6 @@
it.remove();
}
}
- if (doSave) {
- save();
- }
}
/**
Modified: trunk/src/test/net/sf/gridarta/gui/mapmenu/MapMenuManagerTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/gui/mapmenu/MapMenuManagerTest.java 2010-06-06 19:57:49 UTC (rev 8189)
+++ trunk/src/test/net/sf/gridarta/gui/mapmenu/MapMenuManagerTest.java 2010-06-06 20:27:24 UTC (rev 8190)
@@ -87,9 +87,9 @@
}
@Override
- public void addMapMenuEntry(@NotNull final String title, @NotNull final File mapFile, final boolean doSave) {
+ protected void addMapMenuEntryInt(@NotNull final String title, @NotNull final File mapFile) {
final MapMenuEntry<TestGameObject, TestMapArchObject, TestArchetype> mapMenuEntry = newMapMenuEntry(title, mapFile);
- addMapMenuEntry(getSize(), mapMenuEntry);
+ addMapMenuEntryInt(getSize(), mapMenuEntry);
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 19:57:55
|
Revision: 8189
http://gridarta.svn.sourceforge.net/gridarta/?rev=8189&view=rev
Author: akirschbaum
Date: 2010-06-06 19:57:49 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Make GameObjectMatchers serializable.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java
Modified: trunk/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java 2010-06-06 19:57:04 UTC (rev 8188)
+++ trunk/src/app/net/sf/gridarta/model/match/GameObjectMatchers.java 2010-06-06 19:57:49 UTC (rev 8189)
@@ -20,6 +20,7 @@
package net.sf.gridarta.model.match;
import java.io.IOException;
+import java.io.Serializable;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -40,16 +41,23 @@
* @author <a href="mailto:ch...@ri...">Christian Hujer</a>
* @author Andreas Kirschbaum
*/
-public class GameObjectMatchers {
+public class GameObjectMatchers implements Serializable {
/**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* Map with arch object matchers and their IDs.
+ * @serial
*/
@NotNull
private final Map<String, NamedGameObjectMatcher> gameObjectMatchersByIds = new HashMap<String, NamedGameObjectMatcher>();
/**
* List with arch object matchers.
+ * @serial
*/
@NotNull
private final Collection<NamedGameObjectMatcher> gameObjectMatchers = new ArrayList<NamedGameObjectMatcher>();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 19:57:11
|
Revision: 8188
http://gridarta.svn.sourceforge.net/gridarta/?rev=8188&view=rev
Author: akirschbaum
Date: 2010-06-06 19:57:04 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Make InsertionMode serializable.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/map/mapmodel/AboveFloorInsertionMode.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/AutoInsertionMode.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/BelowFloorInsertionMode.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/BottommostInsertionMode.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/InsertionMode.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/TopmostInsertionMode.java
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/AboveFloorInsertionMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/AboveFloorInsertionMode.java 2010-06-06 19:54:21 UTC (rev 8187)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/AboveFloorInsertionMode.java 2010-06-06 19:57:04 UTC (rev 8188)
@@ -34,7 +34,13 @@
public class AboveFloorInsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements InsertionMode<G, A, R> {
/**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* A {@link GameObjectMatcher} matching floor game objects.
+ * @serial
*/
@Nullable
private final GameObjectMatcher floorGameObjectMatcher;
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/AutoInsertionMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/AutoInsertionMode.java 2010-06-06 19:54:21 UTC (rev 8187)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/AutoInsertionMode.java 2010-06-06 19:57:04 UTC (rev 8188)
@@ -35,19 +35,27 @@
public class AutoInsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements InsertionMode<G, A, R> {
/**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* A {@link GameObjectMatcher} matching floor game objects.
+ * @serial
*/
@Nullable
private final GameObjectMatcher floorGameObjectMatcher;
/**
* A {@link GameObjectMatcher} matching wall game objects.
+ * @serial
*/
@Nullable
private final GameObjectMatcher wallGameObjectMatcher;
/**
* A {@link GameObjectMatcher} matching monster game objects.
+ * @serial
*/
@Nullable
private final GameObjectMatcher belowFloorGameObjectMatcher;
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/BelowFloorInsertionMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/BelowFloorInsertionMode.java 2010-06-06 19:54:21 UTC (rev 8187)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/BelowFloorInsertionMode.java 2010-06-06 19:57:04 UTC (rev 8188)
@@ -34,7 +34,13 @@
public class BelowFloorInsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements InsertionMode<G, A, R> {
/**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* A {@link GameObjectMatcher} matching floor game objects.
+ * @serial
*/
@Nullable
private final GameObjectMatcher floorGameObjectMatcher;
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/BottommostInsertionMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/BottommostInsertionMode.java 2010-06-06 19:54:21 UTC (rev 8187)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/BottommostInsertionMode.java 2010-06-06 19:57:04 UTC (rev 8188)
@@ -31,6 +31,11 @@
public class BottommostInsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements InsertionMode<G, A, R> {
/**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* {@inheritDoc}
*/
@Override
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/InsertionMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/InsertionMode.java 2010-06-06 19:54:21 UTC (rev 8187)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/InsertionMode.java 2010-06-06 19:57:04 UTC (rev 8188)
@@ -19,6 +19,7 @@
package net.sf.gridarta.model.map.mapmodel;
+import java.io.Serializable;
import net.sf.gridarta.model.archetype.Archetype;
import net.sf.gridarta.model.gameobject.GameObject;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
@@ -29,7 +30,7 @@
* @author Andreas Kirschbaum
* @todo make replacement of multi-part objects work
*/
-public interface InsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
+public interface InsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> extends Serializable {
/**
* Inserts a {@link GameObject} into a {@link MapSquare}.
Modified: trunk/src/app/net/sf/gridarta/model/map/mapmodel/TopmostInsertionMode.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/map/mapmodel/TopmostInsertionMode.java 2010-06-06 19:54:21 UTC (rev 8187)
+++ trunk/src/app/net/sf/gridarta/model/map/mapmodel/TopmostInsertionMode.java 2010-06-06 19:57:04 UTC (rev 8188)
@@ -31,6 +31,11 @@
public class TopmostInsertionMode<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements InsertionMode<G, A, R> {
/**
+ * The serial version UID.
+ */
+ private static final long serialVersionUID = 1L;
+
+ /**
* {@inheritDoc}
*/
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 19:54:27
|
Revision: 8187
http://gridarta.svn.sourceforge.net/gridarta/?rev=8187&view=rev
Author: akirschbaum
Date: 2010-06-06 19:54:21 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Suppress warning.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/match/NamedGameObjectMatcher.java
Modified: trunk/src/app/net/sf/gridarta/model/match/NamedGameObjectMatcher.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/match/NamedGameObjectMatcher.java 2010-06-06 19:52:05 UTC (rev 8186)
+++ trunk/src/app/net/sf/gridarta/model/match/NamedGameObjectMatcher.java 2010-06-06 19:54:21 UTC (rev 8187)
@@ -124,6 +124,7 @@
* game object. {@link #envGameObjectMatcher} is ignored.
* @param gameObject the game object to search
* @return whether a matching inventory game object was found
+ * @noinspection TypeMayBeWeakened // is false warning: weakened type would cause compile-errors
*/
private boolean isMatchingInventory(@NotNull final GameObject<?, ?, ?> gameObject) {
for (final GameObject<?, ?, ?> inv : gameObject) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-06 19:52:11
|
Revision: 8186
http://gridarta.svn.sourceforge.net/gridarta/?rev=8186&view=rev
Author: akirschbaum
Date: 2010-06-06 19:52:05 +0000 (Sun, 06 Jun 2010)
Log Message:
-----------
Do not flag tail parts of monsters in shops as "pait items".
Modified Paths:
--------------
trunk/atrinik/ChangeLog
trunk/crossfire/ChangeLog
trunk/daimonin/ChangeLog
trunk/src/app/net/sf/gridarta/validation/checks/AbstractShopSquareChecker.java
Modified: trunk/atrinik/ChangeLog
===================================================================
--- trunk/atrinik/ChangeLog 2010-06-06 19:37:12 UTC (rev 8185)
+++ trunk/atrinik/ChangeLog 2010-06-06 19:52:05 UTC (rev 8186)
@@ -1,5 +1,7 @@
2010-06-06 Andreas Kirschbaum
+ * Do not flag tail parts of monsters in shops as "pait items".
+
* Fix "reload faces".
* Fix NullPointerException in "paste exit" when connecting to an
Modified: trunk/crossfire/ChangeLog
===================================================================
--- trunk/crossfire/ChangeLog 2010-06-06 19:37:12 UTC (rev 8185)
+++ trunk/crossfire/ChangeLog 2010-06-06 19:52:05 UTC (rev 8186)
@@ -1,5 +1,7 @@
2010-06-06 Andreas Kirschbaum
+ * Do not flag tail parts of monsters in shops as "pait items".
+
* Fix "reload faces".
* Fix NullPointerException in "paste exit" when connecting to an
Modified: trunk/daimonin/ChangeLog
===================================================================
--- trunk/daimonin/ChangeLog 2010-06-06 19:37:12 UTC (rev 8185)
+++ trunk/daimonin/ChangeLog 2010-06-06 19:52:05 UTC (rev 8186)
@@ -1,5 +1,7 @@
2010-06-06 Andreas Kirschbaum
+ * Do not flag tail parts of monsters in shops as "pait items".
+
* Fix "reload faces".
* Fix NullPointerException in "paste exit" when connecting to an
Modified: trunk/src/app/net/sf/gridarta/validation/checks/AbstractShopSquareChecker.java
===================================================================
--- trunk/src/app/net/sf/gridarta/validation/checks/AbstractShopSquareChecker.java 2010-06-06 19:37:12 UTC (rev 8185)
+++ trunk/src/app/net/sf/gridarta/validation/checks/AbstractShopSquareChecker.java 2010-06-06 19:52:05 UTC (rev 8186)
@@ -69,7 +69,7 @@
*/
private boolean isMatching(@NotNull final Iterable<G> mapSquare, @NotNull final GameObjectMatcher matcher) {
for (final GameObject<G, A, R> gameObject : mapSquare) {
- if (matcher.isMatching(gameObject)) {
+ if (matcher.isMatching(gameObject.getHead())) {
return true;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
