Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[7987] trunk/src
|
From: <aki...@us...> - 2010-05-24 19:08:55
|
Revision: 7987
http://gridarta.svn.sourceforge.net/gridarta/?rev=7987&view=rev
Author: akirschbaum
Date: 2010-05-24 19:08:48 +0000 (Mon, 24 May 2010)
Log Message:
-----------
Whitespace changes.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java
trunk/src/doc/copyright.xhtml
trunk/src/doc/dev/codeStyle.xhtml
trunk/src/doc/hist/MergingEditors.xhtml
trunk/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
trunk/src/test/net/sf/gridarta/model/map/grid/MapGridTest.java
trunk/src/test/net/sf/gridarta/model/map/mapmodel/DefaultMapModelTest.java
Modified: trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java 2010-05-24 19:08:48 UTC (rev 7987)
@@ -31,7 +31,8 @@
import org.jetbrains.annotations.Nullable;
/**
- * Creates menu items for {@link net.sf.gridarta.model.filter.Filter} instances.
+ * Creates menu items for {@link net.sf.gridarta.model.filter.Filter}
+ * instances.
* @author tchize
* @author Andreas Kirschbaum
*/
Modified: trunk/src/doc/copyright.xhtml
===================================================================
--- trunk/src/doc/copyright.xhtml 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/doc/copyright.xhtml 2010-05-24 19:08:48 UTC (rev 7987)
@@ -28,6 +28,6 @@
<body>
<p>
Gridarta is licensed under GPL version 2 or newer. </p>
- <pre><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../COPYING"/></pre>
+<pre><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../COPYING"/></pre>
</body>
</html>
Modified: trunk/src/doc/dev/codeStyle.xhtml
===================================================================
--- trunk/src/doc/dev/codeStyle.xhtml 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/doc/dev/codeStyle.xhtml 2010-05-24 19:08:48 UTC (rev 7987)
@@ -69,7 +69,7 @@
<p>
The following example code shows how streams should be opened / closed: </p>
- <pre class="listing"><xi:include href="SafeCopy.java.xhtml" xpointer="element(/1/2/1/1)"/></pre>
+<pre class="listing"><xi:include href="SafeCopy.java.xhtml" xpointer="element(/1/2/1/1)"/></pre>
<p>
Rationale: </p>
<ul>
@@ -115,239 +115,222 @@
developers that do not use IntelliJ IDEA / InspectionGadgets to know what
the rules are to be able to perform the same verifications. </p>
<ul>
- <li>
- Inspections
- <ul>
- <li>
- Abstraction issues
- <dl>
- <dt>'instanceof' check for 'this'</dt>
- <dd>
- This most likely is a failure to understand object
- oriented programming. Such constructs must be replaced
- by proper polymorphism.
- </dd>
- </dl>
- </li>
- <li>
- Assignment issues
- <dl>
- <dt>Assignment replaceable with operator assignment</dt>
- <dd>
- Operator assignments should be used wherever applicable
- because they are easier to read: It's faster to see and
- understand that the new variable value is based on a
- modification of the original value, not a completely new
- value.
- <br/>
- Conditional operators are currently ignored because
- <code>foo |= bar();</code> is not the same as <code>foo
- = foo || bar();</code> because the behavior regarding
- side-effects in <code>bar()</code> is changed.
- </dd>
- <dt>Assignment to catch block parameter</dt>
- <dd>
- This reports things like <code>catch (FooException e) {
- e = ...; }</code> as they are either errors or, if not,
- at least very confusing.
- </dd>
- </dl>
- </li>
- <li>
- Bitwise operation issues
- <dl>
- <dt>Incompatible bitwise mask operation</dt>
- <dd>
- Bitwise mask expressions which are guaranteed to always
- evaluate to true or false most likely are logical
- errors. Example: <code>(var & constant1) ==
- constant2</code>.
- </dd>
- <dt>Pointless bitwise expression</dt>
- <dd>
- Pointless expressions that and with zero, or with zero
- or shift with zero most likely are logical errors.
- </dd>
- <dt>Shift operation by inappropriate constant</dt>
- <dd>
- Shifts with shift values out of range (0..31 for int,
- 0..63 for long) most likely are logical errors.
- </dd>
- </dl>
- </li>
- <li>
- Class structure
- <dl>
- <dt>'final' method in 'final' class</dt>
- <dd>
- This is unnecessary and may be confusing. Methods in
- final classes are always implicitly final. A method
- should only be explicitly declared final if the context
- is "the class might be subclasses, but this method is
- not designed to be overridden". Thus if a method in a
- final class is explicitly declared final, it may lead to
- the conclusion that the class was declared final by
- mistake.
- </dd>
- <dt>Missing @Deprecated annotation</dt>
- <dd>
- Makes sure that deprecated members that are documented
- as deprecated in Javadoc (<code>@deprecated</code>
- Javadoc tag) are also annotated as
- <code>@Deprecated</code> in the source code.
- <br/>
- Background: Future compiler versions (JDK 1.6 or JDK
- 1.7) might stop to parse Javadoc comments. To get the
- deprecation information into the class file, the
- annotation must be used then. Also, deprecation
- information might only be fully reflective on 1.5 or
- later if it was declared with the annotation.
- </dd>
- <dt>Missing @Override annotation</dt>
- <dd>
- Makes sure that members that override members from a
- class (not implement from an interface) are annotated as
- <code>@Override</code> in the source code.
- <br/>
- Background: A missing <code>@Override</code> isn't an
- error by itself. But the opposite situation, an <code>@Override</code>
- when nothing is overridden is an error. That is useful
- for finding typos when wanting to override a method.
- E.g. if you override <code>toString()</code> using
- <code>@Override public String tostring()</code> (not the
- typo), the compiler will be able to report this as an
- error.
- </dd>
- <dt>'private' method declared 'final'</dt>
- <dd>
- Private methods are implicitly final. Explicitly
- declaring them final looks like the method should be
- public or protected instead.
- </dd>
- <dt>'protected' member in 'final' class</dt>
- <dd>
- Final classes cannot be sub-classed. Protected members
- are explicitly visible for subclasses. Because of that,
- protected members in final classes are an oxymoron that
- indicates an error.
- </dd>
- <dt>'public' constructor in non-public class</dt>
- <dd>
- If the class is not visible, the constructor isn't
- either. Declaring the constructor of higher
- accessibility than its class is pointless and most
- likely an error.
- </dd>
- </dl>
- </li>
- <li>
- Code style issues
- <dl>
- <dt>Missorted modifiers</dt>
- <dt>Modifier order does not match JLS suggestion</dt>
- <dd>Annotations should be sorted alphabetically, annotations
- MUST be sorted before keywords, keywords must be sorted
- according to JLS.
- </dd>
- </dl>
- </li>
- <li>
- Finalization issues
- <dl>
- <dt>'finalize()' called explicitly</dt>
- <dd>finalize() must only be called by the garbage collector,
- but not application software.
- </dd>
- <dt>'finalize()' does not call 'super.finalize()'</dt>
- <dd>This always is an error as this prevents the superclass
- from performing its own finalization code.
- </dd>
- <dt>'finalize()' not declared 'protected'</dt>
- <dd>This is an error because 'finalize()' must not be public
- because it never needs to be called directly.
- </dd>
- </dl>
- </li>
- <li>
- General
- <dl>
- <dt>Declaration has Javadoc problems</dt>
- <dd>
- Makes sure that a Javadoc comment that is present also
- has a certain level of technical quality. Currently the
- following omissions are treated as errors:
- <code>@author</code> for top level classes, periods in
- briefs, <code>@return</code> for methods,
- <code>@param</code> and <code>ŧrhwos</code> or <code>@exception</code>
- for methods and constructors. Unknown Javadoc tags are
- also reported (<code>@note</code> and similar extension
- tags are known to this inspection and won't cause false
- positives).
- <br/>
- Though it would be possible to ignore deprecated
- elements, they're not. Even if an element is deprecated,
- it must still be documented properly and without errors.
- </dd>
- <dt>Declaration has problems in Javadoc references</dt>
- <dd>
- Makes sure that references in Javadoc comments (<code>{@link
- ...}</code> and eventually <code>@see ...</code>) can be
- resolved.
- </dd>
- <dt>equals() and hashCode() not paired</dt>
- <dd>
- Due to their contract, equals() and hashCode() must
- always be paired. If one of them is overridden, so must
- be the other.
- </dd>
- <dt>Redundant suppression</dt>
- <dd>Reports usages of warning suppression when they suppress
- something that isn't there.
- </dd>
- <dt>Variable is assigned to itself</dt>
- <dd>Stuff like <code>a = a;</code> most likely is an error.
- </dd>
- <dt>Wrong package statement</dt>
- <dd>Reports when the package statement doesn't correspond to
- the project directory structure.
- </dd>
- </dl>
- </li>
- <li>
- Imports
- <dl>
- <dt>* import</dt>
- <dd>
- * imports are forbidden in Gridarta.
- </dd>
- <dt>Import from same package</dt>
- <dt>java.lang import</dt>
- <dt>Redundant import</dt>
- <dd>
- Redundant or pointless imports are forbidden in
- Gridarta.
- </dd>
- <dt>Static import</dt>
- <dd>Our code style doesn't allow static import.</dd>
- <dt>Unused import</dt>
- <dd>Import statements must not list types they don't use.
- </dd>
- </dl>
- </li>
- <li>
- Inheritance issues
- <dl>
- <dt>Abstract method with missing implementations</dt>
- <dd>
- The compiler would of course report this in the
- subclasses that miss the implementation. This inspection
- supports you while editing or if you're too lazy to
- perform a build prior to a commit.
- </dd>
- </dl>
- </li>
- </ul>
- </li>
+<li>
+Inspections
+<ul>
+<li>
+ Abstraction issues
+ <dl>
+ <dt>'instanceof' check for 'this'</dt>
+ <dd>
+ This most likely is a failure to understand object oriented
+ programming. Such constructs must be replaced by proper
+ polymorphism.
+ </dd>
+ </dl>
+</li>
+<li>
+ Assignment issues
+ <dl>
+ <dt>Assignment replaceable with operator assignment</dt>
+ <dd>
+ Operator assignments should be used wherever applicable because they
+ are easier to read: It's faster to see and understand that the new
+ variable value is based on a modification of the original value, not
+ a completely new value.
+ <br/>
+ Conditional operators are currently ignored because <code>foo |=
+ bar();</code> is not the same as <code>foo = foo || bar();</code>
+ because the behavior regarding side-effects in <code>bar()</code> is
+ changed.
+ </dd>
+ <dt>Assignment to catch block parameter</dt>
+ <dd>
+ This reports things like <code>catch (FooException e) { e = ...;
+ }</code> as they are either errors or, if not, at least very
+ confusing.
+ </dd>
+ </dl>
+</li>
+<li>
+ Bitwise operation issues
+ <dl>
+ <dt>Incompatible bitwise mask operation</dt>
+ <dd>
+ Bitwise mask expressions which are guaranteed to always evaluate to
+ true or false most likely are logical errors. Example: <code>(var
+ & constant1) == constant2</code>.
+ </dd>
+ <dt>Pointless bitwise expression</dt>
+ <dd>
+ Pointless expressions that and with zero, or with zero or shift with
+ zero most likely are logical errors.
+ </dd>
+ <dt>Shift operation by inappropriate constant</dt>
+ <dd>
+ Shifts with shift values out of range (0..31 for int, 0..63 for
+ long) most likely are logical errors.
+ </dd>
+ </dl>
+</li>
+<li>
+ Class structure
+ <dl>
+ <dt>'final' method in 'final' class</dt>
+ <dd>
+ This is unnecessary and may be confusing. Methods in final classes
+ are always implicitly final. A method should only be explicitly
+ declared final if the context is "the class might be subclasses, but
+ this method is not designed to be overridden". Thus if a method in a
+ final class is explicitly declared final, it may lead to the
+ conclusion that the class was declared final by mistake.
+ </dd>
+ <dt>Missing @Deprecated annotation</dt>
+ <dd>
+ Makes sure that deprecated members that are documented as deprecated
+ in Javadoc (<code>@deprecated</code> Javadoc tag) are also annotated
+ as <code>@Deprecated</code> in the source code.
+ <br/>
+ Background: Future compiler versions (JDK 1.6 or JDK 1.7) might stop
+ to parse Javadoc comments. To get the deprecation information into
+ the class file, the annotation must be used then. Also, deprecation
+ information might only be fully reflective on 1.5 or later if it was
+ declared with the annotation.
+ </dd>
+ <dt>Missing @Override annotation</dt>
+ <dd>
+ Makes sure that members that override members from a class (not
+ implement from an interface) are annotated as <code>@Override</code>
+ in the source code.
+ <br/>
+ Background: A missing <code>@Override</code> isn't an error by
+ itself. But the opposite situation, an <code>@Override</code> when
+ nothing is overridden is an error. That is useful for finding typos
+ when wanting to override a method. E.g. if you override <code>toString()</code>
+ using <code>@Override public String tostring()</code> (not the
+ typo), the compiler will be able to report this as an error.
+ </dd>
+ <dt>'private' method declared 'final'</dt>
+ <dd>
+ Private methods are implicitly final. Explicitly declaring them
+ final looks like the method should be public or protected instead.
+ </dd>
+ <dt>'protected' member in 'final' class</dt>
+ <dd>
+ Final classes cannot be sub-classed. Protected members are
+ explicitly visible for subclasses. Because of that, protected
+ members in final classes are an oxymoron that indicates an error.
+ </dd>
+ <dt>'public' constructor in non-public class</dt>
+ <dd>
+ If the class is not visible, the constructor isn't either. Declaring
+ the constructor of higher accessibility than its class is pointless
+ and most likely an error.
+ </dd>
+ </dl>
+</li>
+<li>
+ Code style issues
+ <dl>
+ <dt>Missorted modifiers</dt>
+ <dt>Modifier order does not match JLS suggestion</dt>
+ <dd>Annotations should be sorted alphabetically, annotations MUST be
+ sorted before keywords, keywords must be sorted according to JLS.
+ </dd>
+ </dl>
+</li>
+<li>
+ Finalization issues
+ <dl>
+ <dt>'finalize()' called explicitly</dt>
+ <dd>finalize() must only be called by the garbage collector, but not
+ application software.
+ </dd>
+ <dt>'finalize()' does not call 'super.finalize()'</dt>
+ <dd>This always is an error as this prevents the superclass from
+ performing its own finalization code.
+ </dd>
+ <dt>'finalize()' not declared 'protected'</dt>
+ <dd>This is an error because 'finalize()' must not be public because it
+ never needs to be called directly.
+ </dd>
+ </dl>
+</li>
+<li>
+ General
+ <dl>
+ <dt>Declaration has Javadoc problems</dt>
+ <dd>
+ Makes sure that a Javadoc comment that is present also has a certain
+ level of technical quality. Currently the following omissions are
+ treated as errors: <code>@author</code> for top level classes,
+ periods in briefs, <code>@return</code> for methods,
+ <code>@param</code> and <code>ŧrhwos</code> or
+ <code>@exception</code> for methods and constructors. Unknown
+ Javadoc tags are also reported (<code>@note</code> and similar
+ extension tags are known to this inspection and won't cause false
+ positives).
+ <br/>
+ Though it would be possible to ignore deprecated elements, they're
+ not. Even if an element is deprecated, it must still be documented
+ properly and without errors.
+ </dd>
+ <dt>Declaration has problems in Javadoc references</dt>
+ <dd>
+ Makes sure that references in Javadoc comments (<code>{@link
+ ...}</code> and eventually <code>@see ...</code>) can be resolved.
+ </dd>
+ <dt>equals() and hashCode() not paired</dt>
+ <dd>
+ Due to their contract, equals() and hashCode() must always be
+ paired. If one of them is overridden, so must be the other.
+ </dd>
+ <dt>Redundant suppression</dt>
+ <dd>Reports usages of warning suppression when they suppress something
+ that isn't there.
+ </dd>
+ <dt>Variable is assigned to itself</dt>
+ <dd>Stuff like <code>a = a;</code> most likely is an error.
+ </dd>
+ <dt>Wrong package statement</dt>
+ <dd>Reports when the package statement doesn't correspond to the project
+ directory structure.
+ </dd>
+ </dl>
+</li>
+<li>
+ Imports
+ <dl>
+ <dt>* import</dt>
+ <dd>
+ * imports are forbidden in Gridarta.
+ </dd>
+ <dt>Import from same package</dt>
+ <dt>java.lang import</dt>
+ <dt>Redundant import</dt>
+ <dd>
+ Redundant or pointless imports are forbidden in Gridarta.
+ </dd>
+ <dt>Static import</dt>
+ <dd>Our code style doesn't allow static import.</dd>
+ <dt>Unused import</dt>
+ <dd>Import statements must not list types they don't use.
+ </dd>
+ </dl>
+</li>
+<li>
+ Inheritance issues
+ <dl>
+ <dt>Abstract method with missing implementations</dt>
+ <dd>
+ The compiler would of course report this in the subclasses that miss
+ the implementation. This inspection supports you while editing or if
+ you're too lazy to perform a build prior to a commit.
+ </dd>
+ </dl>
+</li>
</ul>
+</li>
+</ul>
</body>
</html>
Modified: trunk/src/doc/hist/MergingEditors.xhtml
===================================================================
--- trunk/src/doc/hist/MergingEditors.xhtml 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/doc/hist/MergingEditors.xhtml 2010-05-24 19:08:48 UTC (rev 7987)
@@ -141,8 +141,7 @@
<p>
The following persons have made statements about the possibilities: </p>
<ul>
- <li>Cher, definitely declining D. and E., but unsure whether to do F. or
- G..
+ <li>Cher, definitely declining D. and E., but unsure whether to do F. or G..
</li>
<li>Ragnor, zergus and other editor developers: votes missing</li>
<li>Project leaders / admins: votes missing</li>
Modified: trunk/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/test/net/sf/gridarta/model/archetypetype/ArchetypeTypeSetParserTest.java 2010-05-24 19:08:48 UTC (rev 7987)
@@ -610,7 +610,8 @@
* @param archetypeAttributeName the archetype attribute name
* @param attributeName the user interface attribute name
* @param description the attribute's description
- * @param inputLength the input length in characters for text input fields
+ * @param inputLength the input length in characters for text input
+ * fields
* @param sectionName the section name
*/
public TestArchetypeAttribute(@NotNull final String type, @NotNull final String archetypeAttributeName, @NotNull final String attributeName, @NotNull final String description, final int inputLength, @NotNull final String sectionName) {
Modified: trunk/src/test/net/sf/gridarta/model/map/grid/MapGridTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/model/map/grid/MapGridTest.java 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/test/net/sf/gridarta/model/map/grid/MapGridTest.java 2010-05-24 19:08:48 UTC (rev 7987)
@@ -89,11 +89,20 @@
for (int y = 0; y < size.getHeight(); y++) {
for (int x = 0; x < size.getWidth(); x++) {
final int flags = mapGrid.getFlags(x, y);
- sb.append(Integer.toHexString(
- ((flags & MapGrid.GRID_FLAG_SELECTION_NORTH) == 0 ? 0 : 1)
- + ((flags & MapGrid.GRID_FLAG_SELECTION_EAST) == 0 ? 0 : 2)
- + ((flags & MapGrid.GRID_FLAG_SELECTION_SOUTH) == 0 ? 0 : 4)
- + ((flags & MapGrid.GRID_FLAG_SELECTION_WEST) == 0 ? 0 : 8)));
+ int value = 0;
+ if ((flags & MapGrid.GRID_FLAG_SELECTION_NORTH) != 0) {
+ value |= 1;
+ }
+ if ((flags & MapGrid.GRID_FLAG_SELECTION_EAST) != 0) {
+ value |= 2;
+ }
+ if ((flags & MapGrid.GRID_FLAG_SELECTION_SOUTH) != 0) {
+ value |= 4;
+ }
+ if ((flags & MapGrid.GRID_FLAG_SELECTION_WEST) != 0) {
+ value |= 8;
+ }
+ sb.append(Integer.toHexString(value));
}
}
Assert.assertEquals(expectedBorder, sb.toString());
Modified: trunk/src/test/net/sf/gridarta/model/map/mapmodel/DefaultMapModelTest.java
===================================================================
--- trunk/src/test/net/sf/gridarta/model/map/mapmodel/DefaultMapModelTest.java 2010-05-24 18:49:57 UTC (rev 7986)
+++ trunk/src/test/net/sf/gridarta/model/map/mapmodel/DefaultMapModelTest.java 2010-05-24 19:08:48 UTC (rev 7987)
@@ -65,6 +65,12 @@
public class DefaultMapModelTest {
/**
+ * Predefined icon names.
+ */
+ @NotNull
+ private static final String[] ICON_NAMES = { SystemIcons.SQUARE_SEL_SQUARE, SystemIcons.SQUARE_SEL_SQUARE_NORTH, SystemIcons.SQUARE_SEL_SQUARE_EAST, SystemIcons.SQUARE_SEL_SQUARE_SOUTH, SystemIcons.SQUARE_SEL_SQUARE_WEST, SystemIcons.SQUARE_PRESEL_SQUARE, SystemIcons.SQUARE_CURSOR, SystemIcons.SQUARE_EMPTY, SystemIcons.SQUARE_UNKNOWN, SystemIcons.SQUARE_NOFACE, SystemIcons.SQUARE_NOARCH, SystemIcons.DEFAULT_ICON, SystemIcons.DEFAULT_PREVIEW, SystemIcons.SQUARE_WARNING, };
+
+ /**
* The map model listener registered to {@link #mapModel} to record map
* changes.
*/
@@ -178,11 +184,7 @@
mapModel.beginTransaction("TEST");
mapModel.resizeMap(new Size2D(4, 3));
mapModel.endTransaction();
- Assert.assertEquals(
- "mapSizeChanged:\n"
- + "no squares\n"
- + "no game objects\n",
- result.toString());
+ Assert.assertEquals("mapSizeChanged:\n" + "no squares\n" + "no game objects\n", result.toString());
}
/**
@@ -216,11 +218,7 @@
addGameObjectToMap(mapModel, "1", 2, 2, insertionModeSet.getAutoInsertionMode());
mapModel.resizeMap(new Size2D(1, 2)); // cancels square changed event
mapModel.endTransaction();
- Assert.assertEquals(
- "mapSizeChanged:\n"
- + "no squares\n"
- + "no game objects\n",
- result.toString());
+ Assert.assertEquals("mapSizeChanged:\n" + "no squares\n" + "no game objects\n", result.toString());
}
/**
@@ -241,11 +239,7 @@
addGameObjectToMap(mapModel, "1", 2, 2, insertionModeSet.getAutoInsertionMode());
mapModel.resizeMap(new Size2D(1, 2)); // cancels square changed event
mapModel.endTransaction();
- Assert.assertEquals(
- "mapSizeChanged:\n"
- + "no squares\n"
- + "no game objects\n",
- result.toString());
+ Assert.assertEquals("mapSizeChanged:\n" + "no squares\n" + "no game objects\n", result.toString());
}
/**
@@ -262,11 +256,7 @@
mapModel.beginTransaction("TEST");
addGameObjectToMap(mapModel, "1", 1, 2, insertionModeSet.getAutoInsertionMode());
mapModel.endTransaction();
- Assert.assertEquals(
- "mapSquaresChanged:\n"
- + "square 1 2\n"
- + "no game objects\n",
- result.toString());
+ Assert.assertEquals("mapSquaresChanged:\n" + "square 1 2\n" + "no game objects\n", result.toString());
}
/**
@@ -285,12 +275,7 @@
addGameObjectToMap(mapModel, "1", 1, 2, insertionModeSet.getAutoInsertionMode());
addGameObjectToMap(mapModel, "1", 2, 2, insertionModeSet.getAutoInsertionMode());
mapModel.endTransaction();
- Assert.assertEquals(
- "mapSquaresChanged:\n"
- + "square 1 2\n"
- + "square 2 2\n"
- + "no game objects\n",
- result.toString());
+ Assert.assertEquals("mapSquaresChanged:\n" + "square 1 2\n" + "square 2 2\n" + "no game objects\n", result.toString());
}
/**
@@ -309,11 +294,7 @@
insertGameObject(gameObject, "2");
}
mapModel.endTransaction();
- Assert.assertEquals(
- "mapObjectsChanged:\n"
- + "no squares\n"
- + "game object 1 2 1\n",
- result.toString());
+ Assert.assertEquals("mapObjectsChanged:\n" + "no squares\n" + "game object 1 2 1\n", result.toString());
}
/**
@@ -332,16 +313,12 @@
gameObject.setAttributeString("key", "value");
}
mapModel.endTransaction();
- Assert.assertEquals(
- "mapObjectsChanged:\n"
- + "no squares\n"
- + "game object 1 2 1\n",
- result.toString());
+ Assert.assertEquals("mapObjectsChanged:\n" + "no squares\n" + "game object 1 2 1\n", result.toString());
}
/**
- * Test case for {@link DefaultMapModel#getAllGameObjects()}: for a 1x2
- * game object only the head should be returned.
+ * Test case for {@link DefaultMapModel#getAllGameObjects()}: for a 1x2 game
+ * object only the head should be returned.
*/
@Test
public void testGetAllGameObjects1() {
@@ -442,22 +419,7 @@
final ImageIcon imageIcon = new ImageIcon(new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB));
final GUIUtils guiUtils = new GUIUtils();
systemIcons = new SystemIcons(guiUtils);
- for (final String iconName : new String[] {
- SystemIcons.SQUARE_SEL_SQUARE,
- SystemIcons.SQUARE_SEL_SQUARE_NORTH,
- SystemIcons.SQUARE_SEL_SQUARE_EAST,
- SystemIcons.SQUARE_SEL_SQUARE_SOUTH,
- SystemIcons.SQUARE_SEL_SQUARE_WEST,
- SystemIcons.SQUARE_PRESEL_SQUARE,
- SystemIcons.SQUARE_CURSOR,
- SystemIcons.SQUARE_EMPTY,
- SystemIcons.SQUARE_UNKNOWN,
- SystemIcons.SQUARE_NOFACE,
- SystemIcons.SQUARE_NOARCH,
- SystemIcons.DEFAULT_ICON,
- SystemIcons.DEFAULT_PREVIEW,
- SystemIcons.SQUARE_WARNING,
- }) {
+ for (final String iconName : ICON_NAMES) {
guiUtils.addToCache(iconName, imageIcon);
}
final TestMapArchObject mapArchObject = new TestMapArchObject();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
