Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5894] trunk
|
From: <ga...@us...> - 2012-03-28 14:03:45
|
Revision: 5894
http://jnode.svn.sourceforge.net/jnode/?rev=5894&view=rev
Author: galatnm
Date: 2012-03-28 14:03:32 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
Various clean up for performance.
Modified Paths:
--------------
trunk/cli/src/commands/org/jnode/command/archive/TarCommand.java
trunk/cli/src/commands/org/jnode/command/archive/ZipCommand.java
trunk/cli/src/commands/org/jnode/command/argument/NumberListArgument.java
trunk/cli/src/commands/org/jnode/command/common/ExprCommand.java
trunk/cli/src/commands/org/jnode/command/common/TimeCommand.java
trunk/cli/src/commands/org/jnode/command/common/UnixTestCommand.java
trunk/cli/src/commands/org/jnode/command/file/CpCommand.java
trunk/cli/src/commands/org/jnode/command/file/CutCommand.java
trunk/cli/src/commands/org/jnode/command/file/DirCommand.java
trunk/cli/src/commands/org/jnode/command/file/DuCommand.java
trunk/cli/src/commands/org/jnode/command/file/FindCommand.java
trunk/cli/src/commands/org/jnode/command/file/GrepCommand.java
trunk/cli/src/commands/org/jnode/command/file/HexdumpCommand.java
trunk/cli/src/commands/org/jnode/command/file/SortCommand.java
trunk/cli/src/commands/org/jnode/command/file/WcCommand.java
trunk/cli/src/commands/org/jnode/command/net/NetstatCommand.java
trunk/cli/src/commands/org/jnode/command/net/RpcInfoCommand.java
trunk/cli/src/commands/org/jnode/command/system/BindKeysCommand.java
trunk/cli/src/commands/org/jnode/command/system/ClasspathCommand.java
trunk/cli/src/commands/org/jnode/command/system/IsolateCommand.java
trunk/cli/src/commands/org/jnode/command/system/JavaCommand.java
trunk/cli/src/commands/org/jnode/command/system/LocaleCommand.java
trunk/cli/src/commands/org/jnode/command/system/Log4jCommand.java
trunk/cli/src/commands/org/jnode/command/system/LsIRQCommand.java
trunk/cli/src/commands/org/jnode/command/system/PluginCommand.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Flags.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java
trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
trunk/net/src/driver/org/jnode/driver/net/spi/AbstractNetDriver.java
trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java
trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java
trunk/net/src/net/org/jnode/net/SocketBuffer.java
trunk/net/src/net/org/jnode/net/arp/ARPCacheEntry.java
trunk/net/src/net/org/jnode/net/arp/ARPHeader.java
trunk/net/src/net/org/jnode/net/arp/ARPNetworkLayer.java
trunk/net/src/net/org/jnode/net/ipv4/IPv4ControlBlock.java
trunk/net/src/net/org/jnode/net/ipv4/IPv4FragmentList.java
trunk/net/src/net/org/jnode/net/ipv4/bootp/BOOTPServer.java
trunk/net/src/net/org/jnode/net/ipv4/config/impl/Route.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPControlBlock.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPDataBuffer.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPHeader.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPOutChannel.java
trunk/net/src/net/org/jnode/net/ipv4/tcp/TCPProtocol.java
trunk/net/src/net/org/jnode/net/ipv4/tftp/TFTPClient.java
trunk/net/src/net/org/jnode/net/ipv4/tftp/TFTPServer.java
trunk/net/src/net/org/jnode/net/ipv4/udp/UDPProtocol.java
trunk/net/src/net/org/jnode/net/nfs/nfs2/NFS2Client.java
trunk/net/src/net/org/jnode/net/nfs/nfs2/mount/Mount1Client.java
trunk/net/src/net/org/jnode/protocol/nfs/nfs2/NFS2OutputStream.java
Removed Paths:
-------------
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Utils.java
Modified: trunk/cli/src/commands/org/jnode/command/archive/TarCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/archive/TarCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/archive/TarCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,19 +21,19 @@
package org.jnode.command.archive;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.TreeMap;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import org.apache.tools.bzip2.CBZip2InputStream;
+import org.apache.tools.bzip2.CBZip2OutputStream;
import org.apache.tools.tar.TarEntry;
import org.apache.tools.tar.TarInputStream;
import org.apache.tools.tar.TarOutputStream;
-import org.apache.tools.bzip2.CBZip2InputStream;
-import org.apache.tools.bzip2.CBZip2OutputStream;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.FileArgument;
import org.jnode.shell.syntax.FlagArgument;
@@ -524,7 +524,7 @@
ArrayList<File> list = new ArrayList<File>();
for (File file : files) {
if (entries.containsKey(file.getPath())) {
- etime = entries.get(file.getPath()).longValue();
+ etime = entries.get(file.getPath());
ftime = file.lastModified();
if (etime >= ftime) {
continue;
Modified: trunk/cli/src/commands/org/jnode/command/archive/ZipCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/archive/ZipCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/archive/ZipCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,9 +21,10 @@
package org.jnode.command.archive;
import java.util.ArrayList;
+import java.util.Collections;
import org.jnode.shell.syntax.Argument;
-import org.jnode.shell.syntax.FlagArgument;
import org.jnode.shell.syntax.FileArgument;
+import org.jnode.shell.syntax.FlagArgument;
import org.jnode.shell.syntax.StringArgument;
/**
@@ -104,15 +105,11 @@
}
if (Exclude.isSet()) {
excludes = new ArrayList<String>(Exclude.getValues().length);
- for (String pattern : Exclude.getValues()) {
- excludes.add(pattern);
- }
+ Collections.addAll(excludes, Exclude.getValues());
}
if (Include.isSet()) {
includes = new ArrayList<String>(Include.getValues().length);
- for (String pattern : Include.getValues()) {
- includes.add(pattern);
- }
+ Collections.addAll(includes, Include.getValues());
}
super.execute("zip");
}
Modified: trunk/cli/src/commands/org/jnode/command/argument/NumberListArgument.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/argument/NumberListArgument.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/argument/NumberListArgument.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,13 +21,13 @@
package org.jnode.command.argument;
import java.util.Arrays;
-
import org.jnode.command.util.NumberRange;
-//import org.jnode.driver.console.CompletionInfo;
import org.jnode.shell.CommandLine.Token;
-import org.jnode.shell.syntax.CommandSyntaxException;
import org.jnode.shell.syntax.Argument;
+import org.jnode.shell.syntax.CommandSyntaxException;
+//import org.jnode.driver.console.CompletionInfo;
+
/**
* Captures a list of multiple number ranges.
*
@@ -93,9 +93,7 @@
i++;
}
}
- for (int i = 0; i < (ranges.length - 1); i++) {
- values.add(ranges[i]);
- }
+ values.addAll(Arrays.asList(ranges).subList(0, ranges.length - 1));
return ranges[ranges.length - 1];
}
Modified: trunk/cli/src/commands/org/jnode/command/common/ExprCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/common/ExprCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/common/ExprCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -24,7 +24,6 @@
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-
import org.jnode.shell.AbstractCommand;
@@ -319,7 +318,7 @@
private int asInteger(Object obj) throws ExprException {
if (obj instanceof Integer) {
- return ((Integer) obj).intValue();
+ return (Integer) obj;
} else {
try {
return Integer.parseInt(obj.toString());
Modified: trunk/cli/src/commands/org/jnode/command/common/TimeCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/common/TimeCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/common/TimeCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -63,7 +63,7 @@
StringBuilder sb = new StringBuilder(Alias.getValue());
for (String arg : Args.getValues()) {
- sb.append(" ");
+ sb.append(' ');
sb.append(arg);
}
Modified: trunk/cli/src/commands/org/jnode/command/common/UnixTestCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/common/UnixTestCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/common/UnixTestCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -24,7 +24,6 @@
import java.io.PrintWriter;
import java.util.HashMap;
import java.util.Stack;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.CommandLine;
import org.jnode.shell.syntax.CommandSyntaxException;
@@ -144,7 +143,7 @@
if (obj instanceof Boolean) {
res = obj == Boolean.TRUE;
} else if (obj instanceof Long) {
- res = ((Long) obj).longValue() != 0;
+ res = (Long) obj != 0;
} else {
res = obj.toString().length() > 0;
}
@@ -329,7 +328,7 @@
} else if (option.equals("--version")) {
err.println("JNode test 0.0");
} else {
- throw new CommandSyntaxException("unknown option '" + option + "'");
+ throw new CommandSyntaxException("unknown option '" + option + '\'');
}
}
}
@@ -343,7 +342,7 @@
}
private void pushOperand(long value) {
- operandStack.push(new Long(value));
+ operandStack.push(value);
}
private Object popOperand() throws CommandSyntaxException {
@@ -355,13 +354,13 @@
private long toNumber(Object obj) throws CommandSyntaxException {
if (obj instanceof Long) {
- return ((Long) obj).longValue();
+ return (Long) obj;
} else if (obj instanceof String) {
try {
return Long.parseLong((String) obj);
} catch (NumberFormatException ex) {
throw new CommandSyntaxException(
- "operand is not a number: '" + obj.toString() + "'");
+ "operand is not a number: '" + obj.toString() + '\'');
}
} else {
throw new CommandSyntaxException("subexpression is not an INTEGER");
Modified: trunk/cli/src/commands/org/jnode/command/file/CpCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/CpCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/CpCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -28,7 +28,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.FileArgument;
@@ -370,7 +369,7 @@
if (line.charAt(0) == 'y' || line.charAt(0) == 'Y') {
return true;
} else if (line.charAt(0) == 'n' || line.charAt(0) == 'N') {
- return vskip("'" + target + "'");
+ return vskip("'" + target + '\'');
}
}
out.print(STR_ASK_AGAIN);
Modified: trunk/cli/src/commands/org/jnode/command/file/CutCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/CutCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/CutCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.List;
-
import org.jnode.command.argument.NumberListArgument;
import org.jnode.command.util.IOUtils;
import org.jnode.command.util.NumberRange;
@@ -157,7 +156,7 @@
boolean first;
int limit, start, end;
for (String line : lines) {
- if (line.indexOf(inDelim) == -1) {
+ if (!line.contains(inDelim)) {
if (!suppress) {
out.write(line);
out.newLine();
Modified: trunk/cli/src/commands/org/jnode/command/file/DirCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/DirCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/DirCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -28,7 +28,6 @@
import java.util.Arrays;
import java.util.Comparator;
import java.util.Date;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.FileArgument;
@@ -121,7 +120,7 @@
for (int j = 0; j < LEFT_MARGIN + SEPARATOR_SIZE; j++) sb.append(' ');
sb.append(dateFormat.format(lastModified));
sb.append(SEPARATOR);
- sb.append("[");
+ sb.append('[');
sb.append(f.getName());
sb.append(']');
}
Modified: trunk/cli/src/commands/org/jnode/command/file/DuCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/DuCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/DuCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -24,9 +24,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Stack;
-
import javax.naming.NameNotFoundException;
-
import org.apache.log4j.Logger;
import org.jnode.command.util.AbstractDirectoryWalker;
import org.jnode.driver.Device;
@@ -240,22 +238,22 @@
private void printFileSize(final File filename, final long size) {
if (argAll.isSet()) {
- out.println(sizeToString(size) + "\t" + filename);
+ out.println(sizeToString(size) + '\t' + filename);
}
}
private void printDirSize(final File filename, final long dirSizeOnly, final long subDirSize) {
if (!argSum.isSet()) {
if (argSeperateDirs.isSet()) {
- out.println(sizeToString(dirSizeOnly) + "\t" + filename);
+ out.println(sizeToString(dirSizeOnly) + '\t' + filename);
} else {
- out.println(sizeToString(dirSizeOnly + subDirSize) + "\t" + filename);
+ out.println(sizeToString(dirSizeOnly + subDirSize) + '\t' + filename);
}
}
}
private void printSize(final String filename, final long size) {
- out.println(sizeToString(size) + "\t" + filename);
+ out.println(sizeToString(size) + '\t' + filename);
}
private void log(String message) {
Modified: trunk/cli/src/commands/org/jnode/command/file/FindCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/FindCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/FindCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -26,7 +26,6 @@
import java.io.PrintWriter;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.jnode.command.util.AbstractDirectoryWalker;
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
@@ -47,7 +46,7 @@
@Override
protected void handleRestrictedFile(File file) throws IOException {
- err.println("Permission denied for \"" + file + "\"");
+ err.println("Permission denied for \"" + file + '"');
}
@Override
Modified: trunk/cli/src/commands/org/jnode/command/file/GrepCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/GrepCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/GrepCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,22 +21,26 @@
package org.jnode.command.file;
import java.io.BufferedReader;
+import java.io.Closeable;
import java.io.File;
import java.io.FileFilter;
-import java.io.InputStream;
+import java.io.Flushable;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.Reader;
-
-import java.util.regex.Matcher;
+import java.io.Writer;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
import java.util.regex.MatchResult;
+import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.log4j.Logger;
import org.jnode.command.util.AbstractDirectoryWalker;
import org.jnode.command.util.AbstractDirectoryWalker.PathnamePatternFilter;
@@ -48,13 +52,6 @@
import org.jnode.shell.syntax.IntegerArgument;
import org.jnode.shell.syntax.StringArgument;
-import java.io.Closeable;
-import java.io.Flushable;
-import java.io.Writer;
-import java.io.InputStreamReader;
-import java.util.ArrayDeque;
-import java.util.Deque;
-
/**
* TODO implement Fixed/Basic/Ext matchers
* TODO implement --color (if/when possible)
@@ -680,20 +677,20 @@
if ((prefix & PREFIX_FILE) != 0) {
sb.append(name);
if ((prefix & (PREFIX_LINE | PREFIX_BYTE)) == 0) {
- sb.append("\t");
+ sb.append('\t');
}
sb.append(fieldSep);
}
if ((prefix & PREFIX_LINE) != 0) {
sb.append(padNumber(lineCount, 4));
if ((prefix & PREFIX_BYTE) == 0) {
- sb.append("\t");
+ sb.append('\t');
}
sb.append(fieldSep);
}
if ((prefix & PREFIX_BYTE) != 0) {
sb.append(padNumber(byteCount, 9));
- sb.append("\t");
+ sb.append('\t');
sb.append(fieldSep);
}
} else {
@@ -756,7 +753,7 @@
}
private String padNumber(int n, int size) {
- return String.format("%" + size + "d", n);
+ return String.format("%" + size + 'd', n);
}
/**
Modified: trunk/cli/src/commands/org/jnode/command/file/HexdumpCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/HexdumpCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/HexdumpCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -27,7 +27,6 @@
import java.io.InputStream;
import java.io.PrintWriter;
import java.net.URL;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.FileArgument;
@@ -112,10 +111,10 @@
sb.append(" ");
}
if ((i + 1) < rowlen) {
- sb.append(" ");
+ sb.append(' ');
}
if ((i + 1) == rowlen / 2) {
- sb.append(" ");
+ sb.append(' ');
}
}
@@ -127,14 +126,14 @@
if ((c >= ' ') && (c < (char) 0x7f)) {
sb.append(c);
} else {
- sb.append(".");
+ sb.append('.');
}
} else {
- sb.append(" ");
+ sb.append(' ');
}
}
- sb.append("|");
+ sb.append('|');
left -= sz;
ofs += sz;
Modified: trunk/cli/src/commands/org/jnode/command/file/SortCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/SortCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/SortCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,15 +21,14 @@
package org.jnode.command.file;
import java.io.File;
+import java.io.IOException;
import java.io.PrintWriter;
-import java.io.IOException;
+import java.util.ArrayList;
import java.util.Arrays;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
+import java.util.LinkedList;
import java.util.List;
-import java.util.LinkedList;
-
import org.jnode.command.util.IOUtils;
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.CommandLine;
@@ -39,6 +38,7 @@
import org.jnode.shell.syntax.FlagArgument;
import org.jnode.shell.syntax.IntegerArgument;
import org.jnode.shell.syntax.StringArgument;
+
import static org.jnode.shell.syntax.Argument.EXISTING;
import static org.jnode.shell.syntax.Argument.MULTIPLE;
import static org.jnode.shell.syntax.Argument.NONEXISTENT;
@@ -106,7 +106,7 @@
protected FieldRange doAccept(CommandLine.Token token, int flags) throws CommandSyntaxException {
String text = token.text;
FieldRange range = new FieldRange();
- int i = text.indexOf(",");
+ int i = text.indexOf(',');
if (i == -1) {
range.start = parseField(text, false);
range.end = new Field();
@@ -165,7 +165,7 @@
i--;
}
text = text.substring(0, i + 1);
- i = text.indexOf(".");
+ i = text.indexOf('.');
if (i == 0) {
throw new CommandSyntaxException("Field offset cannot be empty");
}
Modified: trunk/cli/src/commands/org/jnode/command/file/WcCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/WcCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/file/WcCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -28,7 +28,6 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.FileArgument;
@@ -126,13 +125,13 @@
private void checkFile(File file) {
if (!file.exists()) {
- getError().getPrintWriter().println(STR_ERROR_NOT_EXIST + " " + file.getAbsolutePath());
+ getError().getPrintWriter().println(STR_ERROR_NOT_EXIST + ' ' + file.getAbsolutePath());
exit(1);
} else if (file.isDirectory()) {
- getError().getPrintWriter().println(STR_ERROR_DIR + " " + file.getAbsolutePath());
+ getError().getPrintWriter().println(STR_ERROR_DIR + ' ' + file.getAbsolutePath());
exit(1);
} else if (!file.canRead()) {
- getError().getPrintWriter().println(STR_ERROR_CANT_READ + " " + file.getAbsolutePath());
+ getError().getPrintWriter().println(STR_ERROR_CANT_READ + ' ' + file.getAbsolutePath());
exit(1);
}
}
@@ -191,7 +190,7 @@
printLine(printWriter, paddingSize, wc.getLinesCount(), wc.getWordsCount(), wc.getCharsCount(), wc
.getBytesRead(), wc.getMaxCharsInLine());
if (wc.getFileName() != null) {
- printWriter.print(" " + wc.getFileName());
+ printWriter.print(' ' + wc.getFileName());
}
printWriter.println();
}
@@ -199,7 +198,7 @@
if (listWc.size() > 1) {
printLine(printWriter, paddingSize, totalLinesCount, totalWordsCount, totalCharsCount, totalBytesRead,
maxCharsInLine);
- printWriter.println(" " + STR_TOTAL);
+ printWriter.println(' ' + STR_TOTAL);
}
printWriter.flush();
}
@@ -253,10 +252,10 @@
sValue.append(value);
while (sValue.length() < paddingSize) {
- sValue.insert(0, " ");
+ sValue.insert(0, ' ');
}
if (!first) {
- sValue.insert(0, " ");
+ sValue.insert(0, ' ');
}
printWriter.print(sValue);
}
Modified: trunk/cli/src/commands/org/jnode/command/net/NetstatCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/net/NetstatCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/net/NetstatCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,7 +21,6 @@
package org.jnode.command.net;
import java.io.PrintWriter;
-
import org.jnode.driver.net.NetworkException;
import org.jnode.net.NetworkLayer;
import org.jnode.net.NetworkLayerManager;
@@ -83,7 +82,7 @@
int width = 0;
for (int i = 0; i < list.length; i++) {
final Statistic st = list[i];
- String msg = st.getName() + " " + st.getValue();
+ String msg = st.getName() + ' ' + st.getValue();
if (i + 1 < list.length) {
msg = msg + ", ";
}
Modified: trunk/cli/src/commands/org/jnode/command/net/RpcInfoCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/net/RpcInfoCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/net/RpcInfoCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -24,7 +24,6 @@
import java.io.PrintWriter;
import java.net.InetAddress;
import java.net.UnknownHostException;
-
import org.acplt.oncrpc.OncRpcException;
import org.acplt.oncrpc.OncRpcPortmapClient;
import org.acplt.oncrpc.OncRpcProtocols;
@@ -87,11 +86,10 @@
out.printf(fmt_list_serv, str_program, str_version, str_protocol, str_port, str_name);
out.println();
- for (int i = 0; i < servers.length; i++) {
- OncRpcServerIdent server = servers[i];
- out.printf(fmt_list_serv, server.program, server.version,
- server.protocol == 6 ? str_tcp : str_udp,
- server.port, getName(server.program));
+ for (OncRpcServerIdent server : servers) {
+ out.printf(fmt_list_serv, server.program, server.version,
+ server.protocol == 6 ? str_tcp : str_udp,
+ server.port, getName(server.program));
out.println();
}
} catch (OncRpcException e) {
Modified: trunk/cli/src/commands/org/jnode/command/system/BindKeysCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/BindKeysCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/BindKeysCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -29,7 +29,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.jnode.driver.console.Console;
import org.jnode.driver.console.KeyEventBindings;
import org.jnode.driver.console.TextConsole;
@@ -37,8 +36,8 @@
import org.jnode.driver.console.textscreen.ConsoleKeyEventBindings;
import org.jnode.driver.console.textscreen.KeyboardReaderAction;
import org.jnode.shell.AbstractCommand;
+import org.jnode.shell.CommandLine.Token;
import org.jnode.shell.ShellUtils;
-import org.jnode.shell.CommandLine.Token;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.CommandSyntaxException;
import org.jnode.shell.syntax.EnumArgument;
@@ -84,7 +83,7 @@
field.getName().startsWith("VK_")) {
try {
Integer vk = (Integer) field.get(null);
- String name = constCase(KeyEvent.getKeyText(vk.intValue()));
+ String name = constCase(KeyEvent.getKeyText(vk));
VK_NAME_MAP.put(name, vk);
VK_MAP.put(vk, name);
} catch (IllegalAccessException ex) {
@@ -432,7 +431,11 @@
} else if (ch < '\177') {
sb.append('\'').append(ch).append('\'');
} else {
- sb.append('\'').append(ch).append("' (0x" + Integer.toHexString(ch)).append(')');
+ sb.append('\'');
+ sb.append(ch);
+ sb.append("' (0x");
+ sb.append(Integer.toHexString(ch));
+ sb.append(')');
}
return sb.toString();
}
Modified: trunk/cli/src/commands/org/jnode/command/system/ClasspathCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/ClasspathCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/ClasspathCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,11 +21,12 @@
package org.jnode.command.system;
import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
import java.security.PrivilegedAction;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.FlagArgument;
@@ -77,16 +78,24 @@
clearClassPath();
if (urls != null) {
for (URL url : urls) {
- addToClassPath(url);
+ try {
+ addToClassPath(url);
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ }
}
}
}
- private void addToClassPath(URL url) {
+ private void addToClassPath(URL url) throws URISyntaxException {
URL[] urls = getClassLoader().getURLs();
+
if (urls != null) {
+ URI uri = url.toURI();
+ URI classLoaderUri;
for (URL u : urls) {
- if (u.equals(url)) {
+ classLoaderUri = u.toURI();
+ if (classLoaderUri.equals(uri)) {
return;
}
}
Modified: trunk/cli/src/commands/org/jnode/command/system/IsolateCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/IsolateCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/IsolateCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -21,7 +21,6 @@
package org.jnode.command.system;
import java.io.PrintWriter;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.vm.isolate.VmIsolate;
@@ -38,14 +37,14 @@
out.println(str_header);
VmIsolate root = VmIsolate.getRoot();
if (root != null) {
- out.println(format(String.valueOf(root.getId()), 8, false) + " " +
- format("0", 8, false) + " " +
+ out.println(format(String.valueOf(root.getId()), 8, false) + ' ' +
+ format("0", 8, false) + ' ' +
format(String.valueOf(root.getState()), 8, true));
}
for (VmIsolate iso : VmIsolate.getVmIsolates()) {
- out.println(format(String.valueOf(iso.getId()), 8, false) + " " +
- format(String.valueOf(iso.getCreator().getId()), 8, false) + " " +
- format(String.valueOf(iso.getState()), 8, true) + " " +
+ out.println(format(String.valueOf(iso.getId()), 8, false) + ' ' +
+ format(String.valueOf(iso.getCreator().getId()), 8, false) + ' ' +
+ format(String.valueOf(iso.getState()), 8, true) + ' ' +
iso.getMainClassName());
}
}
Modified: trunk/cli/src/commands/org/jnode/command/system/JavaCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/JavaCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/JavaCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -162,8 +162,8 @@
private byte[] loadClassData(String name) throws ClassNotFoundException {
String fn = name.replace('.', '/');
File f = null;
- for (int i = 0; i < dirs.length; i++) {
- f = new File(dirs[i] + fn + ".class");
+ for (String dir : dirs) {
+ f = new File(dir + fn + ".class");
if (f.exists()) {
break;
}
Modified: trunk/cli/src/commands/org/jnode/command/system/LocaleCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/LocaleCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/LocaleCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -25,7 +25,6 @@
import java.util.Comparator;
import java.util.Locale;
import java.util.TreeSet;
-
import org.jnode.shell.AbstractCommand;
import org.jnode.shell.syntax.Argument;
import org.jnode.shell.syntax.CountryArgument;
@@ -112,8 +111,8 @@
}
private String formatLocale(Locale l) {
- return (l.getDisplayName() + " : " + l.getLanguage() +
- " " + l.getCountry() + " " + l.getVariant());
+ return (l.getDisplayName() + " : " + l.getLanguage() +
+ ' ' + l.getCountry() + ' ' + l.getVariant());
}
/**
Modified: trunk/cli/src/commands/org/jnode/command/system/Log4jCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/Log4jCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/Log4jCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -27,7 +27,6 @@
import java.net.URL;
import java.util.Enumeration;
import java.util.Properties;
-
import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
@@ -111,7 +110,7 @@
while (en.hasMoreElements()) {
Logger logger = (Logger) en.nextElement();
String level = (logger.getLevel() == null) ?
- ("(" + logger.getEffectiveLevel().toString() + ")") :
+ ('(' + logger.getEffectiveLevel().toString() + ')') :
logger.getLevel().toString();
getOutput().getPrintWriter().println(logger.getName() + ": " + level);
}
Modified: trunk/cli/src/commands/org/jnode/command/system/LsIRQCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/LsIRQCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/LsIRQCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -45,7 +45,7 @@
final IRQManager irqMgr = proc.getIRQManager();
final int max = irqMgr.getNumIRQs();
for (int i = 0; i < max; i++) {
- getOutput().getPrintWriter().println("IRQ" + i + "\t" + irqMgr.getIrqCount(i) + "\t"
+ getOutput().getPrintWriter().println("IRQ" + i + '\t' + irqMgr.getIrqCount(i) + '\t'
+ irqMgr.getHandlerInfo(i));
}
}
Modified: trunk/cli/src/commands/org/jnode/command/system/PluginCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/system/PluginCommand.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/cli/src/commands/org/jnode/command/system/PluginCommand.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -29,9 +29,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-
import javax.naming.NameNotFoundException;
-
import org.jnode.naming.InitialNaming;
import org.jnode.plugin.PluginDescriptor;
import org.jnode.plugin.PluginException;
@@ -140,7 +138,7 @@
private void addPluginLoader(URL url) throws PluginException, MalformedURLException {
final String ext = url.toExternalForm();
if (!ext.endsWith("/")) {
- url = new URL(ext + "/");
+ url = new URL(ext + '/');
}
mgr.getLoaderManager().addPluginLoader(new URLPluginLoader(url));
out.format(fmt_add_loader, url);
@@ -171,7 +169,7 @@
}
private void listPlugins() throws PluginException {
- final ArrayList<String> rows = new ArrayList<String>();
+ final List<String> rows = new ArrayList<String>();
for (PluginDescriptor descr : mgr.getRegistry()) {
String row = String.format(fmt_list,
descr.getId(),
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Buffer.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -82,7 +82,7 @@
/* Base = 0 */
regs.setReg32(SCBPointer, 0);
regs.setReg16(SCBCmd, SCBMaskAll | RxAddrLoad);
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
log.debug("Set RX base addr.");
rxPacket = new EEPRO100RxFD(rm);
rxPacket.setStatus(0x0001);
@@ -96,7 +96,7 @@
rxPacket.initialize();
regs.setReg32(SCBPointer, rxPacket.getBufferAddress());
regs.setReg16(SCBCmd, SCBMaskAll | RxStart);
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
log.debug("Started rx process.");
// Start the receiver.
rxPacket.setStatus(0);
@@ -111,7 +111,7 @@
*
*/
public final void initSingleTxRing() {
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
log.debug("Set TX base addr.");
txFD = new EEPRO100TxFD(rm);
txFD.setCommand(CmdIASetup);
@@ -134,7 +134,7 @@
regs.setReg16(SCBStatus, status & IntrAllNormal);
log.debug("transmitting status = " + NumberUtils.hex(status) + ", cmd=" +
- NumberUtils.hex(regs.getReg16(SCBStatus)) + "\n");
+ NumberUtils.hex(regs.getReg16(SCBStatus)) + '\n');
txFD.setStatus(0);
txFD.setCommand(CmdSuspend | CmdTx | CmdTxFlex);
@@ -146,7 +146,7 @@
regs.setReg16(SCBPointer, txFD.getBufferAddress());
regs.setReg16(SCBCmd, SCBMaskAll | CUStart);
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
s1 = regs.getReg16(SCBStatus);
// TODO wait 10 ms for transmiting;
@@ -173,7 +173,7 @@
regs.setReg16(SCBPointer, rxPacket.getStatus());
regs.setReg16(SCBCmd, SCBMaskAll | RxStart);
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
log.debug("Got a packet: Len=" + NumberUtils.hex(rxPacket.getCount()));
@@ -204,7 +204,7 @@
txRing[txEntry].setCount(getTxThreshold());
// EEPRO100TxFD lastCmd0 = lastCmd;
lastCmd = txRing[txEntry];
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
regs.setReg8(SCBCmd, CUResume);
}
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -468,7 +468,7 @@
int status;
if ((buffers.getCurRx() - buffers.getDirtyRx()) > 15) {
- log.debug("curRx > dirtyRx " + buffers.getCurRx() + " " + buffers.getDirtyRx());
+ log.debug("curRx > dirtyRx " + buffers.getCurRx() + ' ' + buffers.getDirtyRx());
}
do {
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Flags.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Flags.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Flags.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -45,6 +45,7 @@
/* (non-Javadoc)
* @see org.jnode.driver.net.ethernet.Flags#getName()
*/
+ @Override
public String getName() {
return this.name;
}
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Registers.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -20,13 +20,17 @@
package org.jnode.driver.net.eepro100;
+import org.apache.log4j.Logger;
import org.jnode.system.resource.IOResource;
+import org.jnode.util.NumberUtils;
/**
* @author flesire
*/
-public class EEPRO100Registers {
+public class EEPRO100Registers implements EEPRO100Constants {
+ protected static final Logger log = Logger.getLogger(EEPRO100Registers.class);
+
/**
* Start of IO address space
*/
@@ -53,7 +57,7 @@
* @param value
*/
- public final void setReg8(int reg, int value) {
+ public void setReg8(int reg, int value) {
io.outPortByte(iobase + reg, value);
}
@@ -64,7 +68,7 @@
* @param value
*/
- public final void setReg16(int reg, int value) {
+ public void setReg16(int reg, int value) {
io.outPortWord(iobase + reg, value);
}
@@ -75,7 +79,7 @@
* @param value
*/
- public final void setReg32(int reg, int value) {
+ public void setReg32(int reg, int value) {
io.outPortDword(iobase + reg, value);
}
@@ -84,7 +88,7 @@
*
* @param reg
*/
- public final int getReg16(int reg) {
+ public int getReg16(int reg) {
return io.inPortWord(iobase + reg);
}
@@ -107,4 +111,23 @@
return io.inPortByte(iobase + reg);
}
+ /**
+ * Wait for the command unit to accept a command.
+ */
+ public void waitForCmdDone() {
+ int wait = 0;
+ int delayed_cmd;
+ do {
+ if (getReg8(SCBCmd) == 0)
+ return;
+ } while (++wait <= 100);
+ delayed_cmd = getReg8(SCBCmd);
+ do {
+ if (getReg8(SCBCmd) == 0)
+ break;
+ } while (++wait <= 10000);
+ log.debug("Command " + NumberUtils.hex(delayed_cmd) + " was not immediately accepted, " +
+ wait + " ticks!");
+ }
+
}
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Stats.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -97,7 +97,7 @@
rx_fifo_errors += mem.getInt(52);
rx_length_errors += mem.getInt(60);
mem.setInt(64, 0);
- EEPRO100Utils.waitForCmdDone(regs);
+ regs.waitForCmdDone();
regs.setReg8(SCBCmd, CUDumpStats);
}
}
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100TxFD.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -156,16 +156,16 @@
StringBuilder str = new StringBuilder();
str.append("Status : ");
str.append(NumberUtils.hex(this.getStatus()));
- str.append("\n");
+ str.append('\n');
str.append("Command : ");
str.append(NumberUtils.hex(this.getCommand()));
- str.append("\n");
+ str.append('\n');
str.append("Link : ");
str.append(NumberUtils.hex(this.getLink()));
- str.append("\n");
+ str.append('\n');
str.append("Count : ");
str.append(NumberUtils.hex(this.getCount()));
- str.append("\n");
+ str.append('\n');
return str.toString();
}
}
Deleted: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Utils.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Utils.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Utils.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -1,55 +0,0 @@
-/*
- * $Id$
- *
- * Copyright (C) 2003-2010 JNode.org
- *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; If not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-package org.jnode.driver.net.eepro100;
-
-import org.apache.log4j.Logger;
-import org.jnode.util.NumberUtils;
-
-/**
- * @author flesire
- */
-public class EEPRO100Utils implements EEPRO100Constants {
- /**
- * Logger
- */
- protected static final Logger log = Logger.getLogger(EEPRO100Utils.class);
-
- /**
- * Wait for the command unit to accept a command.
- *
- * @param regs
- */
- static final void waitForCmdDone(EEPRO100Registers regs) {
- int wait = 0;
- int delayed_cmd;
- do {
- if (regs.getReg8(SCBCmd) == 0)
- return;
- } while (++wait <= 100);
- delayed_cmd = regs.getReg8(SCBCmd);
- do {
- if (regs.getReg8(SCBCmd) == 0)
- break;
- } while (++wait <= 10000);
- log.debug("Command " + NumberUtils.hex(delayed_cmd) + " was not immediately accepted, " +
- wait + " ticks!");
- }
-}
Modified: trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/prism2/Prism2Core.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -20,30 +20,7 @@
package org.jnode.driver.net.prism2;
-import static org.jnode.driver.net.prism2.Prism2Constants.Command.ACCESS;
-import static org.jnode.driver.net.prism2.Prism2Constants.Command.ALLOC;
-import static org.jnode.driver.net.prism2.Prism2Constants.Command.DISABLE;
-import static org.jnode.driver.net.prism2.Prism2Constants.Command.ENABLE;
-import static org.jnode.driver.net.prism2.Prism2Constants.Command.INIT;
-import static org.jnode.driver.net.prism2.Prism2Constants.Command.TX;
-import static org.jnode.driver.net.prism2.Prism2Constants.LinkStatus.CONNECTED;
-import static org.jnode.driver.net.prism2.Prism2Constants.LinkStatus.NOTCONNECTED;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFAUTHENTICATION;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFMAXDATALEN;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFOWNMACADDR;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFPORTTYPE;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CURRENTBSSID;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CURRENTSSID;
-import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.TXRATECNTL;
-import static org.jnode.driver.net.prism2.Prism2Constants.Register.ALLOCFID;
-import static org.jnode.driver.net.prism2.Prism2Constants.Register.EVACK;
-import static org.jnode.driver.net.prism2.Prism2Constants.Register.EVSTAT;
-import static org.jnode.driver.net.prism2.Prism2Constants.Register.INFOFID;
-import static org.jnode.driver.net.prism2.Prism2Constants.Register.INTEN;
-import static org.jnode.driver.net.prism2.Prism2Constants.Register.RXFID;
-
import javax.naming.NameNotFoundException;
-
import org.jnode.driver.Device;
import org.jnode.driver.DriverException;
import org.jnode.driver.bus.pci.PCIBaseAddress;
@@ -73,6 +50,28 @@
import org.vmmagic.unboxed.Extent;
import org.vmmagic.unboxed.MagicUtils;
+import static org.jnode.driver.net.prism2.Prism2Constants.Command.ACCESS;
+import static org.jnode.driver.net.prism2.Prism2Constants.Command.ALLOC;
+import static org.jnode.driver.net.prism2.Prism2Constants.Command.DISABLE;
+import static org.jnode.driver.net.prism2.Prism2Constants.Command.ENABLE;
+import static org.jnode.driver.net.prism2.Prism2Constants.Command.INIT;
+import static org.jnode.driver.net.prism2.Prism2Constants.Command.TX;
+import static org.jnode.driver.net.prism2.Prism2Constants.LinkStatus.CONNECTED;
+import static org.jnode.driver.net.prism2.Prism2Constants.LinkStatus.NOTCONNECTED;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFAUTHENTICATION;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFMAXDATALEN;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFOWNMACADDR;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CNFPORTTYPE;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CURRENTBSSID;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.CURRENTSSID;
+import static org.jnode.driver.net.prism2.Prism2Constants.RecordID.TXRATECNTL;
+import static org.jnode.driver.net.prism2.Prism2Constants.Register.ALLOCFID;
+import static org.jnode.driver.net.prism2.Prism2Constants.Register.EVACK;
+import static org.jnode.driver.net.prism2.Prism2Constants.Register.EVSTAT;
+import static org.jnode.driver.net.prism2.Prism2Constants.Register.INFOFID;
+import static org.jnode.driver.net.prism2.Prism2Constants.Register.INTEN;
+import static org.jnode.driver.net.prism2.Prism2Constants.Register.RXFID;
+
/**
* @author Ewout Prangsma (ep...@us...)
*/
@@ -317,7 +316,7 @@
// Validate the record length
if ((Prism2Record.getRecordLength(hdr, 0) - 1) * 2 != len) {
- throw new DriverException("Mismatch in record length. " + len + "/"
+ throw new DriverException("Mismatch in record length. " + len + '/'
+ Prism2Record.getRecordLength(hdr, 0));
}
@@ -394,7 +393,7 @@
final byte[] macAddr = new byte[CNFOWNMACADDR.getRecordLength()];
getConfig(CNFOWNMACADDR, macAddr, 0, CNFOWNMACADDR.getRecordLength());
this.hwAddress = new EthernetAddress(macAddr, 0);
- log.info("MAC-address for " + flags.getName() + " " + hwAddress);
+ log.info("MAC-address for " + flags.getName() + ' ' + hwAddress);
// Set maximum data length
setConfig16(CNFMAXDATALEN, WLAN_DATA_MAXLEN);
Modified: trunk/net/src/driver/org/jnode/driver/net/spi/AbstractNetDriver.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/spi/AbstractNetDriver.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/spi/AbstractNetDriver.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -22,9 +22,7 @@
import java.io.PrintWriter;
import java.util.HashMap;
-
import javax.naming.NameNotFoundException;
-
import org.apache.log4j.Logger;
import org.jnode.driver.Device;
import org.jnode.driver.DeviceAlreadyRegisteredException;
@@ -101,9 +99,9 @@
if (renameToDevicePrefixOnly()) {
dm.rename(device, getDevicePrefix(), true);
} else {
- final String prefix = getDevicePrefix() + "-";
+ final String prefix = getDevicePrefix() + '-';
if (!device.getId().startsWith(prefix)) {
- dm.rename(device, getDevicePrefix() + "-" + device.getId(), false);
+ dm.rename(device, getDevicePrefix() + '-' + device.getId(), false);
}
}
} catch (DeviceAlreadyRegisteredException ex) {
@@ -263,7 +261,7 @@
if (!protocolAddresses.isEmpty()) {
out.println("Protocol addresses:");
for (int protId : protocolAddresses.keySet()) {
- out.println(" 0x" + NumberUtils.hex(protId, 4) + " "
+ out.println(" 0x" + NumberUtils.hex(protId, 4) + ' '
+ getProtocolAddressInfo(protId));
}
}
Modified: trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/usb/bluetooth/UsbBluetoothDriver.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -130,7 +130,7 @@
StringBuilder buffer = new StringBuilder();
buffer.append("Data received : ");
for (byte aData : data) {
- buffer.append(NumberUtils.hex(data[0], 2)).append(" ");
+ buffer.append(NumberUtils.hex(data[0], 2)).append(' ');
}
log.debug(buffer.toString());
}
Modified: trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/driver/org/jnode/driver/net/via_rhine/ViaRhineCore.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -32,6 +32,19 @@
import org.jnode.driver.bus.pci.PCIHeaderType0;
import org.jnode.driver.net.ethernet.spi.Flags;
import org.jnode.driver.net.spi.AbstractDeviceCore;
+import org.jnode.naming.InitialNaming;
+import org.jnode.net.HardwareAddress;
+import org.jnode.net.SocketBuffer;
+import org.jnode.net.ethernet.EthernetAddress;
+import org.jnode.system.resource.IOResource;
+import org.jnode.system.resource.IRQHandler;
+import org.jnode.system.resource.IRQResource;
+import org.jnode.system.resource.ResourceManager;
+import org.jnode.system.resource.ResourceNotFreeException;
+import org.jnode.system.resource.ResourceOwner;
+import org.jnode.util.NumberUtils;
+import org.jnode.util.TimeoutException;
+
import static org.jnode.driver.net.via_rhine.ViaRhineConstants.CFGD_CFDX;
import static org.jnode.driver.net.via_rhine.ViaRhineConstants.CR1_SFRST;
import static org.jnode.driver.net.via_rhine.ViaRhineConstants.CR1_TDMD1;
@@ -83,19 +96,7 @@
import static org.jnode.driver.net.via_rhine.ViaRhineConstants.dwCurrentRxDescAddr;
import static org.jnode.driver.net.via_rhine.ViaRhineConstants.dwCurrentTxDescAddr;
import static org.jnode.driver.net.via_rhine.ViaRhineConstants.wMIIDATA;
-import org.jnode.naming.InitialNaming;
-import org.jnode.net.HardwareAddress;
-import org.jnode.net.SocketBuffer;
-import org.jnode.net.ethernet.EthernetAddress;
import static org.jnode.net.ethernet.EthernetConstants.ETH_ALEN;
-import org.jnode.system.resource.IOResource;
-import org.jnode.system.resource.IRQHandler;
-import org.jnode.system.resource.IRQResource;
-import org.jnode.system.resource.ResourceManager;
-import org.jnode.system.resource.ResourceNotFreeException;
-import org.jnode.system.resource.ResourceOwner;
-import org.jnode.util.NumberUtils;
-import org.jnode.util.TimeoutException;
/**
* @author Levente S\u00e1ntha
@@ -225,7 +226,7 @@
log.debug("New packet");
log.debug(packet.getLinkLayerHeader().getSourceAddress());
log.debug(packet.getLinkLayerHeader().getDestinationAddress());
- log.debug("\n" + hexDump(packet.toByteArray()) + "\n");
+ log.debug('\n' + hexDump(packet.toByteArray()) + '\n');
rxRing.currentDesc().setOwnBit();
rxRing.next();
}
@@ -676,7 +677,7 @@
// hwAddress.writeTo(buf, 6);
txRing.currentDesc().setOwnBit();
txRing.currentDesc().setPacket(buf);
- log.debug("\n" + hexDump(buf.toByteArray()) + "\n");
+ log.debug('\n' + hexDump(buf.toByteArray()) + '\n');
int CR1bak = getReg8(byCR1);
@@ -763,9 +764,9 @@
else
sb.append(" ");
if ((i + 1) < rowlen)
- sb.append(" ");
+ sb.append(' ');
if ((i + 1) == rowlen / 2)
- sb.append(" ");
+ sb.append(' ');
}
sb.append(" |");
@@ -776,12 +777,12 @@
if ((c >= ' ') && (c < (char) 0x7f))
sb.append(c);
else
- sb.append(".");
+ sb.append('.');
} else
- sb.append(" ");
+ sb.append(' ');
}
- sb.append("|");
+ sb.append('|');
left -= sz;
ofs += sz;
Modified: trunk/net/src/net/org/jnode/net/SocketBuffer.java
===================================================================
--- trunk/net/src/net/org/jnode/net/SocketBuffer.java 2012-03-27 15:16:35 UTC (rev 5893)
+++ trunk/net/src/net/org/jnode/net/SocketBuffer.java 2012-03-28 14:03:32 UTC (rev 5894)
@@ -171,9 +171,7 @@
size += count;
} else {
setSize(size + count);
- for (int i = size - 1; i >= count; i--) {
- data[start + i] = data[start + i - count];
- }
+ System.arraycopy(data, start + count - count, data, start + count, size - 1 - count);
}
for (int i = 0; i < count; i++) {
data[st...
[truncated message content] |
