|
From: <ls...@us...> - 2009-08-12 19:27:18
|
Revision: 5640
http://jnode.svn.sourceforge.net/jnode/?rev=5640&view=rev
Author: lsantha
Date: 2009-08-12 19:27:09 +0000 (Wed, 12 Aug 2009)
Log Message:
-----------
Fixed coding style.
Modified Paths:
--------------
trunk/core/src/test/org/jnode/test/core/IsolatedJavaTest.java
trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java
trunk/shell/src/shell/org/jnode/shell/CommandShell.java
trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java
trunk/shell/src/shell/org/jnode/shell/bjorne/ReadBuiltin.java
Modified: trunk/core/src/test/org/jnode/test/core/IsolatedJavaTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/core/IsolatedJavaTest.java 2009-08-12 19:25:56 UTC (rev 5639)
+++ trunk/core/src/test/org/jnode/test/core/IsolatedJavaTest.java 2009-08-12 19:27:09 UTC (rev 5640)
@@ -1,7 +1,6 @@
package org.jnode.test.core;
import javax.isolate.Isolate;
-import javax.isolate.IsolateStartupException;
import javax.isolate.Link;
import javax.isolate.LinkMessage;
import javax.isolate.IsolateStatus;
@@ -12,8 +11,6 @@
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
import java.util.Properties;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
@@ -75,8 +72,7 @@
arg.startsWith("-agentpath") ||
arg.startsWith("-javaagent") ||
arg.startsWith("-splash") ||
- false
- ) {
+ false) {
//ignore
} else if (arg.startsWith("-")) {
//error invalid option
@@ -116,7 +112,7 @@
Link link = newIsolate.newStatusLink();
newIsolate.start();
//wait for exit
- for (; ;) {
+ for (;;) {
LinkMessage msg = link.receive();
if (msg.containsStatus() && IsolateStatus.State.EXITED.equals(msg.extractStatus().getState()))
break;
Modified: trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java 2009-08-12 19:25:56 UTC (rev 5639)
+++ trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java 2009-08-12 19:27:09 UTC (rev 5640)
@@ -21,7 +21,6 @@
package org.jnode.fs.hfsplus;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import junit.framework.TestCase;
@@ -33,7 +32,6 @@
import org.jnode.emu.plugin.model.DummyExtensionPoint;
import org.jnode.emu.plugin.model.DummyPluginDescriptor;
import org.jnode.fs.FSDirectory;
-import org.jnode.fs.FileSystemException;
import org.jnode.fs.service.FileSystemService;
import org.jnode.fs.service.def.FileSystemPlugin;
import org.jnode.test.support.TestUtils;
Modified: trunk/shell/src/shell/org/jnode/shell/CommandShell.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/CommandShell.java 2009-08-12 19:25:56 UTC (rev 5639)
+++ trunk/shell/src/shell/org/jnode/shell/CommandShell.java 2009-08-12 19:27:09 UTC (rev 5640)
@@ -396,7 +396,7 @@
try {
Thread.sleep(100000);
} catch (InterruptedException ex2) {
-
+ //ignore
}
} finally {
if (reader != null) {
Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-12 19:25:56 UTC (rev 5639)
+++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2009-08-12 19:27:09 UTC (rev 5640)
@@ -449,7 +449,7 @@
* @param text the text to be processed.
* @return the de-quoted text
*/
- static StringBuilder dequote(String text) {
+ static StringBuilder dequote(String text) {
int len = text.length();
StringBuilder sb = new StringBuilder(len);
int quote = 0;
@@ -474,7 +474,7 @@
break;
default:
sb.append(ch);
- break;
+ break;
}
}
return sb;
@@ -567,7 +567,7 @@
* @param wordTokens the destination for the tokens.
* @throws ShellException
*/
- void splitAndAppend(BjorneToken token, List<BjorneToken> wordTokens)
+ void splitAndAppend(BjorneToken token, List<BjorneToken> wordTokens)
throws ShellException {
String text = token.getText();
StringBuilder sb = null;
@@ -1032,8 +1032,7 @@
if (ci.peekCh() == '(') {
ci.nextCh();
return dollarParenParenExpand(ci);
- }
- else {
+ } else {
String commandLine = dollarBacktickExpand(ci, ')').toString();
if (ci.nextCh() != ')') {
throw new ShellSyntaxException("Unmatched \"(\" (left parenthesis)");
Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/ReadBuiltin.java
===================================================================
--- trunk/shell/src/shell/org/jnode/shell/bjorne/ReadBuiltin.java 2009-08-12 19:25:56 UTC (rev 5639)
+++ trunk/shell/src/shell/org/jnode/shell/bjorne/ReadBuiltin.java 2009-08-12 19:27:09 UTC (rev 5640)
@@ -164,7 +164,7 @@
break;
default:
sb2.append("\\\n");
- break;
+ break;
}
}
String ifsWhitespace = sb1.toString();
@@ -183,7 +183,7 @@
ifsNonWhitespace + "][" + ifsWhitespace + "]*(|[^" + ifsWhitespace + "].*)");
} else if (ifsWhitespace.length() > 0) {
ifsSplittingPattern = Pattern.compile(
- "([^" + ifsWhitespace +"]*)[" + ifsWhitespace + "]+(|[^" + ifsWhitespace + "].*)");
+ "([^" + ifsWhitespace + "]*)[" + ifsWhitespace + "]+(|[^" + ifsWhitespace + "].*)");
} else {
ifsSplittingPattern = Pattern.compile(
"([^" + ifsNonWhitespace + "]*)[" + ifsNonWhitespace + "](.*)");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|