Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[4572] trunk
|
From: <cr...@us...> - 2008-09-21 07:29:39
|
Revision: 4572
http://jnode.svn.sourceforge.net/jnode/?rev=4572&view=rev
Author: crawley
Date: 2008-09-21 07:29:35 +0000 (Sun, 21 Sep 2008)
Log Message:
-----------
Checkstyle changes
Modified Paths:
--------------
trunk/core/src/core/org/jnode/log4j/config/JNodeSystemAppender.java
trunk/core/src/core/org/jnode/log4j/config/Log4jConfigurePlugin.java
trunk/core/src/core/org/jnode/util/IOUtils.java
trunk/core/src/core/org/jnode/util/ReaderInputStream.java
trunk/core/src/core/org/jnode/vm/Vm.java
trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueueEntry.java
trunk/core/src/core/org/jnode/vm/x86/compiler/AbstractX86StackManager.java
trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/VirtualStack.java
trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/VirtualStack.java
trunk/core/src/driver/org/jnode/driver/console/ActiveTextConsole.java
trunk/core/src/driver/org/jnode/driver/console/spi/ConsoleWriter.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsoleManager.java
trunk/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleManager.java
trunk/distr/src/apps/org/jnode/games/tetris/package-info.java
trunk/distr/src/emu/org/jnode/emu/Emu.java
trunk/net/src/net/org/jnode/net/command/WgetCommand.java
Modified: trunk/core/src/core/org/jnode/log4j/config/JNodeSystemAppender.java
===================================================================
--- trunk/core/src/core/org/jnode/log4j/config/JNodeSystemAppender.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/log4j/config/JNodeSystemAppender.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -25,11 +25,8 @@
import java.io.PrintStream;
import java.io.Writer;
-import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Layout;
import org.apache.log4j.WriterAppender;
-import org.jnode.driver.console.TextConsole;
-import org.jnode.util.WriterOutputStream;
/**
* Custom Log4j appender class for appending to the current System.out or System.err.
Modified: trunk/core/src/core/org/jnode/log4j/config/Log4jConfigurePlugin.java
===================================================================
--- trunk/core/src/core/org/jnode/log4j/config/Log4jConfigurePlugin.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/log4j/config/Log4jConfigurePlugin.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -22,19 +22,15 @@
package org.jnode.log4j.config;
import java.awt.event.KeyEvent;
-import java.io.IOException;
import java.io.PrintStream;
-import java.io.Writer;
import java.util.Enumeration;
import javax.naming.NameNotFoundException;
import org.apache.log4j.Appender;
-import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout;
-import org.apache.log4j.WriterAppender;
import org.jnode.driver.console.ActiveTextConsole;
import org.jnode.driver.console.ConsoleManager;
import org.jnode.driver.console.TextConsole;
Modified: trunk/core/src/core/org/jnode/util/IOUtils.java
===================================================================
--- trunk/core/src/core/org/jnode/util/IOUtils.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/util/IOUtils.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -27,15 +27,12 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.PrintStream;
import java.io.Reader;
import java.io.Writer;
import java.lang.reflect.Field;
import java.security.PrivilegedAction;
import org.apache.log4j.Logger;
-import org.jnode.driver.console.spi.ConsoleWriter;
-import org.jnode.driver.console.textscreen.KeyboardReader;
/**
* Common utility code for higher-level operations on IO streams. Notwithstanding the
@@ -104,7 +101,7 @@
}
private static InputStream findInputStream(final FilterInputStream inputStream) {
- return new PrivilegedAction<InputStream>() {
+ PrivilegedAction<InputStream> pa = new PrivilegedAction<InputStream>() {
public InputStream run() {
try {
Class<FilterInputStream> cls = FilterInputStream.class;
@@ -115,11 +112,13 @@
Logger.getLogger(IOUtils.class).error("Cannot extract the 'in' field", ex);
return null;
}
- }}.run();
+ }
+ };
+ return pa.run();
}
private static OutputStream findOutputStream(final FilterOutputStream outputStream) {
- return new PrivilegedAction<OutputStream>() {
+ PrivilegedAction<OutputStream> pa = new PrivilegedAction<OutputStream>() {
public OutputStream run() {
try {
Class<FilterOutputStream> cls = FilterOutputStream.class;
@@ -130,14 +129,16 @@
Logger.getLogger(IOUtils.class).error("Cannot extract the 'out' field", ex);
return null;
}
- }}.run();
+ }
+ };
+ return pa.run();
}
private static OutputStream findOutputStream(final OutputStreamWriter writer) {
// This implementation is based on the knowledge that an OutputStreamWriter
// uses the underlying OutputStream as its 'lock' object.
- return new PrivilegedAction<OutputStream>() {
+ PrivilegedAction<OutputStream> pa = new PrivilegedAction<OutputStream>() {
public OutputStream run() {
try {
Class<Writer> cls = Writer.class;
@@ -148,13 +149,15 @@
Logger.getLogger(IOUtils.class).error("Cannot extract the 'lock' field", ex);
return null;
}
- }}.run();
+ }
+ };
+ return pa.run();
}
private static InputStream findInputStream(final InputStreamReader reader) {
// This implementation is based on the knowledge that an InputStreamReader
// uses the underlying InputStream as its 'lock' object.
- return new PrivilegedAction<InputStream>() {
+ PrivilegedAction<InputStream> pa = new PrivilegedAction<InputStream>() {
public InputStream run() {
try {
Class<Reader> cls = Reader.class;
@@ -165,7 +168,9 @@
Logger.getLogger(IOUtils.class).error("Cannot extract the 'lock' field", ex);
return null;
}
- }}.run();
+ }
+ };
+ return pa.run();
}
}
Modified: trunk/core/src/core/org/jnode/util/ReaderInputStream.java
===================================================================
--- trunk/core/src/core/org/jnode/util/ReaderInputStream.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/util/ReaderInputStream.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import java.io.Writer;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
import java.nio.charset.Charset;
Modified: trunk/core/src/core/org/jnode/vm/Vm.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/Vm.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/vm/Vm.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -51,7 +51,6 @@
import org.jnode.vm.memmgr.VmHeapManager;
import org.jnode.vm.scheduler.VmProcessor;
import org.jnode.vm.scheduler.VmScheduler;
-import org.vmmagic.pragma.NoInlinePragma;
/**
* @author Ewout Prangsma (ep...@us...)
Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueueEntry.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueueEntry.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueueEntry.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -25,7 +25,6 @@
import org.jnode.vm.VmSystemObject;
import org.jnode.vm.annotation.KernelSpace;
import org.jnode.vm.annotation.Uninterruptible;
-import org.vmmagic.pragma.UninterruptiblePragma;
/**
* Queue entry for VmThread's.
Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/AbstractX86StackManager.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/AbstractX86StackManager.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/AbstractX86StackManager.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -22,7 +22,6 @@
package org.jnode.vm.x86.compiler;
import org.jnode.assembler.x86.X86Register;
-import org.jnode.vm.JvmType;
/**
* @author Ewout Prangsma (ep...@us...)
Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/VirtualStack.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/VirtualStack.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/VirtualStack.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -23,7 +23,6 @@
import org.jnode.assembler.x86.X86Assembler;
import org.jnode.assembler.x86.X86Register;
-import org.jnode.assembler.x86.X86Register.GPR64;
import org.jnode.vm.JvmType;
import org.jnode.vm.Vm;
import org.jnode.vm.bytecode.TypeStack;
Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/VirtualStack.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/VirtualStack.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/VirtualStack.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -23,7 +23,6 @@
import org.jnode.assembler.x86.X86Assembler;
import org.jnode.assembler.x86.X86Register;
-import org.jnode.assembler.x86.X86Register.GPR64;
import org.jnode.vm.JvmType;
import org.jnode.vm.Vm;
import org.jnode.vm.bytecode.TypeStack;
@@ -37,11 +36,11 @@
// and ensure consistency and correctness
final class VirtualStack {
- // explicitely check that elements on the operant stack
+ // explicitly check that elements on the operand stack
// are popped in the appropriate order
static final boolean checkOperandStack = true;
- // explicitely check that elements on the FPU stack
+ // explicitly check that elements on the FPU stack
// are popped in the appropriate order
static final boolean checkFpuStack = true;
Modified: trunk/core/src/driver/org/jnode/driver/console/ActiveTextConsole.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/ActiveTextConsole.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/driver/org/jnode/driver/console/ActiveTextConsole.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -1,10 +1,8 @@
package org.jnode.driver.console;
-import java.io.FilterWriter;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
-import java.nio.CharBuffer;
/**
* This virtual console class operates on the console that has the current focus.
Modified: trunk/core/src/driver/org/jnode/driver/console/spi/ConsoleWriter.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/spi/ConsoleWriter.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/driver/org/jnode/driver/console/spi/ConsoleWriter.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -23,9 +23,9 @@
import java.io.IOException;
import java.io.Writer;
+
import org.jnode.driver.console.TextConsole;
import org.jnode.util.ConsoleStream;
-import org.jnode.vm.Unsafe;
/**
* @author epr
Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardReader.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -3,7 +3,6 @@
import java.awt.event.KeyEvent;
import java.io.IOException;
import java.io.Reader;
-import java.io.PrintStream;
import java.io.Writer;
import org.jnode.driver.console.InputCompleter;
Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsoleManager.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsoleManager.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsoleManager.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -33,7 +33,6 @@
import org.jnode.driver.textscreen.TextScreenManager;
import org.jnode.naming.InitialNaming;
import org.jnode.naming.NameSpaceListener;
-import org.jnode.vm.Unsafe;
/**
* @author Ewout Prangsma (ep...@us...)
Modified: trunk/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleManager.java
===================================================================
--- trunk/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleManager.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/distr/src/apps/org/jnode/apps/telnetd/RemoteConsoleManager.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -1,6 +1,5 @@
package org.jnode.apps.telnetd;
-import java.io.InputStream;
import java.io.Reader;
import net.wimpi.telnetd.io.TerminalIO;
Modified: trunk/distr/src/apps/org/jnode/games/tetris/package-info.java
===================================================================
--- trunk/distr/src/apps/org/jnode/games/tetris/package-info.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/distr/src/apps/org/jnode/games/tetris/package-info.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -1,4 +1,4 @@
/**
* Simple Tetris game for JNode.
*/
-package org.jnode.games.tetris;
\ No newline at end of file
+package org.jnode.games.tetris;
Modified: trunk/distr/src/emu/org/jnode/emu/Emu.java
===================================================================
--- trunk/distr/src/emu/org/jnode/emu/Emu.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/distr/src/emu/org/jnode/emu/Emu.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -7,13 +7,13 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
+
import javax.naming.NameAlreadyBoundException;
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
import org.jnode.naming.AbstractNameSpace;
import org.jnode.naming.InitialNaming;
-import org.jnode.naming.NameSpace;
import org.jnode.nanoxml.XMLElement;
import org.jnode.shell.ShellManager;
import org.jnode.shell.alias.AliasManager;
Modified: trunk/net/src/net/org/jnode/net/command/WgetCommand.java
===================================================================
--- trunk/net/src/net/org/jnode/net/command/WgetCommand.java 2008-09-21 06:02:17 UTC (rev 4571)
+++ trunk/net/src/net/org/jnode/net/command/WgetCommand.java 2008-09-21 07:29:35 UTC (rev 4572)
@@ -42,7 +42,7 @@
private PrintStream out;
private PrintStream err;
- public WgetCommand(){
+ public WgetCommand() {
super("Fetch the contents of one or more URLs.");
registerArguments(ARG_SOURCE, ARG_DEBUG);
}
@@ -121,10 +121,10 @@
}
is.close();
} finally {
- if (is != null){
+ if (is != null) {
is.close();
}
- if (bos != null){
+ if (bos != null) {
bos.close();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
