Revision: 5704
http://jnode.svn.sourceforge.net/jnode/?rev=5704&view=rev
Author: lsantha
Date: 2010-01-02 09:31:33 +0000 (Sat, 02 Jan 2010)
Log Message:
-----------
Codestyle fixes.
Modified Paths:
--------------
trunk/cli/src/commands/org/jnode/command/file/DuCommand.java
trunk/core/src/core/org/jnode/vm/VmMagic.java
trunk/core/src/core/org/jnode/vm/classmgr/ObjectLayout.java
trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/X86BytecodeVisitor.java
trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/X86BytecodeVisitor.java
trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java
trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
Modified: trunk/cli/src/commands/org/jnode/command/file/DuCommand.java
===================================================================
--- trunk/cli/src/commands/org/jnode/command/file/DuCommand.java
2009-12-30 21:12:17 UTC (rev 5703)
+++ trunk/cli/src/commands/org/jnode/command/file/DuCommand.java
2010-01-02 09:31:33 UTC (rev 5704)
@@ -48,38 +48,52 @@
public class DuCommand extends AbstractCommand {
private static final String HELP_SUPER =
- "With no arguments, `du' reports the disk space for the current
directory. Normally the disk space is printed in units of 1024 bytes, but this
can be overridden";
+ "With no arguments, `du' reports the disk space for the current
directory. Normally the disk space is " +
+ "printed in units of 1024 bytes, but this can be overridden";
private static final String HELP_DIR = "directory to start printing sizes
recursively";
private static final String HELP_ALL = "Show counts for all files, not
just directories.";
private static final String HELP_BLOCK_SIZE_1 =
"Print sizes in bytes, overriding the default block size";
private static final String HELP_TOTAL =
- "Print a grand total of all arguments after all arguments have
been processed. This can be used to find out the total disk usage of a given
set of files or directories.";
+ "Print a grand total of all arguments after all arguments have
been processed. This can be used to " +
+ "find out the total disk usage of a given set of files or
directories.";
private static final String HELP_DEREF_ARGS =
- "Dereference symbolic links that are command line arguments. Does
not affect other symbolic links. This is helpful for finding out the disk
usage of directories, such as `/usr/tmp', which are often symbolic links. (not
implemented";
+ "Dereference symbolic links that are command line arguments. Does
not affect other symbolic links. " +
+ "This is helpful for finding out the disk usage of
directories, such as `/usr/tmp', " +
+ "which are often symbolic links. (not implemented";
private static final String HELP_HUMAN_READABLE_1024 =
- "Append a size letter such as `M' for megabytes to each size.
Powers of 1024 are used, not 1000; `M' stands for 1,048,576 bytes. Use the `-H'
or `--si' option if you prefer powers of 1000.";
+ "Append a size letter such as `M' for megabytes to each size.
Powers of 1024 are used, not 1000; " +
+ "`M' stands for 1,048,576 bytes. Use the `-H' or `--si' option
if you prefer powers of 1000.";
private static final String HELP_HUMAN_READABLE_1000 =
- "Append a size letter such as `M' for megabytes to each size. (SI
is the International System of Units, which defines these letters as prefixes.)
Powers of 1000 are used, not 1024; `M' stands for 1,000,000 bytes. Use the
`-h' or `--human-readable' option if you prefer powers of 1024.";
+ "Append a size letter such as `M' for megabytes to each size. (SI
is the International System of Units, " +
+ "which defines these letters as prefixes.) Powers of 1000 are
used, not 1024; " +
+ "`M' stands for 1,000,000 bytes. Use the `-h' or
`--human-readable' option if you prefer " +
+ "powers of 1024.";
private static final String HELP_BLOCK_SIZE_1024 =
"Print sizes in 1024-byte blocks, overriding the default block
size";
private static final String HELP_COUNT_LINKS =
"Count the size of all files, even if they have appeared already
(as a hard link). (not implemented";
private static final String HELP_DEREF =
- "Dereference symbolic links (show the disk space used by the file
or directory that the link points to instead of the space used by the link).
(not implemented";
+ "Dereference symbolic links (show the disk space used by the file
or directory that the link points to " +
+ "instead of the space used by the link). (not implemented";
private static final String HELP_MAX_DEPTH =
- "Show the total for each directory (and file if -all) that is at
most MAX_DEPTH levels down from the root of the hierarchy. The root is at
level 0, so `du --max-depth=0' is equivalent to `du -s'. (not tested)";
+ "Show the total for each directory (and file if -all) that is at
most MAX_DEPTH levels down " +
+ "from the root of the hierarchy. The root is at level 0, so
`du --max-depth=0' is equivalent " +
+ "to `du -s'. (not tested)";
private static final String HELP_BLOCK_SIZE_1024x1024 =
"Print sizes in megabyte (that is, 1,048,576-byte) blocks.";
private static final String HELP_SUM = "Display only a total for each
argument.";
private static final String HELP_SEPERATE_DIRS =
"Report the size of each directory separately, not including the
sizes of subdirectories.";
private static final String HELP_ONE_FS =
- "Skip directories that are on different filesystems from the one
that the argument being processed is on. (not implemented)";
+ "Skip directories that are on different filesystems from the one
that the argument " +
+ "being processed is on. (not implemented)";
private static final String HELP_EXCLUDE =
- "When recursing, skip subdirectories or files matching PAT. For
example, `du --exclude='*.o'' excludes files whose names end in `.o'. (not
tested)";
+ "When recursing, skip subdirectories or files matching PAT. For
example, `du --exclude='*.o'' " +
+ "excludes files whose names end in `.o'. (not tested)";
private static final String HELP_EXCLUDE_FROM =
- "Like `--exclude', except take the patterns to exclude from FILE,
one per line. If FILE is `-', take the patterns from standard input. (not
implemented)";
+ "Like `--exclude', except take the patterns to exclude from FILE,
one per line. If FILE is `-', " +
+ "take the patterns from standard input. (not implemented)";
private static final String HELP_BLOCK_SIZE_CUSTOM =
"Print sizes in the user defined block size, overriding the
default block size";
private static final String HELP_FS_BLOCK_SIZE =
Modified: trunk/core/src/core/org/jnode/vm/VmMagic.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmMagic.java 2009-12-30 21:12:17 UTC
(rev 5703)
+++ trunk/core/src/core/org/jnode/vm/VmMagic.java 2010-01-02 09:31:33 UTC
(rev 5704)
@@ -36,7 +36,8 @@
* Methods in this class can also be called from inside JNode.
*
* @author Ewout Prangsma (e...@users.sourceforge.net)
- * @see {...@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass} to get the
list of "magic" classes (including this class).
+ * @see {...@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass} to get the
list of "magic" classes
+ * (including this class).
* @see {...@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod} to get
the list of "magic" methods.
*/
@MagicPermission
Modified: trunk/core/src/core/org/jnode/vm/classmgr/ObjectLayout.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/ObjectLayout.java 2009-12-30
21:12:17 UTC (rev 5703)
+++ trunk/core/src/core/org/jnode/vm/classmgr/ObjectLayout.java 2010-01-02
09:31:33 UTC (rev 5704)
@@ -21,7 +21,6 @@
package org.jnode.vm.classmgr;
import org.jnode.annotation.Inline;
-import org.jnode.vm.VmArchitecture;
/**
* <description>
@@ -32,19 +31,21 @@
/**
* The offset of the flags of an object from the start of the object. This
- * value must be multiplied by {...@link VmArchitecture#getReferenceSize()
SLOT_SIZE} to get the offset in bytes.
+ * value must be multiplied by {...@link
org.jnode.vm.VmArchitecture#getReferenceSize() SLOT_SIZE}
+ * to get the offset in bytes.
*/
public static final int FLAGS_SLOT = -2;
/**
* The offset of the TIB of an object from the start of the object. This
- * value must be multiplied by {...@link VmArchitecture#getReferenceSize()
SLOT_SIZE} to get the offset in bytes.
+ * value must be multiplied by {...@link
org.jnode.vm.VmArchitecture#getReferenceSize() SLOT_SIZE}
+ * to get the offset in bytes.
*/
public static final int TIB_SLOT = -1;
/**
* The size of the header of an object. This value must be multiplied by
- * {...@link VmArchitecture#getReferenceSize() SLOT_SIZE} to get the size
in bytes.
+ * {...@link org.jnode.vm.VmArchitecture#getReferenceSize() SLOT_SIZE} to
get the size in bytes.
*/
public static final int HEADER_SLOTS = 2;
Modified:
trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/X86BytecodeVisitor.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/X86BytecodeVisitor.java
2009-12-30 21:12:17 UTC (rev 5703)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/X86BytecodeVisitor.java
2010-01-02 09:31:33 UTC (rev 5704)
@@ -73,7 +73,8 @@
/**
* Actual converter from bytecodes to X86 native code. Uses a virtual stack to
- * delay item emission, as described in the <a
href="http://orp.sourceforge.net/";>Open Runtime Platform (ORP)</a> project.
+ * delay item emission, as described in the <a
href="http://orp.sourceforge.net/";>Open Runtime Platform (ORP)</a>
+ * project.
*
* @author Ewout Prangsma (e...@users.sourceforge.net)
* @author Patrik Reali
Modified:
trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/X86BytecodeVisitor.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/X86BytecodeVisitor.java
2009-12-30 21:12:17 UTC (rev 5703)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/X86BytecodeVisitor.java
2010-01-02 09:31:33 UTC (rev 5704)
@@ -74,7 +74,8 @@
/**
* Actual converter from bytecodes to X86 native code. Uses a virtual stack to
- * delay item emission, as described in the <a
href="http://orp.sourceforge.net/";>Open Runtime Platform (ORP)</a> project.
+ * delay item emission, as described in the <a
href="http://orp.sourceforge.net/";>Open Runtime Platform (ORP)</a>
+ * project.
*
* @author Ewout Prangsma (e...@users.sourceforge.net)
* @author Patrik Reali
Modified: trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java
2009-12-30 21:12:17 UTC (rev 5703)
+++ trunk/fs/src/fs/org/jnode/fs/service/def/FileSystemAPIImpl.java
2010-01-02 09:31:33 UTC (rev 5704)
@@ -280,7 +280,7 @@
// never include the parent directory and the current directory in
// the result if they exist by any chance.
- if (".".equals(name) || "..".equals(name)){
+ if (".".equals(name) || "..".equals(name)) {
continue;
}
Modified: trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
===================================================================
--- trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
2009-12-30 21:12:17 UTC (rev 5703)
+++ trunk/net/src/driver/org/jnode/driver/net/eepro100/EEPRO100Core.java
2010-01-02 09:31:33 UTC (rev 5704)
@@ -177,7 +177,7 @@
for (y = 0, x = 0, sum = 0; x < eeSize; x++) {
int value = doEepromCmd((eeReadCmd | (x << 16)), 27);
eeprom[x] = value;
- sum += (short)value;
+ sum += (short) value;
if (x < 3) {
hwAddrArr[y++] = (byte) value;
hwAddrArr[y++] = (byte) (value >> 8);
@@ -407,7 +407,7 @@
regs.setReg16(SCBeeprom, EE_ENB);
eepromDelay(2);
regs.setReg16(SCBeeprom, (EE_ENB & ~EE_CS));
- return NumberUtils.toUnsigned((short)retVal);
+ return NumberUtils.toUnsigned((short) retVal);
}
// --- OTHER METHODS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits
