Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[7985] trunk
|
From: <aki...@us...> - 2010-05-24 18:42:54
|
Revision: 7985
http://gridarta.svn.sourceforge.net/gridarta/?rev=7985&view=rev
Author: akirschbaum
Date: 2010-05-24 18:42:47 +0000 (Mon, 24 May 2010)
Log Message:
-----------
Fix checkstyle issues.
Modified Paths:
--------------
trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java
trunk/src/app/net/sf/gridarta/delayedmapmodel/DelayedMapModelListenerManager.java
trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java
trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java
trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
trunk/src/app/net/sf/gridarta/gui/utils/MenuUtils.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/MapFolder.java
trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.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/AbstractMapArchObjectParser.java
trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java
trunk/src/app/net/sf/gridarta/preferences/Storage.java
trunk/src/app/net/sf/gridarta/resource/AbstractResourcesReader.java
trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
trunk/src/app/net/sf/gridarta/utils/IOUtils.java
Modified: trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java
===================================================================
--- trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/crossfire/src/app/net/sf/gridarta/var/crossfire/validation/checks/NonAbsoluteExitPathChecker.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -27,7 +27,6 @@
import net.sf.gridarta.model.match.GameObjectMatcher;
import net.sf.gridarta.validation.AbstractValidator;
import net.sf.gridarta.validation.GameObjectValidator;
-import net.sf.gridarta.validation.MapValidator;
import net.sf.gridarta.validation.checks.NonAbsoluteExitPathError;
import net.sf.gridarta.var.crossfire.model.archetype.Archetype;
import net.sf.gridarta.var.crossfire.model.gameobject.GameObject;
@@ -35,8 +34,9 @@
import org.jetbrains.annotations.NotNull;
/**
- * A {@link MapValidator} that checks for relative exit paths within unique
- * maps. Such paths do not work reliably in Crossfire and Atrinik.
+ * A {@link net.sf.gridarta.validation.MapValidator} that checks for relative
+ * exit paths within unique maps. Such paths do not work reliably in Crossfire
+ * and Atrinik.
* @author Andreas Kirschbaum
*/
public class NonAbsoluteExitPathChecker extends AbstractValidator implements GameObjectValidator<GameObject, MapArchObject, Archetype> {
Modified: trunk/src/app/net/sf/gridarta/delayedmapmodel/DelayedMapModelListenerManager.java
===================================================================
--- trunk/src/app/net/sf/gridarta/delayedmapmodel/DelayedMapModelListenerManager.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/delayedmapmodel/DelayedMapModelListenerManager.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -153,7 +153,7 @@
try {
final Map<MapModel<G, A, R>, Void> mapModels = new IdentityHashMap<MapModel<G, A, R>, Void>();
while (!Thread.currentThread().isInterrupted()) {
- for (; ;) {
+ while (true) {
final long now = System.currentTimeMillis();
synchronized (sync) {
if (timeout == 0L) {
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:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/gui/filter/MenuItemCreator.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -21,7 +21,6 @@
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JMenuItem;
-import net.sf.gridarta.model.filter.Filter;
import net.sf.gridarta.model.filter.FilterConfig;
import net.sf.gridarta.model.filter.FilterConfigVisitor;
import net.sf.gridarta.model.filter.NamedFilterConfig;
@@ -32,7 +31,7 @@
import org.jetbrains.annotations.Nullable;
/**
- * Creates menu items for {@link Filter} instances.
+ * Creates menu items for {@link net.sf.gridarta.model.filter.Filter} instances.
* @author tchize
* @author Andreas Kirschbaum
*/
Modified: trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/gui/map/mapactions/MapActions.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -501,7 +501,7 @@
*/
@ActionMethod
public boolean isTileShow() {
- return doTileShow(false, false) && false; // XXX: not yet implemented
+ return /*doTileShow(false, false) && */false; // XXX: not yet implemented
}
/**
Modified: trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/gui/selectedsquare/CellRenderer.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -106,7 +106,7 @@
int indent = 0;
if (arch != null) {
- for (; ;) {
+ while (true) {
final GameObject<G, A, R> env = arch.getContainerGameObject();
if (env == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/gui/shortcuts/KeyStrokeField.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -21,7 +21,6 @@
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.swing.JComponent;
import javax.swing.JTextField;
import javax.swing.KeyStroke;
import net.sf.gridarta.utils.EventListenerList2;
@@ -29,7 +28,7 @@
import org.jetbrains.annotations.Nullable;
/**
- * A {@link JComponent} for selecting a {@link KeyStroke}.
+ * A {@link javax.swing.JComponent} for selecting a {@link KeyStroke}.
* @author Andreas Kirschbaum
*/
public class KeyStrokeField extends JTextField {
Modified: trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/gui/spells/SpellsUtils.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -136,7 +136,7 @@
readUntil(in, "{", null);
int counter = 0;
- for (; ;) {
+ while (true) {
readUntil(in, "{", "}");
readUntil(in, "\"", null);
final String name = readUntil(in, "\"").trim();
Modified: trunk/src/app/net/sf/gridarta/gui/utils/MenuUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/gui/utils/MenuUtils.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/gui/utils/MenuUtils.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -80,7 +80,7 @@
* @param menu the menu to remove the entries from
*/
public static void removeAllToSeparator(final JMenu menu) {
- for (; ;) {
+ while (true) {
final Component menuItem = menu.getMenuComponent(0);
if (menuItem == null || menuItem instanceof JSeparator) {
break;
Modified: trunk/src/app/net/sf/gridarta/mainactions/MainActions.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/mainactions/MainActions.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -1537,7 +1537,7 @@
*/
private int getFillDensity(@NotNull final String title) {
String input = "100";
- for (; ;) {
+ while (true) {
input = (String) JOptionPane.showInputDialog(parent, "Enter a fill density between 1-100", title, JOptionPane.QUESTION_MESSAGE, null, null, input);
if (input == null) {
return -1;
Modified: trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java
===================================================================
--- trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/maincontrol/GridartaEditor.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -154,7 +154,7 @@
final Getopt g = new Getopt("testprog", args, "bchns", longopts);
Mode mode = Mode.NORMAL;
boolean doExit = true;
- for (; ;) {
+ while (true) {
final int ch = g.getopt();
if (ch == -1) {
break;
Modified: trunk/src/app/net/sf/gridarta/mapfiles/MapFolder.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapfiles/MapFolder.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/mapfiles/MapFolder.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -184,7 +184,7 @@
* @param deleteFile if set, also remove the map file
*/
public void removeAllPickmaps(final boolean deleteFile) {
- for (; ;) {
+ while (true) {
final MapFile<G, A, R> mapFile;
synchronized (sync) {
if (mapFiles.isEmpty()) {
Modified: trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java
===================================================================
--- trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/mapmanager/DefaultFileControl.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -276,7 +276,7 @@
@ActionMethod
@Override
public boolean closeAllMaps() {
- for (; ;) {
+ while (true) {
final MapControl<G, A, R> mapControl = mapManager.getOpenMap();
if (mapControl == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/model/face/DefaultFaceObjects.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -344,7 +344,7 @@
}
int size = 0;
// read size ' '
- for (; ;) {
+ while (true) {
final char c = (char) data[offset++]; // XXX: do not cast from byte to char
if (c == ' ') {
break;
@@ -357,7 +357,7 @@
}
faceB.setLength(0);
// read facename '\n'
- for (; ;) {
+ while (true) {
final char c = (char) data[offset++]; // XXX: do not cast from byte to char
if (c == '\n') {
break;
@@ -423,7 +423,7 @@
final InputStream inputStream = new FileInputStream(file);
try {
final byte[] buf = new byte[CHUNK_SIZE];
- for (; ;) {
+ while (true) {
final int len = inputStream.read(buf);
if (len == -1) {
break;
Modified: trunk/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/model/gameobject/MultiPositionData.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -102,7 +102,7 @@
// read the whole file line by line
boolean hasErrors = false;
- for (; ;) {
+ while (true) {
final String inputLine = lnr.readLine();
if (inputLine == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/model/io/AbstractGameObjectParser.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -112,7 +112,7 @@
final G gameObject = gameObjectFactory.newGameObject(archName);
boolean msgflag = false;
- for (; ;) {
+ while (true) {
final String thisLine2 = reader.readLine();
if (thisLine2 == null) {
throw new IOException("unexpected end of file while reading 'arch " + archName + "'");
Modified: trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/model/io/AbstractMapArchObjectParser.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -43,7 +43,7 @@
int height = 0;
boolean archflag = false; // flag for arch<->end
boolean msgflag = false; // flag for map-message
- for (; ;) {
+ while (true) {
final String tmp = reader.readLine();
if (tmp == null) {
throw new IOException("unexpected end of file in map header");
Modified: trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/model/treasurelist/TreasureLoader.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -108,7 +108,8 @@
final List<TreasureTreeNode> needLink = new ArrayList<TreasureTreeNode>(); // all sub-treasurelist nodes that need linking
// first step: parsing datafile, adding all treasurelists to the tmpList vector
- for (int index = 0; ; index++) {
+ int index = 0;
+ while (true) {
final File treasureLocation;
try {
treasureLocation = configSource.getFile(globalSettings, "treasures", index);
@@ -130,6 +131,7 @@
if (log.isInfoEnabled()) {
log.info("Loaded " + (tmpList.size() - tmpListSize) + " treasurelists from '" + treasureLocation + "'.");
}
+ index++;
}
return createTreasureTree(tmpList, needLink, specialTreasureLists);
@@ -217,7 +219,7 @@
try {
final BufferedReader bufferedReader = new BufferedReader(reader);
try {
- for (; ;) {
+ while (true) {
final String rawLine = bufferedReader.readLine();
if (rawLine == null) {
break;
@@ -295,7 +297,7 @@
boolean insideArch = false;
- for (; ;) {
+ while (true) {
final String rawLine = reader.readLine();
if (rawLine == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/preferences/Storage.java
===================================================================
--- trunk/src/app/net/sf/gridarta/preferences/Storage.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/preferences/Storage.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -275,7 +275,7 @@
String path = defaultPath;
final LineNumberReader lnr = new LineNumberReader(isr);
try {
- for (; ;) {
+ while (true) {
final String line2 = lnr.readLine();
if (line2 == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/resource/AbstractResourcesReader.java
===================================================================
--- trunk/src/app/net/sf/gridarta/resource/AbstractResourcesReader.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/resource/AbstractResourcesReader.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -222,7 +222,7 @@
@NotNull
private static Map<String, String> loadAnimTree(@NotNull final BufferedReader reader) throws IOException {
final Map<String, String> animations = new HashMap<String, String>();
- for (; ;) {
+ while (true) {
final String line = reader.readLine();
if (line == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java
===================================================================
--- trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/textedit/scripteditor/CFPythonPopup.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -128,7 +128,7 @@
final BufferedReader bufferedReader = new BufferedReader(reader);
try {
// read file into the cmdList vector:
- for (; ;) {
+ while (true) {
final String inputLine = bufferedReader.readLine();
if (inputLine == null) {
break;
Modified: trunk/src/app/net/sf/gridarta/utils/IOUtils.java
===================================================================
--- trunk/src/app/net/sf/gridarta/utils/IOUtils.java 2010-05-24 18:09:49 UTC (rev 7984)
+++ trunk/src/app/net/sf/gridarta/utils/IOUtils.java 2010-05-24 18:42:47 UTC (rev 7985)
@@ -137,7 +137,7 @@
final FileOutputStream outputStream = new FileOutputStream(tmpFile);
try {
final byte[] buf = new byte[65536];
- for (; ;) {
+ while (true) {
final int len = bufferedInputStream.read(buf);
if (len == -1) {
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
