Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta:[8670] trunk
|
From: <aki...@us...> - 2010-10-06 19:11:27
|
Revision: 8670
http://gridarta.svn.sourceforge.net/gridarta/?rev=8670&view=rev
Author: akirschbaum
Date: 2010-10-06 19:11:18 +0000 (Wed, 06 Oct 2010)
Log Message:
-----------
Remove nested assignments.
Modified Paths:
--------------
trunk/src/app/net/sf/gridarta/updater/Updater.java
trunk/src/doc/dev/SafeCopy.java
trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/HTMLTokenMarker.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/LuaTokenMarker.java
trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/PythonTokenMarker.java
Modified: trunk/src/app/net/sf/gridarta/updater/Updater.java
===================================================================
--- trunk/src/app/net/sf/gridarta/updater/Updater.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/src/app/net/sf/gridarta/updater/Updater.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -205,7 +205,12 @@
final OutputStream out = new FileOutputStream(download);
try {
final byte[] buf = new byte[BUF_SIZE];
- for (int bytesRead; (bytesRead = in.read(buf)) != -1; out.write(buf, 0, bytesRead)) {
+ for (; ;) {
+ final int bytesRead = in.read(buf);
+ if (bytesRead == -1) {
+ break;
+ }
+ out.write(buf, 0, bytesRead);
}
out.close();
if (/* !backup.delete() || */ !orig.renameTo(backup)) {
Modified: trunk/src/doc/dev/SafeCopy.java
===================================================================
--- trunk/src/doc/dev/SafeCopy.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/src/doc/dev/SafeCopy.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -13,7 +13,11 @@
final OutputStream out = new FileOutputStream(args[1]);
try {
final byte[] buf = new byte[4096];
- for (int bytesRead; (bytesRead = in.read(buf)) != -1;) {
+ for (; ;) {
+ final int bytesRead = in.read(buf);
+ if (bytesRead == -1) {
+ break;
+ }
out.write(buf, 0, bytesRead);
}
} finally {
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/scripteditor/ScriptEditView.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -229,8 +229,11 @@
try {
boolean firstLine = true;
final StringBuilder buff = new StringBuilder("");
- String line;
- while ((line = in.readLine()) != null) {
+ for (; ;) {
+ final String line = in.readLine();
+ if (line == null) {
+ break;
+ }
if (firstLine) {
firstLine = false;
} else {
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/actions/Paste.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -53,8 +53,11 @@
try {
// read everything into the buffer 'buff'
boolean start = true;
- String line;
- while ((line = bufferedReader.readLine()) != null) {
+ for (; ;) {
+ final String line = bufferedReader.readLine();
+ if (line == null) {
+ break;
+ }
if (start) {
start = false;
} else {
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/HTMLTokenMarker.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/HTMLTokenMarker.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/HTMLTokenMarker.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -212,7 +212,8 @@
case Token.COMMENT2: // Inside a JavaScript comment
backslash = false;
if (c == '*' && length - i > 1 && array[i1] == '/') {
- addToken((i += 2) - lastOffset, Token.COMMENT2);
+ i += 2;
+ addToken(i - lastOffset, Token.COMMENT2);
lastOffset = i;
lastKeyword = i;
currentToken = JAVASCRIPT;
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/LuaTokenMarker.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/LuaTokenMarker.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/LuaTokenMarker.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -76,11 +76,13 @@
addToken(i - lastOffset, currentToken);
if (i < length - 2 && SyntaxUtilities.regionMatches(false, line, i + 2, "[[")) {
currentToken = MULTI_COMMENT;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
i += 3;
} else {
addToken(length - i, Token.COMMENT1);
- lastOffset = lastKeyword = length;
+ lastOffset = length;
+ lastKeyword = length;
break loop;
}
}
@@ -90,20 +92,24 @@
doKeyword(line, i);
addToken(i - lastOffset, currentToken);
currentToken = MULTI_LITERAL;
- lastOffset = lastKeyword = i++;
+ lastOffset = i;
+ lastKeyword = i;
+ i++;
}
break;
case '"':
doKeyword(line, i);
addToken(i - lastOffset, currentToken);
currentToken = DOUBLE_QUOTE;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
break;
case '\'':
doKeyword(line, i);
addToken(i - lastOffset, currentToken);
currentToken = SINGLE_QUOTE;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
break;
default:
if (!Character.isLetterOrDigit(c) && c != '_') {
@@ -118,7 +124,8 @@
} else if (c == '\'') {
addToken(i1 - lastOffset, Token.LITERAL1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i1;
+ lastOffset = i1;
+ lastKeyword = i1;
}
break;
case DOUBLE_QUOTE:
@@ -127,7 +134,8 @@
} else if (c == '"') {
addToken(i1 - lastOffset, Token.LITERAL1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i1;
+ lastOffset = i1;
+ lastKeyword = i1;
}
break;
case MULTI_COMMENT:
@@ -135,9 +143,11 @@
backslash = false;
}
if (SyntaxUtilities.regionMatches(false, line, i, "]]")) {
- addToken((i += 2) - lastOffset, Token.COMMENT1);
+ i += 2;
+ addToken(i - lastOffset, Token.COMMENT1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
}
break;
case MULTI_LITERAL:
@@ -145,9 +155,11 @@
backslash = false;
}
if (SyntaxUtilities.regionMatches(false, line, i, "]]")) {
- addToken((i += 2) - lastOffset, Token.LITERAL1);
+ i += 2;
+ addToken(i - lastOffset, Token.LITERAL1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
}
break;
default:
Modified: trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/PythonTokenMarker.java
===================================================================
--- trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/PythonTokenMarker.java 2010-10-06 18:55:04 UTC (rev 8669)
+++ trunk/textedit/src/app/net/sf/gridarta/textedit/textarea/tokenmarker/PythonTokenMarker.java 2010-10-06 19:11:18 UTC (rev 8670)
@@ -67,7 +67,8 @@
doKeyword(line, i);
addToken(i - lastOffset, currentToken);
addToken(length - i, Token.COMMENT1);
- lastOffset = lastKeyword = length;
+ lastOffset = length;
+ lastKeyword = length;
break loop;
}
break;
@@ -83,7 +84,8 @@
} else {
currentToken = Token.LITERAL1;
}
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
}
break;
@@ -98,7 +100,8 @@
} else {
currentToken = Token.LITERAL2;
}
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
}
break;
@@ -117,7 +120,8 @@
} else if (c == '"') {
addToken(i1 - lastOffset, currentToken);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i1;
+ lastOffset = i1;
+ lastKeyword = i1;
}
break;
@@ -127,7 +131,8 @@
} else if (c == '\'') {
addToken(i1 - lastOffset, Token.LITERAL1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i1;
+ lastOffset = i1;
+ lastKeyword = i1;
}
break;
@@ -135,9 +140,11 @@
if (backslash) {
backslash = false;
} else if (SyntaxUtilities.regionMatches(false, line, i, "\"\"\"")) {
- addToken((i += 4) - lastOffset, Token.LITERAL1);
+ i += 4;
+ addToken(i - lastOffset, Token.LITERAL1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
}
break;
@@ -145,9 +152,11 @@
if (backslash) {
backslash = false;
} else if (SyntaxUtilities.regionMatches(false, line, i, "'''")) {
- addToken((i += 4) - lastOffset, Token.LITERAL1);
+ i += 4;
+ addToken(i - lastOffset, Token.LITERAL1);
currentToken = Token.NULL;
- lastOffset = lastKeyword = i;
+ lastOffset = i;
+ lastKeyword = i;
}
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
