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-05 11:05:57
|
Revision: 8135
http://gridarta.svn.sourceforge.net/gridarta/?rev=8135&view=rev
Author: akirschbaum
Date: 2010-06-05 11:05:51 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Disable warnings.
Modified Paths:
--------------
trunk/gridarta.ipr
Modified: trunk/gridarta.ipr
===================================================================
--- trunk/gridarta.ipr 2010-06-05 11:04:58 UTC (rev 8134)
+++ trunk/gridarta.ipr 2010-06-05 11:05:51 UTC (rev 8135)
@@ -537,7 +537,7 @@
<inspection_tool class="ThreadDumpStack" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="ThrowablePrintStackTrace" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="TooBroadCatch" enabled="true" level="WARNING" enabled_by_default="true">
- <option name="onlyWarnOnRootExceptions" value="false" />
+ <option name="onlyWarnOnRootExceptions" value="true" />
</inspection_tool>
<inspection_tool class="TooBroadScope" enabled="true" level="WARNING" enabled_by_default="true">
<option name="m_allowConstructorAsInitializer" value="false" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 11:05:05
|
Revision: 8134
http://gridarta.svn.sourceforge.net/gridarta/?rev=8134&view=rev
Author: akirschbaum
Date: 2010-06-05 11:04:58 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Report I/O exception messages to user.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
Modified: trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java 2010-06-05 11:04:03 UTC (rev 8133)
+++ trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java 2010-06-05 11:04:58 UTC (rev 8134)
@@ -157,8 +157,8 @@
log.error("File '" + spellFile.getAbsolutePath() + "' not found!");
} catch (final EOFException ignored) {
// Eventually expected exception, don't handle.
- } catch (final IOException e) {
- log.error("Cannot read file '" + spellFile.getAbsolutePath() + "'!");
+ } catch (final IOException ex) {
+ log.error("Cannot read file '" + spellFile.getAbsolutePath() + "': " + ex.getMessage());
}
}
@@ -198,8 +198,8 @@
} finally {
out.close();
}
- } catch (final IOException e) {
- log.error("Cannot write file '" + dirFile.getAbsolutePath() + "'!");
+ } catch (final IOException ex) {
+ log.error("Cannot write file '" + dirFile.getAbsolutePath() + "': " + ex.getMessage());
}
}
return spells.size();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 11:04:10
|
Revision: 8133
http://gridarta.svn.sourceforge.net/gridarta/?rev=8133&view=rev
Author: akirschbaum
Date: 2010-06-05 11:04:03 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Rename exception names.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
trunk/src/app/net/sf/gridarta/model/scripts/ScriptUtils.java
trunk/src/app/net/sf/gridarta/script/Script.java
Modified: trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java 2010-06-05 11:02:29 UTC (rev 8132)
+++ trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java 2010-06-05 11:04:03 UTC (rev 8133)
@@ -153,9 +153,9 @@
} finally {
fis.close();
}
- } catch (final FileNotFoundException e) {
+ } catch (final FileNotFoundException ignored) {
log.error("File '" + spellFile.getAbsolutePath() + "' not found!");
- } catch (final EOFException e) {
+ } catch (final EOFException ignored) {
// Eventually expected exception, don't handle.
} catch (final IOException e) {
log.error("Cannot read file '" + spellFile.getAbsolutePath() + "'!");
Modified: trunk/src/app/net/sf/gridarta/model/scripts/ScriptUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/scripts/ScriptUtils.java 2010-06-05 11:02:29 UTC (rev 8132)
+++ trunk/src/app/net/sf/gridarta/model/scripts/ScriptUtils.java 2010-06-05 11:04:03 UTC (rev 8133)
@@ -66,7 +66,7 @@
// script file is NOT in a sub-directory of map file -> absolute path
try {
path = f.getAbsolutePath().substring(mapDir.getCanonicalPath().length());
- } catch (final IOException e) {
+ } catch (final IOException ignored) {
path = f.getAbsolutePath().substring(mapDir.getAbsolutePath().length());
}
path = path.replace('\\', '/');
@@ -77,7 +77,7 @@
// script file is in a sub-directory of map file -> relative path
try {
path = f.getAbsolutePath().substring(localMapDir.getCanonicalPath().length());
- } catch (final IOException e) {
+ } catch (final IOException ignored) {
path = f.getAbsolutePath().substring(localMapDir.getAbsolutePath().length());
}
path = path.replace('\\', '/');
Modified: trunk/src/app/net/sf/gridarta/script/Script.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/Script.java 2010-06-05 11:02:29 UTC (rev 8132)
+++ trunk/src/app/net/sf/gridarta/script/Script.java 2010-06-05 11:04:03 UTC (rev 8133)
@@ -279,7 +279,7 @@
public PluginParameter<G, A, R, ?, ?> getParameter(final int index) throws NoSuchParameterException {
try {
return parameters.get(index);
- } catch (final IndexOutOfBoundsException ex) {
+ } catch (final IndexOutOfBoundsException ignored) {
throw new NoSuchParameterException(index);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 11:02:35
|
Revision: 8132
http://gridarta.svn.sourceforge.net/gridarta/?rev=8132&view=rev
Author: akirschbaum
Date: 2010-06-05 11:02:29 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Replace string constants with named constants.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/script/ScriptModelParser.java
Modified: trunk/src/app/net/sf/gridarta/script/ScriptModelParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/ScriptModelParser.java 2010-06-05 10:59:27 UTC (rev 8131)
+++ trunk/src/app/net/sf/gridarta/script/ScriptModelParser.java 2010-06-05 11:02:29 UTC (rev 8132)
@@ -40,6 +40,24 @@
public class ScriptModelParser<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> {
/**
+ * Whether the plugin script is in auto-boot mode.
+ */
+ @NotNull
+ private static final String AUTO_BOOT = "autoboot";
+
+ /**
+ * Whether the plugin script is a filter.
+ */
+ @NotNull
+ private static final String FILTER = "filter";
+
+ /**
+ * Whether the plugin script is a stand-alone script.
+ */
+ @NotNull
+ private static final String BASH = "bash";
+
+ /**
* The Logger for printing log messages.
*/
private static final Category log = Logger.getLogger(ScriptModelParser.class);
@@ -75,11 +93,11 @@
for (final Element m : modes) {
final boolean b = Boolean.valueOf(m.getTextTrim());
final String name = m.getName();
- if ("autoboot".equalsIgnoreCase(name) && b) {
+ if (AUTO_BOOT.equalsIgnoreCase(name) && b) {
isAutoBoot = true;
- } else if ("filter".equalsIgnoreCase(name) && b) {
+ } else if (FILTER.equalsIgnoreCase(name) && b) {
isFilter = true;
- } else if ("bash".equalsIgnoreCase(name) && b) {
+ } else if (BASH.equalsIgnoreCase(name) && b) {
isScript = true;
}
}
@@ -113,7 +131,7 @@
n.addContent(scriptModel.getName());
try {
c.addContent(new CDATA(scriptModel.getCode())); // protect code in xml!
- } catch (final IllegalDataException e) {
+ } catch (final IllegalDataException ignored) {
//can't be converted to CDATA :(
c.addContent(scriptModel.getCode());
}
@@ -121,11 +139,11 @@
root.addContent(c);
final Element modes = new Element("mode");
- final Element autoBoot = new Element("autoboot");
+ final Element autoBoot = new Element(AUTO_BOOT);
autoBoot.addContent(Boolean.toString(scriptModel.isAutoBoot()));
- final Element bash = new Element("bash");
+ final Element bash = new Element(BASH);
bash.addContent(Boolean.toString(scriptModel.isScript()));
- final Element filter = new Element("filter");
+ final Element filter = new Element(FILTER);
filter.addContent(Boolean.toString(scriptModel.isFilter()));
modes.addContent(autoBoot);
modes.addContent(bash);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 10:59:33
|
Revision: 8131
http://gridarta.svn.sourceforge.net/gridarta/?rev=8131&view=rev
Author: akirschbaum
Date: 2010-06-05 10:59:27 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Add comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/script/Script.java
Modified: trunk/src/app/net/sf/gridarta/script/Script.java
===================================================================
--- trunk/src/app/net/sf/gridarta/script/Script.java 2010-06-05 10:43:15 UTC (rev 8130)
+++ trunk/src/app/net/sf/gridarta/script/Script.java 2010-06-05 10:59:27 UTC (rev 8131)
@@ -43,39 +43,64 @@
/**
* Model for Scripts.
* @author tchize
- * @todo documentation
+ * @author Andreas Kirschbaum
*/
public class Script<G extends GameObject<G, A, R>, A extends MapArchObject<A>, R extends Archetype<G, A, R>> implements Iterable<PluginParameter<G, A, R, ?, ?>> {
/**
* The Logger for printing log messages.
*/
+ @NotNull
private static final Category log = Logger.getLogger(Script.class);
+ /**
+ * The plugin script's executable code.
+ */
+ @NotNull
private String code = "";
+ /**
+ * The {@link PluginParameter PluginParameters} for this plugin script.
+ */
+ @NotNull
private final List<PluginParameter<G, A, R, ?, ?>> parameters = new ArrayList<PluginParameter<G, A, R, ?, ?>>();
/**
- * The script name.
+ * The plugin script's name.
*/
@NotNull
private final String name;
+ /**
+ * The {@link PluginParameterFactory} for creating plugin parameters.
+ */
@NotNull
private final PluginParameterFactory<G, A, R> pluginParameterFactory;
+ /**
+ * Whether this plugin script is run whenever the editor starts.
+ */
private boolean autoBoot = false;
+ /**
+ * Whether this plugin script is a filter.
+ */
private boolean filter = false;
+ /**
+ * Whether this plugin script is a stand-alone script.
+ */
private boolean script = false;
+ /**
+ * The {@link ChangeListener ChangeListeners} to inform about changes.
+ */
+ @NotNull
private final Collection<ChangeListener> listeners = new HashSet<ChangeListener>();
/**
- * The location to save this script to; set to <code>null</code> if the
- * script has no associated location.
+ * The location to save this plugin script to; set to <code>null</code> if
+ * the script has no associated location.
*/
@Nullable
private File file = null;
@@ -88,6 +113,8 @@
/**
* Creates a new instance.
* @param name the script name
+ * @param pluginParameterFactory the plugin parameter factory for creating
+ * plugin parameters
*/
public Script(@NotNull final String name, @NotNull final PluginParameterFactory<G, A, R> pluginParameterFactory) {
this.name = name;
@@ -95,8 +122,8 @@
}
/**
- * Returns the name of this ScriptModel.
- * @return The name of this ScriptModel.
+ * Returns the name of this plugin script.
+ * @return the name of this plugin script
*/
@NotNull
public String getName() {
@@ -104,18 +131,19 @@
}
/**
- * Returns the source code of this script model.
- * @return the source code of this script model
+ * Returns the executable code of this plugin script.
+ * @return the executable code of this plugin script
*/
+ @NotNull
public String getCode() {
return code;
}
/**
- * Sets the code of this ScriptModel.
- * @param code The code of this ScriptModel.
+ * Sets the executable code of this plugin script.
+ * @param code the executable code of this plugin script
*/
- public void setCode(final String code) {
+ public void setCode(@NotNull final String code) {
if (this.code.equals(code)) {
return;
}
@@ -126,16 +154,16 @@
}
/**
- * Returns whether this script has at least one parameter.
- * @return whether this script has at least one parameter
+ * Returns whether this plugin script has at least one parameter.
+ * @return whether this plugin script has at least one parameter
*/
public boolean hasParameters() {
return !parameters.isEmpty();
}
/**
- * Returns the index for a parameter name.
- * @param paramName the parameter name
+ * Returns the index for a plugin parameter name.
+ * @param paramName the plugin parameter name
* @return the index or <code>-1</code> if the parameter name does not
* exist
*/
@@ -150,40 +178,59 @@
return -1;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toString() {
return name;
}
+ /**
+ * Creates a new plugin parameter.
+ */
public void newParameter() {
- final PluginParameter<G, A, R, ?, ?> p;
+ final PluginParameter<G, A, R, ?, ?> pluginParameter;
try {
- p = pluginParameterFactory.createParameter(StringParameter.PARAMETER_TYPE);
+ pluginParameter = pluginParameterFactory.createParameter(StringParameter.PARAMETER_TYPE);
} catch (final NoSuchParameterException ex) {
log.warn("Cannot create parameter: " + ex.getMessage());
return;
}
- parameters.add(p);
+ parameters.add(pluginParameter);
modified = true;
notifyListeners();
}
+ /**
+ * Removes a plugin parameter.
+ * @param index the plugin parameter's index
+ */
public void removeParameter(final int index) {
parameters.remove(index);
modified = true;
notifyListeners();
}
+ /**
+ * Adds a {@link ChangeListener} to be notified about changes.
+ * @param listener the change listener
+ */
public void addChangeListener(final ChangeListener listener) {
listeners.add(listener);
}
+ /**
+ * Removes a {@link ChangeListener} to be notified about changes.
+ * @param listener the change listener
+ */
public void removeListener(final ChangeListener listener) {
listeners.remove(listener);
}
/**
- * Tell all listeners plugged on this ScriptModel its content has changed.
+ * Notifies all registered {@link ChangeListener ChangeListeners} that this
+ * plugin script has changed.
*/
private void notifyListeners() {
final ChangeEvent e = new ChangeEvent(this);
@@ -193,9 +240,10 @@
}
/**
- * Get a clone copy of this SCriptModel. The copy include name, code, type
- * and a clone of each parameter. The listener are not moved along.
- * @return a clone of this ScriptModel
+ * Returns a clone copy of this plugin script. The copy include name,
+ * executable code, type and a clone of each parameter. The change listeners
+ * are not copied.
+ * @return a clone of this plugin script
*/
@NotNull
public Script<G, A, R> cloneScript() {
@@ -212,20 +260,20 @@
}
/**
- * Adds a parameter to this script.
- * @param p the parameter to add
+ * Adds a plugin parameter to this plugin script.
+ * @param pluginParameter the plugin parameter to add
*/
- public void addParameter(final PluginParameter<G, A, R, ?, ?> p) {
- parameters.add(p);
+ public void addParameter(@NotNull final PluginParameter<G, A, R, ?, ?> pluginParameter) {
+ parameters.add(pluginParameter);
modified = true;
notifyListeners();
}
/**
- * Gets the PluginParameter at a given index.
- * @param index The index of parameter to get. Must be between 0 and
- * getParametersCount(). If index is out of range, result is undefined.
- * @return the requested parameter
+ * Returns the {@link PluginParameter} at a given index.
+ * @param index the index of parameter to return; must be between
+ * <code>0</code> and <code>getParametersCount()</code>
+ * @return the plugin parameter
* @throws NoSuchParameterException if the index is invalid
*/
public PluginParameter<G, A, R, ?, ?> getParameter(final int index) throws NoSuchParameterException {
@@ -237,30 +285,34 @@
}
/**
- * Check if this script is an auto boot script (a script run at load time).
- * @return true if script is an auto boot script, false otherwise
+ * Returns whether this plugin script is run whenever the editor starts.
+ * @return whether this plugin script is run whenever the editor starts
*/
public boolean isAutoBoot() {
return autoBoot;
}
/**
- * Check if this script is a script (script run from the run script menu).
- * @return true if script is a script, false otherwise
+ * Returns whether this plugin script is a stand-alone script.
+ * @return whether this plugin script is a stand-alone script
*/
public boolean isScript() {
return script;
}
/**
- * Check if this script is a filter script (will appear in the map filter
- * list menu).
- * @return true if the script is a filter script, false otherwise
+ * Returns whether this plugin script is a filter.
+ * @return whether this plugin script is a filter
*/
public boolean isFilter() {
return filter;
}
+ /**
+ * Sets whether this plugin script is run whenever the editor starts.
+ * @param autoBoot whether this plugin script is run whenever the editor
+ * starts
+ */
public void setAutoBoot(final boolean autoBoot) {
if (this.autoBoot == autoBoot) {
return;
@@ -270,6 +322,10 @@
notifyListeners();
}
+ /**
+ * Sets whether this plugin script is a stand-alone script.
+ * @param script whether this plugin script is a stand-alone script
+ */
public void setScript(final boolean script) {
if (this.script == script) {
return;
@@ -279,6 +335,10 @@
notifyListeners();
}
+ /**
+ * Sets whether this plugin script is a filter.
+ * @param filter whether this plugin script is a filter
+ */
public void setFilter(final boolean filter) {
if (this.filter == filter) {
return;
@@ -288,27 +348,41 @@
notifyListeners();
}
+ /**
+ * Changes the type of a plugin parameter.
+ * @param index the plugin parameter's index
+ * @param newType the new type
+ * @throws NoSuchParameterException if the index is invalid
+ */
public void convertType(final int index, @NotNull final String newType) throws NoSuchParameterException {
parameters.set(index, pluginParameterFactory.createParameter(newType, parameters.get(index).toXML()));
modified = true;
notifyListeners();
}
- public void convertType(final PluginParameter<G, A, R, ?, ?> parameter, @NotNull final String newType) throws NoSuchParameterException {
- final int index = parameters.indexOf(parameter);
+ /**
+ * Changes the type of a plugin parameter.
+ * @param pluginParameter the plugin parameter
+ * @param newType the new type
+ * @throws NoSuchParameterException if the index is invalid
+ */
+ public void convertType(@NotNull final PluginParameter<G, A, R, ?, ?> pluginParameter, @NotNull final String newType) throws NoSuchParameterException {
+ final int index = parameters.indexOf(pluginParameter);
convertType(index, newType);
}
/**
- * Return whether the script contents has been modified since last save.
- * @return Whether the script contents has been modified since last save.
+ * Returns whether the plugin script contents have been modified since last
+ * save.
+ * @return whether the plugin script contents have been modified since last
+ * save
*/
public boolean isModified() {
return modified;
}
/**
- * Mark the script as unmodified since last save.
+ * Marks the script as unmodified since last save.
*/
public void resetModified() {
if (!modified) {
@@ -320,9 +394,9 @@
}
/**
- * Return the location to save this script to.
- * @return The location to save to, or <code>null</code> if the script has
- * no associated location.
+ * Returns the location to save this plugin script to.
+ * @return the location to save to, or <code>null</code> if the plugin
+ * script has no associated location
*/
@Nullable
public File getFile() {
@@ -330,8 +404,8 @@
}
/**
- * Set The location to save this script to.
- * @param file The location; may be <code>null</code>.
+ * Sets the location to save this plugin script to.
+ * @param file the save location or <code>null</code>
*/
public void setFile(@Nullable final File file) {
this.file = file;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 10:43:28
|
Revision: 8130
http://gridarta.svn.sourceforge.net/gridarta/?rev=8130&view=rev
Author: akirschbaum
Date: 2010-06-05 10:43:15 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Fix typos.
Modified Paths:
--------------
trunk/README
trunk/atrinik/debug/ReadMe.txt
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeSet.java
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/FilesResourcesReader.java
trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java
trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java
trunk/crossfire/Developer_README.txt
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/CrossfireEditor.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/Archetype.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeSet.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/io/MapArchObjectParser.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/AbstractResourcesReader.java
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/FilesResourcesReader.java
trunk/daimonin/INSTALL.txt
trunk/daimonin/debug/ReadMe.txt
trunk/daimonin/devlib/JAPI.xml
trunk/daimonin/devlib/README.txt
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/maincontrol/DefaultEditorFactory.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/ArchetypeParser.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/archetype/ArchetypeSet.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/resource/FilesResourcesReader.java
trunk/gridarta.ipr
trunk/src/app/net/sf/gridarta/actions/AttachTiledMaps.java
trunk/src/app/net/sf/gridarta/gui/archetypechooser/ArchetypePanel.java
trunk/src/app/net/sf/gridarta/gui/autovalidator/AutoValidator.java
trunk/src/app/net/sf/gridarta/gui/connectionview/View.java
trunk/src/app/net/sf/gridarta/gui/copybuffer/CopyMode.java
trunk/src/app/net/sf/gridarta/gui/data/NamedObjectsUtils.java
trunk/src/app/net/sf/gridarta/gui/errorview/DefaultErrorView.java
trunk/src/app/net/sf/gridarta/gui/filter/FilterState.java
trunk/src/app/net/sf/gridarta/gui/findarchetypes/FindArchetypesDialog.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/ConfirmErrorsAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributesdialog/MaskChangeAL.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/ArchTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/EventsTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/FaceTab.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesControl.java
trunk/src/app/net/sf/gridarta/gui/gameobjectattributespanel/GameObjectAttributesModelListener.java
trunk/src/app/net/sf/gridarta/gui/help/Help.java
trunk/src/app/net/sf/gridarta/gui/help/HtmlPane.java
trunk/src/app/net/sf/gridarta/gui/io/FileFilters.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/GameObjectTab.java
trunk/src/app/net/sf/gridarta/gui/mainwindow/WarningsTab.java
trunk/src/app/net/sf/gridarta/gui/map/cursor/MapCursor.java
trunk/src/app/net/sf/gridarta/gui/map/event/MouseOpAdapter.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapView.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewBasic.java
trunk/src/app/net/sf/gridarta/gui/map/mapview/MapViewFactory.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/AbstractSimpleIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/GridMapSquarePainter.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/ImageCreator2.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/IsoPickmapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/MapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/SimpleIsoMapRenderer.java
trunk/src/app/net/sf/gridarta/gui/map/renderer/ToolTipAppender.java
trunk/src/app/net/sf/gridarta/gui/map/tools/DeletionTool.java
trunk/src/app/net/sf/gridarta/gui/map/tools/ToolSelector.java
trunk/src/app/net/sf/gridarta/gui/mapdesktop/MapDesktop.java
trunk/src/app/net/sf/gridarta/gui/mapimagecache/ImageType.java
trunk/src/app/net/sf/gridarta/gui/misc/MainView.java
trunk/src/app/net/sf/gridarta/gui/misc/StatusBar.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractMapsizeNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/AbstractNewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/newmap/NewMapDialog.java
trunk/src/app/net/sf/gridarta/gui/objectchooser/ObjectChooser.java
trunk/src/app/net/sf/gridarta/gui/pickmapchooser/PickmapChooserControl.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/MatchCriteria.java
trunk/src/app/net/sf/gridarta/gui/replacedialog/ReplaceDialog.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptController.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptEditor.java
trunk/src/app/net/sf/gridarta/gui/script/ScriptManager.java
trunk/src/app/net/sf/gridarta/gui/script/StackLayout.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBox.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxEditor.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/ArchComboBoxModel.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/DoubleParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/IntegerParameterView.java
trunk/src/app/net/sf/gridarta/gui/script/parameter/StringParameterView.java
trunk/src/app/net/sf/gridarta/gui/scripts/DefaultScriptArchEditor.java
trunk/src/app/net/sf/gridarta/gui/scripts/ScriptedEventEditor.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/MapSquareSelection.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/ModelUpdater.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareControl.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareModel.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/SelectedSquareView.java
trunk/src/app/net/sf/gridarta/gui/shortcuts/ShortcutsDialog.java
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/ShrinkMapSizeDialog.java
trunk/src/app/net/sf/gridarta/gui/shrinkmapsizedialog/ShrinkMapSizeDialogManager.java
trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
trunk/src/app/net/sf/gridarta/gui/treasurelist/TreasureCellRenderer.java
trunk/src/app/net/sf/gridarta/gui/utils/AnimTreeChooseAction.java
trunk/src/app/net/sf/gridarta/gui/utils/DirectionLayout.java
trunk/src/app/net/sf/gridarta/gui/utils/FaceTreeChooseAction.java
trunk/src/app/net/sf/gridarta/gui/utils/GList.java
trunk/src/app/net/sf/gridarta/gui/utils/GSplitPane.java
trunk/src/app/net/sf/gridarta/gui/utils/HideFileFilterProxy.java
trunk/src/app/net/sf/gridarta/gui/utils/MapFileFilter.java
trunk/src/app/net/sf/gridarta/gui/utils/tabbedpanel/Tab.java
trunk/src/app/net/sf/gridarta/gui/utils/tabbedpanel/TabbedPanel.java
trunk/src/app/net/sf/gridarta/mainactions/DefaultExiter.java
trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
trunk/src/app/net/sf/gridarta/mapfiles/Loader.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFile.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolder.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolderNotEmptyException.java
trunk/src/app/net/sf/gridarta/mapfiles/MapFolderTree.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/mapmanager/MapManager.java
trunk/src/app/net/sf/gridarta/model/anim/AnimationObject.java
trunk/src/app/net/sf/gridarta/model/anim/AnimationParseException.java
trunk/src/app/net/sf/gridarta/model/anim/DefaultAnimationObject.java
trunk/src/app/net/sf/gridarta/model/anim/DefaultAnimationObjects.java
trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetypeBuilder.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/AttributeListUtils.java
trunk/src/app/net/sf/gridarta/model/archetypechooser/ArchetypeChooserFolder.java
trunk/src/app/net/sf/gridarta/model/artifact/ArtifactParser.java
trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinList.java
trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinLists.java
trunk/src/app/net/sf/gridarta/model/autojoin/AutojoinListsParser.java
trunk/src/app/net/sf/gridarta/model/baseobject/GameObjectContainer.java
trunk/src/app/net/sf/gridarta/model/data/AbstractNamedObject.java
trunk/src/app/net/sf/gridarta/model/data/NamedObject.java
trunk/src/app/net/sf/gridarta/model/data/NamedTreeNode.java
trunk/src/app/net/sf/gridarta/model/exitconnector/ExitConnectorModel.java
trunk/src/app/net/sf/gridarta/model/face/CollectedFaceProvider.java
trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java
trunk/src/app/net/sf/gridarta/model/face/DoubleImageFilter.java
trunk/src/app/net/sf/gridarta/model/face/FaceObjectProviders.java
trunk/src/app/net/sf/gridarta/model/face/FaceProvider.java
trunk/src/app/net/sf/gridarta/model/face/FilterFaceProvider.java
trunk/src/app/net/sf/gridarta/model/filter/FilterParser.java
trunk/src/app/net/sf/gridarta/model/filter/NamedFilterConfig.java
trunk/src/app/net/sf/gridarta/model/floodfill/FillUtils.java
trunk/src/app/net/sf/gridarta/model/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/model/gameobject/IsoMapSquareInfo.java
trunk/src/app/net/sf/gridarta/model/gameobject/MultiArchData.java
trunk/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java
trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
trunk/src/app/net/sf/gridarta/model/io/AnimationObjectsReader.java
trunk/src/app/net/sf/gridarta/model/io/CacheFiles.java
trunk/src/app/net/sf/gridarta/model/map/grid/MapGrid.java
trunk/src/app/net/sf/gridarta/model/map/maparchobject/AbstractMapArchObject.java
trunk/src/app/net/sf/gridarta/model/map/maparchobject/MapArchObject.java
trunk/src/app/net/sf/gridarta/model/map/mapcontrol/DefaultMapControl.java
trunk/src/app/net/sf/gridarta/model/map/mapcontrol/MapControl.java
trunk/src/app/net/sf/gridarta/model/map/mapmodel/DefaultMapModel.java
trunk/src/app/net/sf/gridarta/model/map/normalizer/MapPathNormalizer.java
trunk/src/app/net/sf/gridarta/model/map/validation/errors/CorrectableError.java
trunk/src/app/net/sf/gridarta/model/map/validation/errors/EmptySpawnPointError.java
trunk/src/app/net/sf/gridarta/model/map/validation/errors/ValidationError.java
trunk/src/app/net/sf/gridarta/model/mapviewsettings/MapViewSettings.java
trunk/src/app/net/sf/gridarta/model/mapviewsettings/MapViewSettingsListener.java
trunk/src/app/net/sf/gridarta/model/match/GameObjectMatcher.java
trunk/src/app/net/sf/gridarta/model/match/GameObjectMatcherParser.java
trunk/src/app/net/sf/gridarta/model/match/NamedGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/model/match/SetEnabledAction.java
trunk/src/app/net/sf/gridarta/model/scripts/ScriptUtils.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureListsParser.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureObj.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTree.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureTreeNode.java
trunk/src/app/net/sf/gridarta/resource/AbstractResourcesReader.java
trunk/src/app/net/sf/gridarta/script/Script.java
trunk/src/app/net/sf/gridarta/script/ScriptModelParser.java
trunk/src/app/net/sf/gridarta/script/ScriptRunMode.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/EditWindowListener.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditControl.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditUndoActions.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
trunk/src/app/net/sf/gridarta/textedit/textarea/DefaultInputHandler.java
trunk/src/app/net/sf/gridarta/textedit/textarea/JEditTextArea.java
trunk/src/app/net/sf/gridarta/textedit/textarea/ScrollLayout.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxDocument.java
trunk/src/app/net/sf/gridarta/textedit/textarea/SyntaxUtilities.java
trunk/src/app/net/sf/gridarta/textedit/textarea/TextAreaPainter.java
trunk/src/app/net/sf/gridarta/textedit/textarea/TextUtilities.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Copy.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Cut.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Find.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/FunctionMenu.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/InputActions.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/Save.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/KeywordMap.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/Parameter.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/PythonTokenMarker.java
trunk/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/TokenMarker.java
trunk/src/app/net/sf/gridarta/updater/Updater.java
trunk/src/app/net/sf/gridarta/updater/UpdaterManager.java
trunk/src/app/net/sf/gridarta/utils/CommonConstants.java
trunk/src/app/net/sf/gridarta/utils/FileChooserUtils.java
trunk/src/app/net/sf/gridarta/utils/GUIUtils.java
trunk/src/app/net/sf/gridarta/utils/IOUtils.java
trunk/src/app/net/sf/gridarta/utils/ProcessRunner.java
trunk/src/app/net/sf/gridarta/utils/StringUtils.java
trunk/src/app/net/sf/gridarta/utils/SystemIcons.java
trunk/src/app/net/sf/gridarta/validation/AbstractValidator.java
trunk/src/app/net/sf/gridarta/validation/checks/AttributeRangeChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedMatrix.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedSpawnPointChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/BlockedSquareChecker.java
trunk/src/app/net/sf/gridarta/validation/checks/Entry.java
trunk/src/app/net/sf/gridarta/validation/checks/ExitChecker.java
trunk/src/test/net/sf/gridarta/gui/map/cursor/MapCursorTest.java
trunk/src/test/net/sf/gridarta/gui/utils/GSplitPaneTestApplication.java
trunk/src/test/net/sf/gridarta/model/archetype/ArchetypeParserTest.java
trunk/src/test/net/sf/gridarta/model/archetype/AttributeListUtilsTest.java
trunk/src/test/net/sf/gridarta/model/artifact/ArtifactParserTest.java
trunk/src/test/net/sf/gridarta/model/baseobject/AbstractBaseObjectTest.java
trunk/src/test/net/sf/gridarta/model/io/PathManagerTest.java
trunk/src/test/net/sf/gridarta/model/map/maparchobject/TestMapArchObject.java
trunk/src/test/net/sf/gridarta/model/map/mapmodel/DefaultMapModelTest.java
trunk/src/test/net/sf/gridarta/utils/StringUtilsTest.java
trunk/src/test/net/sf/gridarta/utils/WrappingStringBuilderTest.java
Added Paths:
-----------
trunk/src/app/net/sf/gridarta/gui/prefs/AppPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/DevPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/GUIPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/MapValidatorPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/MiscPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/NetPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/ResPreferences.java
trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePreferences.java
trunk/src/app/net/sf/gridarta/gui/utils/AsynchronousProgress.java
trunk/src/app/net/sf/gridarta/model/floodfill/FloodFill.java
trunk/src/app/net/sf/gridarta/model/io/SubDirectoryCacheFiles.java
trunk/src/app/net/sf/gridarta/model/match/AttributeGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/ToggleRectangle.java
Removed Paths:
-------------
trunk/src/app/net/sf/gridarta/gui/prefs/AppPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/DevPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/GUIPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/MapValidatorPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/MiscPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/NetPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/ResPrefs.java
trunk/src/app/net/sf/gridarta/gui/prefs/UpdatePrefs.java
trunk/src/app/net/sf/gridarta/gui/utils/AsynchonousProgress.java
trunk/src/app/net/sf/gridarta/model/floodfill/Floodfill.java
trunk/src/app/net/sf/gridarta/model/io/SubdirectoryCacheFiles.java
trunk/src/app/net/sf/gridarta/model/match/AttribGameObjectMatcher.java
trunk/src/app/net/sf/gridarta/textedit/textarea/actions/ToggleRect.java
Modified: trunk/README
===================================================================
--- trunk/README 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/README 2010-06-05 10:43:15 UTC (rev 8130)
@@ -38,7 +38,7 @@
-------------------
Java 6.0 or later
Previous versions of Java will not work. Gridarta uses Generics,
- autoboxing, static imports, foreach loops, assertions, covariant return
+ auto-boxing, static imports, foreach loops, assertions, covariant return
types and varargs quite a lot.
Ant 1.6.5 or later
Modified: trunk/atrinik/debug/ReadMe.txt
===================================================================
--- trunk/atrinik/debug/ReadMe.txt 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/debug/ReadMe.txt 2010-06-05 10:43:15 UTC (rev 8130)
@@ -1,18 +1,18 @@
-Daimonin Editor Debuging:
+Daimonin Editor Debugging:
-------------------------
-The linux and win32 debugin programs were created to help users,
+The linux and win32 debugging programs were created to help users,
like your self, to identify any bugs in the editor, that are reported
-by the debugers. If a problem does exist you can forward the error
+by the debuggers. If a problem does exist you can forward the error
message that appears in your debugging console.
Intro:
------
-In no way do you have to use either of the debugers... they are simply
-to help the developement team in finding bugs.... If you are not running
-the debugers and come across what you think might be a bug. Restart the
-editor with a debuger (Win32Debug) or (linuxDebug) and try to recreate the
+In no way do you have to use either of the debuggers... they are simply
+to help the development team in finding bugs.... If you are not running
+the debuggers and come across what you think might be a bug. Restart the
+editor with a debugger (Win32Debug) or (linuxDebug) and try to recreate the
problem.
Note: In order to be able to debug, you must have built the editor with
@@ -24,7 +24,7 @@
Win32 users:
------------
-Just double click the "Win32Debug.bat" file this will run the
+Just double click the "Win32Debug.bat" file this will run the
Daimonin Editor from the Command Prompt, thus allowing you
to see any system messages that may appear.
@@ -33,13 +33,13 @@
------------
Change to the editor directory (daimonin/editor)
Run the "debug/LinuxDebug.sh"
-You will also get to see all the debuging info as well be able to use a Java
+You will also get to see all the debugging info as well be able to use a Java
debugger to attach, set breakpoints, step through etc..
"I found a bug!!"
-----------------
-If you find some sort of bug/error please copy the whole error message and
+If you find some sort of bug/error please copy the whole error message and
either past it in the bug forum @ http://www.daimonin.com or paste the message
into an email and send it to both dai...@no... or cha...@ho....
Also include your:
@@ -49,4 +49,4 @@
use the Subject Name "Editor Bug")
Good luck!
-Thank you for your time, The Daimonin Devs.
+Thank you for your time, The Daimonin Developers.
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/maincontrol/DefaultEditorFactory.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -35,15 +35,15 @@
import net.sf.gridarta.gui.map.renderer.RendererFactory;
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
+import net.sf.gridarta.gui.prefs.AppPreferences;
import net.sf.gridarta.gui.prefs.AppPreferencesModel;
-import net.sf.gridarta.gui.prefs.AppPrefs;
-import net.sf.gridarta.gui.prefs.DevPrefs;
-import net.sf.gridarta.gui.prefs.GUIPrefs;
-import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
-import net.sf.gridarta.gui.prefs.MiscPrefs;
-import net.sf.gridarta.gui.prefs.NetPrefs;
-import net.sf.gridarta.gui.prefs.ResPrefs;
-import net.sf.gridarta.gui.prefs.UpdatePrefs;
+import net.sf.gridarta.gui.prefs.DevPreferences;
+import net.sf.gridarta.gui.prefs.GUIPreferences;
+import net.sf.gridarta.gui.prefs.MapValidatorPreferences;
+import net.sf.gridarta.gui.prefs.MiscPreferences;
+import net.sf.gridarta.gui.prefs.NetPreferences;
+import net.sf.gridarta.gui.prefs.ResPreferences;
+import net.sf.gridarta.gui.prefs.UpdatePreferences;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
@@ -75,7 +75,7 @@
import net.sf.gridarta.model.io.GameObjectParserFactory;
import net.sf.gridarta.model.io.MapWriter;
import net.sf.gridarta.model.io.PathManager;
-import net.sf.gridarta.model.io.SubdirectoryCacheFiles;
+import net.sf.gridarta.model.io.SubDirectoryCacheFiles;
import net.sf.gridarta.model.map.maparchobject.MapArchObjectFactory;
import net.sf.gridarta.model.map.mapcontrol.MapControlFactory;
import net.sf.gridarta.model.map.mapmodel.InsertionMode;
@@ -217,7 +217,7 @@
*/
@Override
public int getDoubleFaceOffset() {
- return isoMapSquareInfo.getYlen() - 1;
+ return isoMapSquareInfo.getYLen() - 1;
}
/**
@@ -463,7 +463,7 @@
@NotNull
@Override
public MapViewFactory<GameObject, MapArchObject, Archetype> newMapViewFactory(@NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final PathManager pathManager) {
- return new DefaultMapViewFactory<GameObject, MapArchObject, Archetype>(rendererFactory, isoMapSquareInfo.getXlen(), isoMapSquareInfo.getYlen(), pathManager);
+ return new DefaultMapViewFactory<GameObject, MapArchObject, Archetype>(rendererFactory, isoMapSquareInfo.getXLen(), isoMapSquareInfo.getYLen(), pathManager);
}
/**
@@ -529,7 +529,7 @@
@NotNull
@Override
public PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final AppPreferencesModel appPreferencesModel, @NotNull final ExitConnectorModel exitConnectorModel, @NotNull final ConfigSourceFactory configSourceFactory) {
- return new PreferencesGroup("Gridarta for Atrinik", new ResPrefs(globalSettings, configSourceFactory), new AppPrefs(appPreferencesModel), new NetPrefs(), new GUIPrefs(globalSettings), new MiscPrefs(exitConnectorModel, globalSettings), new DevPrefs(), new UpdatePrefs(), new MapValidatorPrefs(validators, PREFERENCES_VALIDATOR_AUTO_DEFAULT));
+ return new PreferencesGroup("Gridarta for Atrinik", new ResPreferences(globalSettings, configSourceFactory), new AppPreferences(appPreferencesModel), new NetPreferences(), new GUIPreferences(globalSettings), new MiscPreferences(exitConnectorModel, globalSettings), new DevPreferences(), new UpdatePreferences(), new MapValidatorPreferences(validators, PREFERENCES_VALIDATOR_AUTO_DEFAULT));
}
/**
@@ -538,7 +538,7 @@
@NotNull
@Override
public GUIMainControl<GameObject, MapArchObject, Archetype> createGUIMainControl(@NotNull final DefaultMainControl<GameObject, MapArchObject, Archetype> mainControl, @NotNull final ErrorView errorView, @NotNull final GUIUtils guiUtils, @NotNull final ConfigSourceFactory configSourceFactory, @NotNull final RendererFactory<GameObject, MapArchObject, Archetype> rendererFactory, @NotNull final FilterControl<GameObject, MapArchObject, Archetype> filterControl, @NotNull final ScriptExecutor<GameObject, MapArchObject, Archetype> scriptExecutor, @NotNull final ScriptParameters scriptParameters, @NotNull final AbstractMapManager<GameObject, MapArchObject, Archetype> mapManager, @NotNull final MapManager<GameObject, MapArchObject, Archetype> pickmapManager, @NotNull final MapControlFactory<GameObject, MapArchObject, Archetype> mapControlFactory, @NotNull final net.sf.gridarta.model.archetype.ArchetypeSet<GameObject, MapArchObject, Archetype> archetypeSet, @NotNull final FaceObjects faceObjects, @NotNull final GlobalSettings globalSettings, @NotNull final MapViewSettings mapViewSettings, @NotNull final FaceObjectProviders faceObjectProviders, @NotNull final PathManager pathManager, @NotNull final InsertionMode<GameObject, MapArchObject, Archetype> topmostInsertionMode, @NotNull final GameObjectFactory<GameObject, MapArchObject, Archetype> gameObjectFactory, @NotNull final SystemIcons systemIcons, @NotNull final ArchetypeTypeSet archetypeTypeSet, @NotNull final MapArchObjectFactory<MapArchObject> mapArchObjectFactory, @NotNull final DefaultMapReaderFactory<GameObject, MapArchObject, Archetype> mapReaderFactory, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final GameObjectMatchers gameObjectMatchers, @NotNull final ScriptModel<GameObject, MapArchObject, Archetype> scriptModel, @NotNull final AnimationObjects animationObjects, @NotNull final ArchetypeChooserModel<GameObject, MapArchObject, Archetype> archetypeChooserModel, @NotNull final ScriptedEventEditor<GameObject, MapArchObject, Archetype> scriptedEventEditor, @NotNull final AbstractResources<GameObject, MapArchObject, Archetype> resources, @NotNull final Spells<NumberSpell> numberSpells, @NotNull final Spells<GameObjectSpell<GameObject, MapArchObject, Archetype>> gameObjectSpells, @NotNull final AttributeRangeChecker<GameObject, MapArchObject, Archetype> attributeRangeChecker, @NotNull final PluginParameterFactory<GameObject, MapArchObject, Archetype> pluginParameterFactory) {
- return mainControl.createGUIMainControl(FileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapControlFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubdirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new int[] { CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH, }, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
+ return mainControl.createGUIMainControl(FileFilters.pythonFileFilter, ".py", true, mapManager, pickmapManager, archetypeSet, mapControlFactory, guiUtils.getResourceIcon(IGUIConstants.TILE_NORTH), "AtrinikEditor.jar", new int[] { Archetype.TYPE_LOCKED_DOOR, Archetype.TYPE_SPECIAL_KEY, Archetype.TYPE_ALTAR_TRIGGER, Archetype.TYPE_MARKER, Archetype.TYPE_INVENTORY_CHECKER, Archetype.TYPE_SPAWN_POINT, Archetype.TYPE_CONTAINER, }, PREFERENCES_VALIDATOR_AUTO_DEFAULT, IGUIConstants.SPELL_FILE, this, errorView, new SubDirectoryCacheFiles(".dedit"), configSourceFactory, rendererFactory, filterControl, scriptExecutor, scriptParameters, faceObjects, globalSettings, mapViewSettings, faceObjectProviders, pathManager, topmostInsertionMode, gameObjectFactory, systemIcons, -1, archetypeTypeSet, mapArchObjectFactory, mapReaderFactory, validators, gameObjectMatchers, IGUIConstants.SCRIPTS_DIR, scriptModel, animationObjects, archetypeChooserModel, false, scriptedEventEditor, new int[] { CommonConstants.NORTH_EAST, CommonConstants.SOUTH_EAST, CommonConstants.SOUTH_WEST, CommonConstants.NORTH_WEST, CommonConstants.EAST, CommonConstants.SOUTH, CommonConstants.WEST, CommonConstants.NORTH, }, resources, gameObjectSpells, numberSpells, attributeRangeChecker, pluginParameterFactory);
}
/**
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParser.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -144,7 +144,7 @@
@Override
protected void finishParseArchetype(@NotNull final Archetype archetype) {
if (archetype.isMulti()) {
- calcLowestMulti(archetype);
+ calculateLowestMulti(archetype);
}
}
@@ -162,7 +162,7 @@
* order to get the overlapping correct. <p/>
* @param arch last tail part of this multi
*/
- private void calcLowestMulti(final net.sf.gridarta.model.archetype.Archetype<GameObject, MapArchObject, Archetype> arch) {
+ private void calculateLowestMulti(final net.sf.gridarta.model.archetype.Archetype<GameObject, MapArchObject, Archetype> arch) {
final Archetype head = arch.getHead();
int minYOffset = multiPositionData.getYOffset(head.getMultiShapeID(), head.getMultiPartNr());
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeSet.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeSet.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeSet.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -70,7 +70,7 @@
out.append("end\n");
- // process the multipart tails:
+ // process the multi-part tails:
int result = 1;
for (Archetype tail = arch.getMultiNext(); tail != null; tail = tail.getMultiNext()) {
result++;
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-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/resource/FilesResourcesReader.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -214,7 +214,7 @@
final String animPath = pair.getFirst();
final File animFile = pair.getSecond();
try {
- AnimationObjectsReader.loadAnims(animationObjects, errorViewCollector, animPath, animFile, "anim ", false);
+ AnimationObjectsReader.loadAnimations(animationObjects, errorViewCollector, animPath, animFile, "anim ", false);
} catch (final IOException ex) {
errorViewCollector.addWarning(ErrorViewCategory.ANIM_FILE_INVALID, ex.getMessage() + ", " + animFile);
} catch (final AnimationParseException ex) {
Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java
===================================================================
--- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/archetype/ArchetypeParserTest.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -66,7 +66,7 @@
*/
@Test
public void testMpartIdOk() throws IOException, UndefinedArchetypeException {
- check("Object head\nmpart_id 1\nend\nMore\nObject tail\nmpart_id 1\nend\n", false, false, 2);
+ check("Object head\n" + "mpart_id 1\n" + "end\nMore\nObject tail\n" + "mpart_id 1\n" + "end\n", false, false, 2);
Assert.assertEquals(1, getArchetypeSet().getArchetype("head").getMultiShapeID());
Assert.assertEquals(1, getArchetypeSet().getArchetype("tail").getMultiShapeID());
}
@@ -78,7 +78,7 @@
*/
@Test
public void testMpartIdInconsistent() throws IOException, UndefinedArchetypeException {
- check("Object head\nmpart_id 1\nend\nMore\nObject tail\nmpart_id 2\nend\n", false, true, 2);
+ check("Object head\n" + "mpart_id 1\n" + "end\nMore\nObject tail\n" + "mpart_id 2\n" + "end\n", false, true, 2);
Assert.assertEquals(1, getArchetypeSet().getArchetype("head").getMultiShapeID());
Assert.assertEquals(2, getArchetypeSet().getArchetype("tail").getMultiShapeID());
}
Modified: trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java
===================================================================
--- trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/atrinik/src/test/net/sf/gridarta/var/atrinik/model/maparchobject/MapArchObjectTest.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -44,10 +44,10 @@
@Test
public void testParseMapArchNoAttributes() throws IOException {
final MapArchObject mao = new MapArchObject();
- final AbstractMapArchObjectParser<MapArchObject> maop = new MapArchObjectParser();
+ final AbstractMapArchObjectParser<MapArchObject> mapArchObjectParser = new MapArchObjectParser();
final BufferedReader in = openTestDataReader("noAttributes.testdata");
try {
- maop.load(in, mao);
+ mapArchObjectParser.load(in, mao);
} finally {
in.close();
}
Modified: trunk/crossfire/Developer_README.txt
===================================================================
--- trunk/crossfire/Developer_README.txt 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/Developer_README.txt 2010-06-05 10:43:15 UTC (rev 8130)
@@ -6,7 +6,7 @@
1. The basic setup of the editor was done by Michael Toennies,
derived from a basic editor-application called "Gridder" by
- Pasi Ker\x84nen. Then, I (Andreas Vogl) have added the countless features
+ Pasi Ker�nen. Then, I (Andreas Vogl) have added the countless features
necessary to turn this application into a real useful CF map-editor.
We have both spent a lot of time on the editor (take a glimpse at the
CHANGES.txt file), so please communicate with us, best through the
@@ -26,9 +26,9 @@
spotted. Before you start to do this however, please double-check that
your editor is really configured to "insert spaces".
- Linefeeds may be checked in either in windows or in unix/linux style.
+ Line feeds may be checked in either in windows or in unix/linux style.
All reasonable text- and java editors can deal with both linefeed formats.
- Converting linefeeds is allowed, but in this case please make sure that only
+ Converting line feeds is allowed, but in this case please make sure that only
linefeed characters are changed and nothing else is affected.
2. Due to the platform-independent nature of Java, the editor has the
@@ -53,8 +53,8 @@
3. Unfortunately, the editor has relatively high performance requirements.
I've spent a lot of extra-work to keep everything as fast and
- memory-efficient as possible. So, when you add new datafields or
- calculations in the archobject area, please make sure they are as
+ memory-efficient as possible. So, when you add new data fields or
+ calculations in the archetype area, please make sure they are as
efficient as possible and worth both the time and space they consume.
Now don't be afraid too much. No development would be possible
@@ -86,7 +86,7 @@
For the record: "Model"-classes should contain data of an object.
"View"-classes should only manage the graphical layout and
appearance of an object. "Controller"-classes should manage
- events and dataflow, concering that object. In a perfect world,
+ events and data flow, concerning that object. In a perfect world,
these three things would be totally separated and you could
replace any of these parts without changing the others.
I have yet never seen it realized perfectly, so feel proud when
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/IGUIConstants.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -68,7 +68,7 @@
String ARCH_FILE = "archetypes"; // file with all arches
- String PNG_FILE = "crossfire.0"; // file with all pngs
+ String PNG_FILE = "crossfire.0"; // file with all png files
/**
* File to store the animation tree information after arch collection.
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/AbstractFlatMapRenderer.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -66,7 +66,7 @@
private static final long serialVersionUID = 1L;
/**
- * The offset to map borders (32 for std. rect. maps, 0 for pickmaps).
+ * The offset to map borders (32 for std. rectangular maps, 0 for pickmaps).
* @serial
*/
@NotNull
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SimpleFlatMapRenderer.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -138,12 +138,12 @@
/**
* Paint one square.
- * @param grfx the graphics context to draw to
+ * @param graphics the graphics context to draw to
* @param point the map coordinates of the square to draw
*/
- private void paintSquare(@NotNull final Graphics grfx, @NotNull final Point point) {
+ private void paintSquare(@NotNull final Graphics graphics, @NotNull final Point point) {
if (mapModel.getMapSquare(point).isEmpty()) {
- systemIcons.getEmptySquareIcon().paintIcon(this, grfx, point.x * IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT);
+ systemIcons.getEmptySquareIcon().paintIcon(this, graphics, point.x * IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT);
return;
}
@@ -161,13 +161,13 @@
offset.x = IGUIConstants.SQUARE_WIDTH * (node.getArchetype().getMultiX() - node.getMinX());
offset.y = IGUIConstants.SQUARE_HEIGHT * (node.getArchetype().getMultiY() - node.getMinY());
}
- grfx.drawImage(img.getImage(), point.x * IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT, point.x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, offset.x, offset.y, offset.x + IGUIConstants.SQUARE_WIDTH, offset.y + IGUIConstants.SQUARE_HEIGHT, this);
+ graphics.drawImage(img.getImage(), point.x * IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT, point.x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, point.y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, offset.x, offset.y, offset.x + IGUIConstants.SQUARE_WIDTH, offset.y + IGUIConstants.SQUARE_HEIGHT, this);
if (node.getAttributeInt("smoothlevel", true) > 0) {
- smoothingRenderer.paintSmooth(grfx, point.x, point.y, node.getAttributeInt("smoothlevel", true), layer, false, new Point(0, 0));
+ smoothingRenderer.paintSmooth(graphics, point.x, point.y, node.getAttributeInt("smoothlevel", true), layer, false, new Point(0, 0));
}
}
if (layer > -1) {
- smoothingRenderer.paintSmooth(grfx, point.x, point.y, 1, layer + 1, true, new Point(0, 0));
+ smoothingRenderer.paintSmooth(graphics, point.x, point.y, 1, layer + 1, true, new Point(0, 0));
}
}
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-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/SmoothingRenderer.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -71,25 +71,25 @@
}
/**
- * Draw the smoothing information at given postion of map, for a given limit
- * smoothlevel, at a given layer. This operation may be recursive, if all
- * layer above current are to be drawn too.
- * @param grfx where to draw (graphics)
- * @param x the x-coordinate of the mapsquare to draw, in map coordinates
- * @param y the y-coordinate of the mapsquare to draw, in map coordinates
- * @param level the limit smoothlevel (smoothlevels above this are drawn)
+ * Draw the smoothing information at given position of map, for a given
+ * limit smoothlevel, at a given layer. This operation may be recursive, if
+ * all layer above current are to be drawn too.
+ * @param graphics where to draw (graphics)
+ * @param x the x-coordinate of the map square to draw, in map coordinates
+ * @param y the y-coordinate of the map square to draw, in map coordinates
+ * @param level the limit smoothlevel (smooth levels above this are drawn)
* @param layer the layer (map z coordinate) to draw. Note that invisible
* objects are supposed to not use a layer, to stay coherent with client
* behavior
- * @param allLayers whever or not to draw also layers above current one
+ * @param allLayers whether or not to draw also layers above current one
* @param borderOffset the border offset
*/
- public void paintSmooth(@NotNull final Graphics grfx, final int x, final int y, final int level, final int layer, final boolean allLayers, @NotNull final Point borderOffset) {
+ public void paintSmooth(@NotNull final Graphics graphics, final int x, final int y, final int level, final int layer, final boolean allLayers, @NotNull final Point borderOffset) {
final net.sf.gridarta.model.gameobject.GameObject<?, ?, ?>[][] layerNode = { new net.sf.gridarta.model.gameobject.GameObject<?, ?, ?>[3], new net.sf.gridarta.model.gameobject.GameObject<?, ?, ?>[3], new net.sf.gridarta.model.gameobject.GameObject<?, ?, ?>[3] };
boolean foundLayer = false;
- for (int deltax = -1; deltax <= 1; deltax++) {
- for (int deltay = -1; deltay <= 1; deltay++) {
- final Point where = new Point(x + deltax, y + deltay);
+ for (int deltaX = -1; deltaX <= 1; deltaX++) {
+ for (int deltaY = -1; deltaY <= 1; deltaY++) {
+ final Point where = new Point(x + deltaX, y + deltaY);
if (mapModel.isPointValid(where)) {
int currentLayer = -1;
for (final net.sf.gridarta.model.gameobject.GameObject<GameObject, MapArchObject, Archetype> node : mapModel.getMapSquare(where)) {
@@ -99,7 +99,7 @@
if (currentLayer == layer) {
foundLayer = true;
if (node.getAttributeInt("smoothlevel", true) > 0) {
- layerNode[deltax + 1][deltay + 1] = node;
+ layerNode[deltaX + 1][deltaY + 1] = node;
}
break;
}
@@ -112,36 +112,36 @@
/*below is ripped and adapted from sdl client smooth renderer*/
final int[] dx = { 0, 1, 1, 1, 0, -1, -1, -1, };
final int[] dy = { -1, -1, 0, 1, 1, 1, 0, -1, };
- final int[] bweights = { 2, 0, 4, 0, 8, 0, 1, 0, };
- final int[] cweights = { 0, 2, 0, 4, 0, 8, 0, 1, };
+ final int[] bWeights = { 2, 0, 4, 0, 8, 0, 1, 0, };
+ final int[] cWeights = { 0, 2, 0, 4, 0, 8, 0, 1, };
final int[] bcExclude = { 1 + 2, /*north exclude northwest (bit0) and northeast(bit1)*/
0, 2 + 4, /*east exclude northeast and southeast*/
0, 4 + 8, /*and so on*/
0, 8 + 1, 0 };
- final boolean[] partdone = { false, false, false, false, false, false, false, false, };
+ final boolean[] partDone = { false, false, false, false, false, false, false, false, };
final Point src = new Point();
- final int[] slevels = new int[8];
- final FaceObject[] sfaces = new FaceObject[8];
+ final int[] sLevels = new int[8];
+ final FaceObject[] sFaces = new FaceObject[8];
for (int i = 0; i < 8; i++) {
final int emx = 1 + dx[i];
final int emy = 1 + dy[i];
if (layerNode[emx][emy] == null || layerNode[emx][emy].getAttributeInt("smoothlevel", true) <= level) {
- slevels[i] = 0;
- sfaces[i] = null; /*black picture*/
+ sLevels[i] = 0;
+ sFaces[i] = null; /*black picture*/
} else {
- slevels[i] = layerNode[emx][emy].getAttributeInt("smoothlevel", true);
- sfaces[i] = smoothFaces.getSmoothFace(layerNode[emx][emy]);
+ sLevels[i] = layerNode[emx][emy].getAttributeInt("smoothlevel", true);
+ sFaces[i] = smoothFaces.getSmoothFace(layerNode[emx][emy]);
}
}
/* ok, now we have a list of smoothlevel higher than current square.
* there are at most 8 different levels. so... let's check 8 times
- * for the lowest one (we draw from botto to top!).
+ * for the lowest one (we draw from bottom to top!).
*/
while (true) {
int lowest = -1;
for (int i = 0; i < 8; i++) {
- if (slevels[i] > 0 && !partdone[i] && (lowest < 0 || slevels[i] < slevels[lowest])) {
+ if (sLevels[i] > 0 && !partDone[i] && (lowest < 0 || sLevels[i] < sLevels[lowest])) {
lowest = i;
}
}
@@ -151,46 +151,46 @@
break;
}
/* we need to calculate the weight for border and weight for corners.
- * then we 'markdone'the corresponding squares
+ * then we 'mark done' the corresponding squares
*/
/*first, the border, which may exclude some corners*/
int weight = 0;
int weightC = 15;
for (int i = 0; i < 8; i++) { /*check all nearby squares*/
- if (slevels[i] == slevels[lowest] && sfaces[i] == sfaces[lowest]) {
- partdone[i] = true;
- weight += bweights[i];
+ if (sLevels[i] == sLevels[lowest] && sFaces[i] == sFaces[lowest]) {
+ partDone[i] = true;
+ weight += bWeights[i];
weightC &= ~bcExclude[i];
} else {
/*must remove the weight of a corner if not in smoothing*/
- weightC &= ~cweights[i];
+ weightC &= ~cWeights[i];
}
}
- if (sfaces[lowest] == null) {
+ if (sFaces[lowest] == null) {
continue; /*Can't smooth black*/
}
- final NamedObject smoothface = sfaces[lowest];
+ final NamedObject smoothFace = sFaces[lowest];
/* now, it's quite easy. We must draw using a 32x32 part of
- * the picture smoothface.
+ * the picture smooth face.
* This part is located using the 2 weights calculated:
* (32*weight,0) and (32*weightC,32)
*/
- final ImageIcon img = smoothface.getDisplayIcon(faceObjectProviders);
+ final ImageIcon img = smoothFace.getDisplayIcon(faceObjectProviders);
if (weight > 0) {
src.x = IGUIConstants.SQUARE_WIDTH * weight;
src.y = 0;
- grfx.drawImage(img.getImage(), borderOffset.x + x * IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT, borderOffset.x + x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, src.x, src.y, src.x + IGUIConstants.SQUARE_WIDTH, src.y + IGUIConstants.SQUARE_HEIGHT, null);
+ graphics.drawImage(img.getImage(), borderOffset.x + x * IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT, borderOffset.x + x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, src.x, src.y, src.x + IGUIConstants.SQUARE_WIDTH, src.y + IGUIConstants.SQUARE_HEIGHT, null);
}
if (weightC > 0) {
src.x = IGUIConstants.SQUARE_WIDTH * weightC;
src.y = IGUIConstants.SQUARE_HEIGHT;
- grfx.drawImage(img.getImage(), borderOffset.x + x * IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT, borderOffset.x + x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, src.x, src.y, src.x + IGUIConstants.SQUARE_WIDTH, src.y + IGUIConstants.SQUARE_HEIGHT, null);
+ graphics.drawImage(img.getImage(), borderOffset.x + x * IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT, borderOffset.x + x * IGUIConstants.SQUARE_WIDTH + IGUIConstants.SQUARE_WIDTH, borderOffset.y + y * IGUIConstants.SQUARE_HEIGHT + IGUIConstants.SQUARE_HEIGHT, src.x, src.y, src.x + IGUIConstants.SQUARE_WIDTH, src.y + IGUIConstants.SQUARE_HEIGHT, null);
}
} /*while there's some smooth to do*/
if (allLayers && foundLayer) {
- paintSmooth(grfx, x, y, level, layer + 1, true, borderOffset);
+ paintSmooth(graphics, x, y, level, layer + 1, true, borderOffset);
}
}
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/CrossfireEditor.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/CrossfireEditor.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/CrossfireEditor.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -52,4 +52,4 @@
new GridartaEditor<GameObject, MapArchObject, Archetype>("net.sf.gridarta.var.crossfire.tod").run("net.sf.gridarta.var.crossfire", "CrossfireEditor.jar", new DefaultEditorFactory(), args);
}
-} // class CrossireEditor
+} // class CrossfireEditor
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/maincontrol/DefaultEditorFactory.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -31,14 +31,14 @@
import net.sf.gridarta.gui.mappropertiesdialog.MapPropertiesDialogFactory;
import net.sf.gridarta.gui.newmap.NewMapDialogFactory;
import net.sf.gridarta.gui.prefs.AppPreferencesModel;
-import net.sf.gridarta.gui.prefs.AppPrefs;
-import net.sf.gridarta.gui.prefs.DevPrefs;
-import net.sf.gridarta.gui.prefs.GUIPrefs;
-import net.sf.gridarta.gui.prefs.MapValidatorPrefs;
-import net.sf.gridarta.gui.prefs.MiscPrefs;
-import net.sf.gridarta.gui.prefs.NetPrefs;
-import net.sf.gridarta.gui.prefs.ResPrefs;
-import net.sf.gridarta.gui.prefs.UpdatePrefs;
+import net.sf.gridarta.gui.prefs.AppPreferences;
+import net.sf.gridarta.gui.prefs.DevPreferences;
+import net.sf.gridarta.gui.prefs.GUIPreferences;
+import net.sf.gridarta.gui.prefs.MapValidatorPreferences;
+import net.sf.gridarta.gui.prefs.MiscPreferences;
+import net.sf.gridarta.gui.prefs.NetPreferences;
+import net.sf.gridarta.gui.prefs.ResPreferences;
+import net.sf.gridarta.gui.prefs.UpdatePreferences;
import net.sf.gridarta.gui.scripts.ScriptArchDataUtils;
import net.sf.gridarta.gui.scripts.ScriptedEventEditor;
import net.sf.gridarta.maincontrol.DefaultMainControl;
@@ -396,7 +396,7 @@
@NotNull
@Override
public PreferencesGroup createPreferencesGroup(@NotNull final GlobalSettings globalSettings, @NotNull final DelegatingMapValidator<GameObject, MapArchObject, Archetype> validators, @NotNull final AppPreferencesModel appPreferencesModel, @NotNull final ExitConnectorModel exitConnectorModel, @NotNull final ConfigSourceFactory configSourceFactory) {
- return new PreferencesGroup("Gridarta for Crossfire", new ResPrefs(globalSettings, configSourceFactory), new AppPrefs(appPreferencesModel), new NetPrefs(), new GUIPrefs(globalSettings), new MiscPrefs(exitConnectorModel, globalSettings), new DevPrefs(), new UpdatePrefs(), new MapValidatorPrefs(validators, PREFERENCES_VALIDATOR_AUTO_DEFAULT));
+ return new PreferencesGroup("Gridarta for Crossfire", new ResPreferences(globalSettings, configSourceFactory), new AppPreferences(appPreferencesModel), new NetPreferences(), new GUIPreferences(globalSettings), new MiscPreferences(exitConnectorModel, globalSettings), new DevPreferences(), new UpdatePreferences(), new MapValidatorPreferences(validators, PREFERENCES_VALIDATOR_AUTO_DEFAULT));
}
/**
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/Archetype.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/Archetype.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/Archetype.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -33,7 +33,7 @@
int TYPE_WEAPON = 15;
- int TYPE_BRESTPLATE_ARMOR = 16;
+ int TYPE_BREASTPLATE_ARMOR = 16;
int TYPE_PEDESTAL = 17;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeSet.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeSet.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/archetype/ArchetypeSet.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -85,7 +85,7 @@
out.append("end\n");
- // process the multipart tails:
+ // process the multi-part tails:
int result = 1;
for (Archetype tail = arch.getMultiNext(); tail != null; tail = tail.getMultiNext()) {
result++;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/io/MapArchObjectParser.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/io/MapArchObjectParser.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/model/io/MapArchObjectParser.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -101,10 +101,10 @@
format.format("enter_y %d\n", mapArchObject.getEnterY());
}
if (mapArchObject.getText().trim().length() > 0) {
- format.format("msg\n%s\nendmsg\n", mapArchObject.getText().trim());
+ format.format("msg\n" + "%s\n" + "endmsg\n", mapArchObject.getText().trim());
}
if (mapArchObject.getLore().trim().length() > 0) {
- format.format("maplore\n%s\nendmaplore\n", mapArchObject.getLore().trim());
+ format.format("maplore\n" + "%s\n" + "endmaplore\n", mapArchObject.getLore().trim());
}
if (mapArchObject.isUnique()) {
appendable.append("unique 1\n");
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/AbstractResourcesReader.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/AbstractResourcesReader.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/AbstractResourcesReader.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -62,7 +62,7 @@
@Override
protected String generateFaceName(@NotNull final String name) {
if (archetypeSet.getImageSet() != null) {
- // we have to snip out the imageset-information here from
+ // we have to snip out the image set information here from
// the 'name', and the ".png": (e.g. blocked.base.111.png -> blocked.111)
int firstDot = 0;
int secondDot = 0;
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/FilesResourcesReader.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/FilesResourcesReader.java 2010-06-05 01:21:00 UTC (rev 8129)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/resource/FilesResourcesReader.java 2010-06-05 10:43:15 UTC (rev 8130)
@@ -121,7 +121,7 @@
log.info("Loaded " + (animationObjects.size() - animationObjectsS...
[truncated message content] |
|
From: <aki...@us...> - 2010-06-05 01:21:06
|
Revision: 8129
http://gridarta.svn.sourceforge.net/gridarta/?rev=8129&view=rev
Author: akirschbaum
Date: 2010-06-05 01:21:00 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Exclude output directories from project.
Modified Paths:
--------------
trunk/atrinik.iml
trunk/daimonin.iml
trunk/gridarta.iml
Modified: trunk/atrinik.iml
===================================================================
--- trunk/atrinik.iml 2010-06-05 01:16:02 UTC (rev 8128)
+++ trunk/atrinik.iml 2010-06-05 01:21:00 UTC (rev 8129)
@@ -6,6 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/atrinik/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/atrinik/src/app" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/atrinik/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/atrinik/class" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/daimonin.iml
===================================================================
--- trunk/daimonin.iml 2010-06-05 01:16:02 UTC (rev 8128)
+++ trunk/daimonin.iml 2010-06-05 01:21:00 UTC (rev 8129)
@@ -6,6 +6,7 @@
<sourceFolder url="file://$MODULE_DIR$/daimonin/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/daimonin/src/app" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/daimonin/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/daimonin/class" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/gridarta.iml
===================================================================
--- trunk/gridarta.iml 2010-06-05 01:16:02 UTC (rev 8128)
+++ trunk/gridarta.iml 2010-06-05 01:21:00 UTC (rev 8129)
@@ -5,6 +5,7 @@
<sourceFolder url="file://$MODULE_DIR$/resource" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/app" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/atrinik" />
<excludeFolder url="file://$MODULE_DIR$/classes" />
<excludeFolder url="file://$MODULE_DIR$/crossfire" />
<excludeFolder url="file://$MODULE_DIR$/daimonin" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:16:09
|
Revision: 8128
http://gridarta.svn.sourceforge.net/gridarta/?rev=8128&view=rev
Author: akirschbaum
Date: 2010-06-05 01:16:02 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Suppress warnings.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java
Modified: trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java 2010-06-05 01:15:31 UTC (rev 8127)
+++ trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java 2010-06-05 01:16:02 UTC (rev 8128)
@@ -69,6 +69,7 @@
/**
* {@inheritDoc}
+ * @noinspection RefusedBequest
*/
@Override
public void setSelected(final boolean b) {
@@ -77,6 +78,7 @@
/**
* {@inheritDoc}
+ * @noinspection RefusedBequest
*/
@Override
public void setArmed(final boolean b) {
@@ -85,6 +87,7 @@
/**
* {@inheritDoc}
+ * @noinspection RefusedBequest
*/
@Override
public void setPressed(final boolean b) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:15:37
|
Revision: 8127
http://gridarta.svn.sourceforge.net/gridarta/?rev=8127&view=rev
Author: akirschbaum
Date: 2010-06-05 01:15:31 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Add final modifier.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java
Modified: trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java 2010-06-05 01:14:51 UTC (rev 8126)
+++ trunk/src/app/net/sf/gridarta/gui/utils/tristate/TristateButtonModel.java 2010-06-05 01:15:31 UTC (rev 8127)
@@ -104,7 +104,7 @@
* Sets the state. Both internal and check box state are updated.
* @param state the new state
*/
- public void setTristateState(@NotNull final TristateState state) {
+ public final void setTristateState(@NotNull final TristateState state) {
this.state = state;
updateCheckboxState();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:14:57
|
Revision: 8126
http://gridarta.svn.sourceforge.net/gridarta/?rev=8126&view=rev
Author: akirschbaum
Date: 2010-06-05 01:14:51 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Add final modifier.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
Modified: trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java 2010-06-05 01:14:28 UTC (rev 8125)
+++ trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java 2010-06-05 01:14:51 UTC (rev 8126)
@@ -164,7 +164,7 @@
* height for top or bottom location
* @param force if set, forcibly rebuild the layout
*/
- public void setOptionalComponent(@Nullable final Component optionalComponent, final int size, final boolean force) {
+ public final void setOptionalComponent(@Nullable final Component optionalComponent, final int size, final boolean force) {
if (force || this.optionalComponent != optionalComponent) {
this.optionalComponent = optionalComponent;
removeAll();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:14:34
|
Revision: 8125
http://gridarta.svn.sourceforge.net/gridarta/?rev=8125&view=rev
Author: akirschbaum
Date: 2010-06-05 01:14:28 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Suppress warning.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
Modified: trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java 2010-06-05 01:13:57 UTC (rev 8124)
+++ trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java 2010-06-05 01:14:28 UTC (rev 8125)
@@ -108,6 +108,8 @@
@Override
public void propertyChange(final PropertyChangeEvent evt) {
if (optionalComponent != null) {
+ //Property names are interned strings.
+ //noinspection StringEquality
if (evt.getPropertyName() == JSplitPane.DIVIDER_LOCATION_PROPERTY) {
final Object value = evt.getNewValue();
if (value != null && value instanceof Integer) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:14:03
|
Revision: 8124
http://gridarta.svn.sourceforge.net/gridarta/?rev=8124&view=rev
Author: akirschbaum
Date: 2010-06-05 01:13:57 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Remove statically checked assert statement.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
Modified: trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java 2010-06-05 01:13:22 UTC (rev 8123)
+++ trunk/src/app/net/sf/gridarta/gui/utils/borderpanel/BorderSplitPane.java 2010-06-05 01:13:57 UTC (rev 8124)
@@ -113,7 +113,6 @@
if (value != null && value instanceof Integer) {
final int size = (Integer) value;
final int splitPaneSize = getSplitPaneSize(size);
- assert borderSplitPaneListener != null;
assert optionalComponent != null;
borderSplitPaneListener.sizeChanged(optionalComponent, splitPaneSize);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:13:28
|
Revision: 8123
http://gridarta.svn.sourceforge.net/gridarta/?rev=8123&view=rev
Author: akirschbaum
Date: 2010-06-05 01:13:22 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Make catch blocks more specific.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-06-05 01:11:32 UTC (rev 8122)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-06-05 01:13:22 UTC (rev 8123)
@@ -29,6 +29,7 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
@@ -134,7 +135,7 @@
final URL url;
try {
url = IOUtils.getResource(null, PYTHON_MENU_FILE);
- } catch (final IOException ex) {
+ } catch (final FileNotFoundException ex) {
log.error("File '" + PYTHON_MENU_FILE + "': " + ex.getMessage());
return;
}
@@ -185,6 +186,8 @@
log.error("File '" + url + "' not found: " + ex.getMessage());
} catch (final EOFException ignored) {
// expected exception, do not handle: end of file/spell struct reached
+ } catch (final UnsupportedEncodingException ex) {
+ log.error("Cannot decode file '" + url + "': " + ex.getMessage());
} catch (final IOException ex) {
log.error("Cannot read file '" + url + "': " + ex.getMessage());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:11:38
|
Revision: 8122
http://gridarta.svn.sourceforge.net/gridarta/?rev=8122&view=rev
Author: akirschbaum
Date: 2010-06-05 01:11:32 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Fix typo.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-06-05 01:10:58 UTC (rev 8121)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-06-05 01:11:32 UTC (rev 8122)
@@ -58,7 +58,7 @@
* Python menu definitions.
*/
@NotNull
- private static final String PYTHONMENU_FILE = "cfpython_menu.def";
+ private static final String PYTHON_MENU_FILE = "cfpython_menu.def";
/**
* The Logger for printing log messages.
@@ -133,9 +133,9 @@
private static void loadCommandList() {
final URL url;
try {
- url = IOUtils.getResource(null, PYTHONMENU_FILE);
+ url = IOUtils.getResource(null, PYTHON_MENU_FILE);
} catch (final IOException ex) {
- log.error("File '" + PYTHONMENU_FILE + "': " + ex.getMessage());
+ log.error("File '" + PYTHON_MENU_FILE + "': " + ex.getMessage());
return;
}
final List<String> cmdList = new ArrayList<String>(); // temporary list to store commands
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:11:04
|
Revision: 8121
http://gridarta.svn.sourceforge.net/gridarta/?rev=8121&view=rev
Author: akirschbaum
Date: 2010-06-05 01:10:58 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Explicitly initialize field.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-06-05 01:10:13 UTC (rev 8120)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-06-05 01:10:58 UTC (rev 8121)
@@ -95,7 +95,7 @@
* The caret position in the document where this popup was opened.
* @serial
*/
- private int caretPos;
+ private int caretPos = 0;
/**
* Creates a new instance.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:10:20
|
Revision: 8120
http://gridarta.svn.sourceforge.net/gridarta/?rev=8120&view=rev
Author: akirschbaum
Date: 2010-06-05 01:10:13 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Suppress warning.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-06-05 01:08:36 UTC (rev 8119)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/gui/map/renderer/FlatMapRenderer.java 2010-06-05 01:10:13 UTC (rev 8120)
@@ -246,6 +246,8 @@
log.debug("Creating a backbuffer of size " + size.width + "x" + size.height + ".");
}
final BufferedImage newBackBuffer;
+ //The backbuffer is optional
+ //noinspection ErrorNotRethrown
try {
newBackBuffer = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB);
} catch (final OutOfMemoryError ignore) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:08:42
|
Revision: 8119
http://gridarta.svn.sourceforge.net/gridarta/?rev=8119&view=rev
Author: akirschbaum
Date: 2010-06-05 01:08:36 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Fix Javadoc issues.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
Modified: trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 01:06:40 UTC (rev 8118)
+++ trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 01:08:36 UTC (rev 8119)
@@ -98,7 +98,7 @@
private String objName = "";
/**
- * The msgText.
+ * The message text.
* @note Every line in msgText must end on '\n', including the last line.
* @note If the value is <code>null</code>, this GameObject has no message
* text, if the value exists but is empty, this GameObject has an empty
@@ -121,8 +121,8 @@
private int mapY = 0;
/**
- * Data for multi-square-arches. Stays <code>null</code> for
- * singlesquare-arches.
+ * Data for multi-part objects. Stays <code>null</code> for single-part
+ * objects.
* @serial
*/
@Nullable
@@ -643,8 +643,8 @@
}
/**
- * Initialize the multipart data object - must only be called for multipart
- * arches.
+ * Initialize the multi-part data object - must only be called for
+ * multi-part arches.
*/
private void initMultiData() {
if (multi == null) {
@@ -827,8 +827,8 @@
// ignore "normalFace"
// ignore "container"
&& abstractBaseObject.getArchetype() == getArchetype() && abstractBaseObject.getArchetypeName().equals(getArchetypeName()) && abstractBaseObject.objName.equals(objName) && abstractBaseObject.gameObjectText.equals(gameObjectText) && (abstractBaseObject.msgText == null ? msgText == null : msgText != null && msgText.toString().equals(abstractBaseObject.msgText.toString()))
- // ignore "mapx"
- // ignore "mapy"
+ // ignore "mapX"
+ // ignore "mapY"
// ignore "attributeCache"
// ignore "multi"
// ignore "editType"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:06:46
|
Revision: 8118
http://gridarta.svn.sourceforge.net/gridarta/?rev=8118&view=rev
Author: akirschbaum
Date: 2010-06-05 01:06:40 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Suppress warning.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-06-05 01:05:58 UTC (rev 8117)
+++ trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-06-05 01:06:40 UTC (rev 8118)
@@ -159,6 +159,7 @@
* @param gameObject The current game object.
* @return Whether the line has been consumed; if <code>false</code> is
* returned, the default parsing is performed.
+ * @noinspection UnusedDeclaration
*/
protected boolean parseLine(@NotNull final String line, @NotNull final G gameObject) {
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:06:04
|
Revision: 8117
http://gridarta.svn.sourceforge.net/gridarta/?rev=8117&view=rev
Author: akirschbaum
Date: 2010-06-05 01:05:58 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Replace boolean flag with control flow.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-06-05 01:02:28 UTC (rev 8116)
+++ trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-06-05 01:05:58 UTC (rev 8117)
@@ -111,7 +111,6 @@
final G gameObject = gameObjectFactory.newGameObject(archName);
- boolean msgflag = false;
while (true) {
final String thisLine2 = reader.readLine();
if (thisLine2 == null) {
@@ -119,13 +118,7 @@
}
final String thisLine = thisLine2.trim();
- if (msgflag) {
- if (thisLine.startsWith("endmsg")) {
- msgflag = false;
- } else {
- gameObject.addMsgTextLine(thisLine2);
- }
- } else if (thisLine.startsWith("arch ")) {
+ if (thisLine.startsWith("arch ")) {
final G invItem = load(reader, thisLine, objects);
assert invItem != null : "invItem must not be null here.";
gameObject.addLast(invItem);
@@ -136,7 +129,18 @@
return gameObject;
} else if (thisLine.startsWith("msg")) {
gameObject.setMsgText("");
- msgflag = true;
+ while (true) {
+ final String thisLine3 = reader.readLine();
+ if (thisLine3 == null) {
+ throw new IOException("unexpected end of file while reading 'arch " + archName + "'");
+ }
+
+ if (thisLine3.trim().equals("endmsg")) {
+ break;
+ }
+
+ gameObject.addMsgTextLine(thisLine3);
+ }
} else if (parseLine(thisLine, gameObject)) {
// ignore
} else if (thisLine.startsWith("x ")) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:02:35
|
Revision: 8116
http://gridarta.svn.sourceforge.net/gridarta/?rev=8116&view=rev
Author: akirschbaum
Date: 2010-06-05 01:02:28 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Remove comments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
Modified: trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-06-05 01:00:27 UTC (rev 8115)
+++ trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-06-05 01:02:28 UTC (rev 8116)
@@ -119,19 +119,15 @@
}
final String thisLine = thisLine2.trim();
- // here we are inside of an arch object
if (msgflag) {
if (thisLine.startsWith("endmsg")) {
msgflag = false;
} else {
- gameObject.addMsgTextLine(thisLine2); // thisLine2 allows leading whitespaces
+ gameObject.addMsgTextLine(thisLine2);
}
} else if (thisLine.startsWith("arch ")) {
- // ok, we had a full arch... don't care here about map or object
- // now we test for a new arch - thats stuf in inventory
- // or the end... thats the end of this shit
final G invItem = load(reader, thisLine, objects);
- assert invItem != null : "invItem must not be null here."; // That' assumed because thisLine.startsWith("arch ")
+ assert invItem != null : "invItem must not be null here.";
gameObject.addLast(invItem);
} else if (thisLine.equals("end")) {
if (objects != null) {
@@ -193,7 +189,6 @@
public void collectTempList(@NotNull final ArchetypeSet<G, A, R> archetypeSet, @NotNull final MapViewSettings mapViewSettings, final List<G> objects) {
final Collection<G> tailList = new ArrayList<G>();
- // first: attach our map sucker to a default arch we have loaded
for (final G gameObject : objects) {
final R archetype = archetypeSet.getOrCreateArchetype(gameObject.getArchetypeName());
gameObject.setArchetype(archetype);
@@ -281,7 +276,6 @@
private void expandMulti(@NotNull final G gameObject, @NotNull final Collection<G> objects) {
final Archetype<G, A, R> archetype = gameObject.getArchetype();
- // is it a multi head (without any tail parts)?
if (!archetype.isMulti() || gameObject.getMultiRefCount() > 1) {
return;
}
@@ -291,8 +285,6 @@
return;
}
- // we have a multi head and need to insert his tail now
-
// do insertion for all non-head parts of the multi
final int posX = gameObject.getMapX();
final int posY = gameObject.getMapY();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 01:00:33
|
Revision: 8115
http://gridarta.svn.sourceforge.net/gridarta/?rev=8115&view=rev
Author: akirschbaum
Date: 2010-06-05 01:00:27 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Fix incorrect @Nullable annotation.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
trunk/src/app/net/sf/gridarta/model/baseobject/BaseObject.java
Modified: trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 00:59:27 UTC (rev 8114)
+++ trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 01:00:27 UTC (rev 8115)
@@ -443,7 +443,7 @@
* {@inheritDoc}
*/
@Override
- public void addMsgTextLine(@Nullable final String text) {
+ public void addMsgTextLine(@NotNull final String text) {
// It's intentional that if text == null, msgText still is created if it's empty.
// FIXME: Though it's intentional, it's not nice, search for users and fix this.
// (Also look at deleteMsgText() and getMsgText() then)
Modified: trunk/src/app/net/sf/gridarta/model/baseobject/BaseObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/baseobject/BaseObject.java 2010-06-05 00:59:27 UTC (rev 8114)
+++ trunk/src/app/net/sf/gridarta/model/baseobject/BaseObject.java 2010-06-05 01:00:27 UTC (rev 8115)
@@ -250,7 +250,7 @@
* from the ArchetypeParser.
* @param text text to append to message text
*/
- void addMsgTextLine(@Nullable String text);
+ void addMsgTextLine(@NotNull String text);
/**
* Returns the message bound to this object. If the message is empty, the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 00:59:33
|
Revision: 8114
http://gridarta.svn.sourceforge.net/gridarta/?rev=8114&view=rev
Author: akirschbaum
Date: 2010-06-05 00:59:27 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Fix warning.
Modified Paths:
--------------
trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java
trunk/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
Modified: trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java
===================================================================
--- trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2010-06-05 00:56:24 UTC (rev 8113)
+++ trunk/atrinik/src/app/net/sf/gridarta/var/atrinik/model/gameobject/GameObject.java 2010-06-05 00:59:27 UTC (rev 8114)
@@ -108,6 +108,13 @@
/**
* {@inheritDoc}
*/
+ @Override
+ public void propagateElevation(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
@NotNull
@Override
public GameObject clone() {
Modified: trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java
===================================================================
--- trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java 2010-06-05 00:56:24 UTC (rev 8113)
+++ trunk/daimonin/src/app/net/sf/gridarta/var/daimonin/model/gameobject/GameObject.java 2010-06-05 00:59:27 UTC (rev 8114)
@@ -108,6 +108,13 @@
/**
* {@inheritDoc}
*/
+ @Override
+ public void propagateElevation(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
+ }
+
+ /**
+ * {@inheritDoc}
+ */
@NotNull
@Override
public GameObject clone() {
Modified: trunk/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2010-06-05 00:56:24 UTC (rev 8113)
+++ trunk/src/app/net/sf/gridarta/model/gameobject/DefaultIsoGameObject.java 2010-06-05 00:59:27 UTC (rev 8114)
@@ -22,7 +22,6 @@
import javax.swing.ImageIcon;
import net.sf.gridarta.model.anim.AnimationObjects;
import net.sf.gridarta.model.archetype.Archetype;
-import net.sf.gridarta.model.baseobject.BaseObject;
import net.sf.gridarta.model.face.FaceObjectProviders;
import net.sf.gridarta.model.map.maparchobject.MapArchObject;
import net.sf.gridarta.model.mapviewsettings.MapViewSettings;
@@ -91,13 +90,6 @@
* {@inheritDoc}
*/
@Override
- public void propagateElevation(@NotNull final BaseObject<?, ?, ?, ?> gameObject) {
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public boolean usesDirection() {
return getAttributeInt("is_turnable") != 0 || getAttributeInt("is_animated") != 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 00:56:30
|
Revision: 8113
http://gridarta.svn.sourceforge.net/gridarta/?rev=8113&view=rev
Author: akirschbaum
Date: 2010-06-05 00:56:24 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Fix warnings.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
Modified: trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 00:48:13 UTC (rev 8112)
+++ trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 00:56:24 UTC (rev 8113)
@@ -217,7 +217,11 @@
*/
private void setFaceName(@NotNull final String faceName) {
final String normalizedFaceName = faceName.length() > 0 ? faceName.intern() : null;
+ //Strings are interned
+ //noinspection StringEquality
final String effectiveFaceName = normalizedFaceName != null && normalizedFaceName.length() > 0 && (getArchetype() == null || isArchetype() || normalizedFaceName != getArchetype().getFaceName()) ? normalizedFaceName : null;
+ //Strings are interned
+ //noinspection StringEquality
if (this.faceName == effectiveFaceName) {
return;
}
@@ -449,7 +453,10 @@
beginGameObjectChange();
try {
- msgText.append(StringUtils.removeTrailingWhitespace(text));
+ final String trimmedText = StringUtils.removeTrailingWhitespace(text);
+ assert msgText != null;
+ msgText.append(trimmedText);
+ assert msgText != null;
msgText.append('\n');
} finally {
endGameObjectChange();
@@ -483,6 +490,7 @@
this.msgText = new StringBuilder(trimmedMsgText);
} else {
this.msgText.setLength(0);
+ assert this.msgText != null;
this.msgText.append(trimmedMsgText);
}
} finally {
@@ -538,6 +546,7 @@
@Nullable
@Override
public T getMultiNext() {
+ //noinspection ConstantConditions
return multi != null ? multi.getNext(getThis()) : null;
}
@@ -778,7 +787,30 @@
@Override
public boolean isDefaultGameObject() {
final BaseObject<G, A, R, ?> archetype = getArchetype();
- return archetype != null && getArchetypeName().equals(archetype.getArchetypeName()) && objName.equals(archetype.getObjName()) && !gameObjectText.hasObjectText() && (msgText == null || msgText.toString().equals(archetype.getMsgText())) && (faceName == null || faceName.equals(archetype.getFaceName())) && (animName == null || animName.equals(archetype.getAnimName())) && typeNo == archetype.getTypeNo();
+ if (archetype == null) {
+ return false;
+ }
+ if (!getArchetypeName().equals(archetype.getArchetypeName())) {
+ return false;
+ }
+ if (!objName.equals(archetype.getObjName())) {
+ return false;
+ }
+ if (gameObjectText.hasObjectText()) {
+ return false;
+ }
+ if (msgText != null && !msgText.toString().equals(archetype.getMsgText())) {
+ return false;
+ }
+ //noinspection ConstantConditions
+ if (faceName != null && !faceName.equals(archetype.getFaceName())) {
+ return false;
+ }
+ //noinspection ConstantConditions
+ if (animName != null && !animName.equals(archetype.getAnimName())) {
+ return false;
+ }
+ return typeNo == archetype.getTypeNo();
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 00:48:19
|
Revision: 8112
http://gridarta.svn.sourceforge.net/gridarta/?rev=8112&view=rev
Author: akirschbaum
Date: 2010-06-05 00:48:13 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Explicitly initialize fields.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
Modified: trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 00:46:04 UTC (rev 8111)
+++ trunk/src/app/net/sf/gridarta/model/baseobject/AbstractBaseObject.java 2010-06-05 00:48:13 UTC (rev 8112)
@@ -95,7 +95,7 @@
* @serial
*/
@NotNull
- private String objName;
+ private String objName = "";
/**
* The msgText.
@@ -146,20 +146,20 @@
* @serial
*/
@Nullable
- private String faceName;
+ private String faceName = null;
/**
* The object type.
* @serial
*/
- private int typeNo;
+ private int typeNo = 0;
/**
* The object's animation animation.
* @serial
*/
@Nullable
- private String animName;
+ private String animName = null;
/**
* The direction determines to which direction the GameObject's face is
@@ -167,7 +167,7 @@
* animated objects might even have 8 or 9 (8 + still) facings.
* @serial
*/
- private int direction;
+ private int direction = 0;
/**
* The map lore.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aki...@us...> - 2010-06-05 00:46:10
|
Revision: 8111
http://gridarta.svn.sourceforge.net/gridarta/?rev=8111&view=rev
Author: akirschbaum
Date: 2010-06-05 00:46:04 +0000 (Sat, 05 Jun 2010)
Log Message:
-----------
Suppress warnings.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java
Modified: trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java 2010-06-05 00:43:30 UTC (rev 8110)
+++ trunk/src/app/net/sf/gridarta/model/archetype/AbstractArchetype.java 2010-06-05 00:46:04 UTC (rev 8111)
@@ -118,6 +118,7 @@
/**
* {@inheritDoc}
+ * @noinspection NoopMethodInAbstractClass
*/
@Override
public void notifyBeginChange() {
@@ -126,6 +127,7 @@
/**
* {@inheritDoc}
+ * @noinspection NoopMethodInAbstractClass
*/
@Override
public void notifyEndChange() {
@@ -134,6 +136,7 @@
/**
* {@inheritDoc}
+ * @noinspection NoopMethodInAbstractClass
*/
@Override
public void notifyTransientChange() {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
