Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [4187] trunk
|
From: <ls...@us...> - 2008-06-04 08:26:40
|
Revision: 4187
http://jnode.svn.sourceforge.net/jnode/?rev=4187&view=rev
Author: lsantha
Date: 2008-06-04 01:26:35 -0700 (Wed, 04 Jun 2008)
Log Message:
-----------
Code style fixes.
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java
trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java
trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDriverUtils.java
trunk/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageConstants.java
trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPIContext.java
trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java
trunk/fs/src/test/org/jnode/test/fs/driver/context/FileDeviceContext.java
trunk/fs/src/test/org/jnode/test/fs/driver/factories/AbstractMockDeviceFactory.java
trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubDeviceManager.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/DeviceParam.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FS.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSType.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/tests/ConcurrentAccessFSTest.java
trunk/fs/src/test/org/jnode/test/support/AbstractTest.java
trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java
trunk/fs/src/test/org/jnode/test/support/ConfigManager.java
trunk/fs/src/test/org/jnode/test/support/Context.java
trunk/fs/src/test/org/jnode/test/support/ContextManager.java
trunk/fs/src/test/org/jnode/test/support/MockUtils.java
trunk/fs/src/test/org/jnode/test/support/TestUtils.java
trunk/gui/src/awt/org/jnode/awt/JNodeRobotPeer.java
trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java
trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFTextRenderer.java
trunk/gui/src/awt/org/jnode/awt/font/renderer/RenderCache.java
trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java
trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractTextRenderer.java
trunk/gui/src/awt/org/jnode/awt/font/spi/Glyph.java
trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java
trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java
trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics.java
trunk/gui/src/desktop/org/jnode/desktop/ApplicationBar.java
trunk/gui/src/desktop/org/jnode/desktop/Desktop.java
trunk/gui/src/desktop/org/jnode/desktop/WindowBar.java
trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java
trunk/gui/src/desktop/org/jnode/desktop/classic/TaskBar.java
trunk/gui/src/desktop/org/jnode/desktop/classic/WindowBar.java
trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java
trunk/gui/src/test/org/jnode/test/gui/Emu.java
trunk/gui/src/test/org/jnode/test/gui/ImageTest.java
trunk/gui/src/test/org/jnode/test/gui/Tetris.java
trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/AnnotateTask.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -320,7 +320,7 @@
* @author fabien
*/
private static class MarkerClassVisitor extends ClassAdapter {
- final private List<String> annotationTypeDescs;
+ private final List<String> annotationTypeDescs;
private boolean classIsModified = false;
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/FileSetTask.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -36,7 +36,7 @@
*
* @author Fabien DUMINY (fduminy at jnode.org)
*/
-abstract public class FileSetTask extends Task {
+public abstract class FileSetTask extends Task {
protected boolean trace = false;
protected boolean failOnError = true;
@@ -54,7 +54,7 @@
fileSets.add(fs);
}
- final public void execute() throws BuildException {
+ public final void execute() throws BuildException {
try {
doExecute();
} catch (BuildException be) {
@@ -77,7 +77,7 @@
processFiles();
}
- final protected void processFiles() throws BuildException {
+ protected final void processFiles() throws BuildException {
final Project project = getProject();
try {
for (FileSet fs : fileSets) {
@@ -93,5 +93,5 @@
}
}
- abstract protected void processFile(File file) throws IOException;
+ protected abstract void processFile(File file) throws IOException;
}
Modified: trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/builder/src/builder/org/jnode/build/documentation/PluginDocumentationTask.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -57,9 +57,9 @@
private final SortedMap<String, PluginData> descriptors = new TreeMap<String, PluginData>();
- private final static String DOCHEADER = "JNode plugin documentation";
+ private static final String DOCHEADER = "JNode plugin documentation";
- private final static String PLUGINS_SUBDIR = "plugins";
+ private static final String PLUGINS_SUBDIR = "plugins";
private static final String EXT = ".html";
@@ -67,19 +67,15 @@
private static final String ALL_FILE = "all-frame" + EXT;
- private static final String OVERVIEW_SUMMARY_FILE = "overview-summary"
- + EXT;
+ private static final String OVERVIEW_SUMMARY_FILE = "overview-summary" + EXT;
private static final String OVERVIEW_SUMMARY_FRAME = "overviewSummary";
- private static final String OVERVIEW_PACKAGE_FILE = "overview-package"
- + EXT;
+ private static final String OVERVIEW_PACKAGE_FILE = "overview-package" + EXT;
- private static final String OVERVIEW_LICENSE_FILE = "overview-license"
- + EXT;
+ private static final String OVERVIEW_LICENSE_FILE = "overview-license" + EXT;
- private static final String OVERVIEW_TREE_FILE = "overview-tree"
- + EXT;
+ private static final String OVERVIEW_TREE_FILE = "overview-tree" + EXT;
private static final String OVERVIEW_TREE_DOTFILE = "overview-tree.dot";
private static final String OVERVIEW_TREE_PNGFILE = "overview-tree.png";
Modified: trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -240,10 +240,10 @@
*/
private static final Logger log = Logger.getLogger(BlockAlignmentSupport.class);
- static private final int EMPTY = 0;
- static private final int CONTAINED = 1;
- static private final int CROSSED = 2;
- static private final int ALIGNED = 3;
+ private static final int EMPTY = 0;
+ private static final int CONTAINED = 1;
+ private static final int CROSSED = 2;
+ private static final int ALIGNED = 3;
private final BlockDeviceAPI parentApi;
private int alignment;
Modified: trunk/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDriverUtils.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDriverUtils.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/driver/org/jnode/driver/block/floppy/support/FloppyDriverUtils.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -30,7 +30,7 @@
*/
public class FloppyDriverUtils {
- static public final FloppyDeviceFactory getFloppyDeviceFactory() throws NamingException {
+ public static final FloppyDeviceFactory getFloppyDeviceFactory() throws NamingException {
try {
return InitialNaming.lookup(FloppyDeviceFactory.NAME);
} catch (NameNotFoundException ex) {
Modified: trunk/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageConstants.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageConstants.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/driver/org/jnode/driver/block/usb/storage/USBStorageConstants.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -31,48 +31,48 @@
*/
public interface USBStorageConstants extends USBConstants {
/* Sub Classes */
- public final static int US_SC_RBC = 0x01; /* Typically, flash devices */
- public final static int US_SC_8020 = 0x02; /* CD-ROM */
- public final static int US_SC_QIC = 0x03; /* QIC-157 Tapes */
- public final static int US_SC_UFI = 0x04; /* Floppy */
- public final static int US_SC_8070 = 0x05; /* Removable media */
- public final static int US_SC_SCSI = 0x06; /* Transparent */
- public final static int US_SC_ISD200 = 0x07; /* ISD200 ATA */
+ public static final int US_SC_RBC = 0x01; /* Typically, flash devices */
+ public static final int US_SC_8020 = 0x02; /* CD-ROM */
+ public static final int US_SC_QIC = 0x03; /* QIC-157 Tapes */
+ public static final int US_SC_UFI = 0x04; /* Floppy */
+ public static final int US_SC_8070 = 0x05; /* Removable media */
+ public static final int US_SC_SCSI = 0x06; /* Transparent */
+ public static final int US_SC_ISD200 = 0x07; /* ISD200 ATA */
- public final static int US_SC_MIN = US_SC_RBC;
- public final static int US_SC_MAX = US_SC_ISD200;
- public final static int US_SC_DEVICE = 0xff; /* Use device's value */
+ public static final int US_SC_MIN = US_SC_RBC;
+ public static final int US_SC_MAX = US_SC_ISD200;
+ public static final int US_SC_DEVICE = 0xff; /* Use device's value */
/* Protocols */
- public final static int US_PR_CBI = 0x00; /* Control/Bulk/Interrupt */
- public final static int US_PR_CB = 0x01; /* Control/Bulk w/o interrupt */
- public final static int US_PR_BULK = 0x50; /* bulk only */
+ public static final int US_PR_CBI = 0x00; /* Control/Bulk/Interrupt */
+ public static final int US_PR_CB = 0x01; /* Control/Bulk w/o interrupt */
+ public static final int US_PR_BULK = 0x50; /* bulk only */
- public final static int US_PR_SCM_ATAPI = 0x80; /* SCM-ATAPI bridge */
- public final static int US_PR_EUSB_SDDR09 = 0x81; /* SCM-SCSI bridge for SDDR-09 */
- public final static int US_PR_SDDR55 = 0x82; /* SDDR-55 (made up) */
- public final static int US_PR_DPCM_USB = 0xf0; /* Combination CB/SDDR09 */
- public final static int US_PR_FREECOM = 0xf1; /* Freecom */
- public final static int US_PR_DATAFAB = 0xf2; /* Datafab chipsets */
- public final static int US_PR_JUMPSHOT = 0xf3; /* Lexar Jumpshot */
- public final static int US_PR_DEVICE = 0xff; /* Use device's value */
+ public static final int US_PR_SCM_ATAPI = 0x80; /* SCM-ATAPI bridge */
+ public static final int US_PR_EUSB_SDDR09 = 0x81; /* SCM-SCSI bridge for SDDR-09 */
+ public static final int US_PR_SDDR55 = 0x82; /* SDDR-55 (made up) */
+ public static final int US_PR_DPCM_USB = 0xf0; /* Combination CB/SDDR09 */
+ public static final int US_PR_FREECOM = 0xf1; /* Freecom */
+ public static final int US_PR_DATAFAB = 0xf2; /* Datafab chipsets */
+ public static final int US_PR_JUMPSHOT = 0xf3; /* Lexar Jumpshot */
+ public static final int US_PR_DEVICE = 0xff; /* Use device's value */
/* Transport */
- public final static int CB_RESET_CMD_SIZE = 12;
+ public static final int CB_RESET_CMD_SIZE = 12;
- public final static int US_BULK_CB_SIGN = 0x43425355; /*spells out USBC */
- public final static int US_BULK_CB_WRAP_LEN = 31;
- public final static int US_BULK_CB_LUN_MASK = 0x07;
- public final static int US_BULK_FLAG_OUT = 0x00;
- public final static int US_BULK_FLAG_IN = 0x80;
+ public static final int US_BULK_CB_SIGN = 0x43425355; /*spells out USBC */
+ public static final int US_BULK_CB_WRAP_LEN = 31;
+ public static final int US_BULK_CB_LUN_MASK = 0x07;
+ public static final int US_BULK_FLAG_OUT = 0x00;
+ public static final int US_BULK_FLAG_IN = 0x80;
- public final static int US_BULK_CS_SIGN = 0x53425355; /*spells out USBS */
- public final static int US_BULK_CS_WRAP_LEN = 13;
+ public static final int US_BULK_CS_SIGN = 0x53425355; /*spells out USBS */
+ public static final int US_BULK_CS_WRAP_LEN = 13;
- public final static int US_BULK_CS_CMD_NO_ERROR = 0x00; // No error occurs
- public final static int US_BULK_CS_CMD_FAILED = 0x01;
- public final static int US_BULK_CS_CMD_WRONG_SEQUENCE = 0x02;
+ public static final int US_BULK_CS_CMD_NO_ERROR = 0x00; // No error occurs
+ public static final int US_BULK_CS_CMD_FAILED = 0x01;
+ public static final int US_BULK_CS_CMD_WRONG_SEQUENCE = 0x02;
}
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPIContext.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPIContext.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPIContext.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -38,7 +38,7 @@
import org.jnode.test.support.Context;
import org.jnode.test.support.TestConfig;
-abstract public class BlockDeviceAPIContext extends Context {
+public abstract class BlockDeviceAPIContext extends Context {
protected static final Logger log = Logger
.getLogger(BlockDeviceAPIContext.class);
@@ -54,7 +54,7 @@
this.name = name;
}
- final public String getName() {
+ public final String getName() {
return name;
}
@@ -139,7 +139,7 @@
}
}
- final public BlockDeviceAPI getApi() {
+ public final BlockDeviceAPI getApi() {
return api;
}
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -33,11 +33,10 @@
* @author Fabien DUMINY
*/
public class BlockDeviceAPITestConfig implements TestConfig {
- final private static String DEVICE_SIZE_STR = "1M"; // may use multipliers
+ private static final String DEVICE_SIZE_STR = "1M"; // may use multipliers
// (K, M, G)
- final private static int DEVICE_SIZE = (int) NumberUtils
- .getSize(DEVICE_SIZE_STR);
+ private static final int DEVICE_SIZE = (int) NumberUtils.getSize(DEVICE_SIZE_STR);
private Class<?> contextClass;
@@ -59,11 +58,11 @@
/**
* @return
*/
- final public BlockDeviceAPI getBlockDeviceAPI() {
+ public final BlockDeviceAPI getBlockDeviceAPI() {
return ((BlockDeviceAPIContext) ContextManager.getInstance().getContext()).getApi();
}
- final public Class<?> getContextClass() {
+ public final Class<?> getContextClass() {
return contextClass;
}
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/context/FileDeviceContext.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/context/FileDeviceContext.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/context/FileDeviceContext.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -30,7 +30,7 @@
import org.jnode.test.support.TestUtils;
public class FileDeviceContext extends BlockDeviceAPIContext {
- final private File f;
+ private final File f;
public FileDeviceContext() throws IOException {
super("FileDevice");
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/factories/AbstractMockDeviceFactory.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/factories/AbstractMockDeviceFactory.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/factories/AbstractMockDeviceFactory.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -32,7 +32,7 @@
public AbstractMockDeviceFactory() {
}
- final public void setTestCase(MockObjectTestCase testCase) {
+ public final void setTestCase(MockObjectTestCase testCase) {
this.testCase = testCase;
}
}
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubDeviceManager.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubDeviceManager.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubDeviceManager.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -82,7 +82,7 @@
/**
* Start this manager
*/
- final public void start() {
+ public final void start() {
// Thread thread = new Thread()
// {
// public void run()
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -43,7 +43,7 @@
* @author Fabien DUMINY
*/
public abstract class AbstractFSTest extends JFuncTestCase {
- final protected Logger log = Logger.getLogger(getClass());
+ protected final Logger log = Logger.getLogger(getClass());
//public static final int FILE_SIZE_IN_WORDS = 256 * 1024; // 512 Ko = 256 K Words
public static final int FILE_SIZE_IN_WORDS = 128; // 512 Ko = 128 K Words
@@ -63,7 +63,7 @@
super(name);
}
- final protected void setUp(FSTestConfig config) throws NameNotFoundException, FileSystemException, IOException,
+ protected final void setUp(FSTestConfig config) throws NameNotFoundException, FileSystemException, IOException,
InstantiationException, IllegalAccessException, Exception {
super.setUp();
@@ -72,7 +72,7 @@
this.fs = config.getFileSystem().mount(this.device);
}
- final public void tearDown() throws Exception {
+ public final void tearDown() throws Exception {
config.getDeviceParam().tearDown(device);
super.tearDown();
}
@@ -93,7 +93,7 @@
/**
* @return Returns the fs.
*/
- final protected FileSystem getFs() {
+ protected final FileSystem getFs() {
return fs;
}
@@ -125,7 +125,7 @@
* @param isRoot
* @return
*/
- final protected String[] getEmptyDirNames(FSTestConfig config, boolean isRoot) {
+ protected final String[] getEmptyDirNames(FSTestConfig config, boolean isRoot) {
return config.getFileSystem().getType().getEmptyDirNames(isRoot);
}
@@ -182,7 +182,7 @@
* @throws IllegalAccessException
* @throws InstantiationException
*/
- final protected void remountFS(FSTestConfig config, boolean readOnly)
+ protected final void remountFS(FSTestConfig config, boolean readOnly)
throws NameNotFoundException, IOException, FileSystemException, InstantiationException, IllegalAccessException {
fs.close();
fs = config.getFileSystem().getType().mount(fs.getDevice(), readOnly);
@@ -196,7 +196,7 @@
* @throws IOException
* @throws FileSystemException
*/
- final protected byte[] addTestFile(String fileName, int fileSizeInWords)
+ protected final byte[] addTestFile(String fileName, int fileSizeInWords)
throws Exception, IOException, FileSystemException {
boolean oldReadOnly = config.isReadOnly();
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/DeviceParam.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/DeviceParam.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/DeviceParam.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -41,13 +41,13 @@
* @return @throws
* Exception
*/
- abstract public Device createDevice() throws Exception;
+ public abstract Device createDevice() throws Exception;
/**
* @param device
* @throws Exception
*/
- abstract public void tearDown(Device device) throws Exception;
+ public abstract void tearDown(Device device) throws Exception;
/**
* @return Returns the input.
@@ -59,7 +59,7 @@
/**
* @param input The input to set.
*/
- final public void setInput(boolean input) {
+ public final void setInput(boolean input) {
this.input = input;
}
}
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FS.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FS.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FS.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -32,9 +32,9 @@
* @author Fabien DUMINY
*/
public class FS {
- final private FSType type;
- final private boolean readOnly;
- final private Formatter<? extends FileSystem> formatter;
+ private final FSType type;
+ private final boolean readOnly;
+ private final Formatter<? extends FileSystem> formatter;
public FS(FSType type, boolean readOnly, Formatter<? extends FileSystem> formatter) {
this.type = type;
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -28,11 +28,11 @@
*/
public class FSTestConfig {
- final private DeviceParam deviceParam;
+ private final DeviceParam deviceParam;
- final private OsType os;
+ private final OsType os;
- final private FS fs;
+ private final FS fs;
/**
*
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSType.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSType.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSType.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -50,12 +50,12 @@
NTFS("ntfs", NTFSFileSystem.class, NTFSFileSystemType.class,
new String[]{"."});
- final private Class<? extends FileSystem> fsClass;
+ private final Class<? extends FileSystem> fsClass;
- final private Class<? extends FileSystemType> fsTypeClass;
+ private final Class<? extends FileSystemType> fsTypeClass;
- final private String name;
- final private String[] emptyDirNames;
+ private final String name;
+ private final String[] emptyDirNames;
private FSType(String name, Class<? extends FileSystem> fsClass,
Class<? extends FileSystemType> fsTypeClass,
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/tests/ConcurrentAccessFSTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/tests/ConcurrentAccessFSTest.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/tests/ConcurrentAccessFSTest.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -217,7 +217,7 @@
protected abstract void doRun(long offset) throws IOException;
- final public void run() {
+ public final void run() {
long length = file.getLength();
try {
for (int i = start; i < (length - 1); i += step) {
Modified: trunk/fs/src/test/org/jnode/test/support/AbstractTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/AbstractTest.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/AbstractTest.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -86,7 +86,7 @@
log.info("END " + testName); // marker for log4j traces
}
- final protected TestConfig getTestConfig() {
+ protected final TestConfig getTestConfig() {
if (testConfig == null) {
testConfig = ConfigManager.getInstance().getConfig(configClazz, getClass(), getName());
}
@@ -94,7 +94,7 @@
return testConfig;
}
- final public void runTest() throws Throwable {
+ public final void runTest() throws Throwable {
try {
super.runTest();
} catch (Throwable t) {
@@ -116,14 +116,14 @@
// return name;
// }
- final public void setName(String name) {
+ public final void setName(String name) {
if (testConfig != null) {
name += "[" + testConfig.getName() + "]";
}
super.setName(name);
}
- final protected String getTestName() {
+ protected final String getTestName() {
return getClass().getName() + "." + getName(); // className.methodName
}
}
Modified: trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -25,7 +25,7 @@
import junit.framework.TestSuite;
import org.apache.log4j.Logger;
-abstract public class AbstractTestSuite extends TestSuite {
+public abstract class AbstractTestSuite extends TestSuite {
public AbstractTestSuite() {
ContextManager.getInstance().init();
init();
@@ -35,7 +35,7 @@
* Add a TestSuite containing TestSuites
* (for each couple (config, TestSuite class))
*/
- final public void init() {
+ public final void init() {
List<TestConfig> configs = getConfigs();
Class[] testSuites = getTestSuites();
log.info(configs.size() + " configs, " +
@@ -55,12 +55,12 @@
/**
* @return a list of TestConfig(s)
*/
- abstract public List<TestConfig> getConfigs();
+ public abstract List<TestConfig> getConfigs();
/**
* @return an array of TestSuite classes
*/
- abstract public Class[] getTestSuites();
+ public abstract Class[] getTestSuites();
protected final Logger log = Logger.getLogger(getClass().getName());
}
Modified: trunk/fs/src/test/org/jnode/test/support/ConfigManager.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/ConfigManager.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/ConfigManager.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -32,13 +32,13 @@
public class ConfigManager {
private static final Logger log = Logger.getLogger(ConfigManager.class);
- static private ConfigManager instance;
- static private boolean log4jInitialized = false;
+ private static ConfigManager instance;
+ private static boolean log4jInitialized = false;
private Map<Class, List<TestConfig>> configs;
private Map<TestKey, Iterator<TestConfig>> iterators;
- static public ConfigManager getInstance() {
+ public static ConfigManager getInstance() {
if (instance == null) {
instance = new ConfigManager();
}
@@ -78,7 +78,7 @@
ContextManager.getInstance().init();
}
- static private class TestKey {
+ private static class TestKey {
private Class clazz;
private String testName;
Modified: trunk/fs/src/test/org/jnode/test/support/Context.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/Context.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/Context.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -23,8 +23,8 @@
import org.jmock.MockObjectTestCase;
-abstract public class Context {
- abstract public void init(TestConfig config, MockObjectTestCase testCase) throws Exception;
+public abstract class Context {
+ public abstract void init(TestConfig config, MockObjectTestCase testCase) throws Exception;
- abstract public void destroy() throws Exception;
+ public abstract void destroy() throws Exception;
}
Modified: trunk/fs/src/test/org/jnode/test/support/ContextManager.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/ContextManager.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/ContextManager.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -47,7 +47,7 @@
private boolean initialized = false;
private Context context;
- static public ContextManager getInstance() {
+ public static ContextManager getInstance() {
if (instance == null) {
instance = new ContextManager();
}
Modified: trunk/fs/src/test/org/jnode/test/support/MockUtils.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/MockUtils.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/MockUtils.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -27,11 +27,11 @@
public class MockUtils {
private static final Logger log = Logger.getLogger(MockUtils.class);
- static public <T> T createMockObject(Class<T> name) {
+ public static <T> T createMockObject(Class<T> name) {
return createMockObject(name, null);
}
- static public <T> T createMockObject(Class<T> name, MockInitializer initializer) {
+ public static <T> T createMockObject(Class<T> name, MockInitializer initializer) {
String shortName = getShortName(name);
Mock mock = new Mock(name, shortName);
log.info("created a Mock for " + shortName);
@@ -43,11 +43,11 @@
return name.cast(mock.proxy());
}
- static public Object createMockObject(Class name, Class[] clsArgs, Object[] args) {
+ public static Object createMockObject(Class name, Class[] clsArgs, Object[] args) {
return createMockObject(name, null, clsArgs, args);
}
- static public Object createMockObject(Class name, MockInitializer initializer, Class[] clsArgs, Object[] args) {
+ public static Object createMockObject(Class name, MockInitializer initializer, Class[] clsArgs, Object[] args) {
String shortName = getShortName(name);
CGLibCoreMockExt cglibMock = new CGLibCoreMockExt(name, shortName);
Mock mock = new Mock(cglibMock);
@@ -60,7 +60,7 @@
return cglibMock.createProxy(clsArgs, args);
}
- static public String getShortName(Class<?> clazz) {
+ public static String getShortName(Class<?> clazz) {
String name = clazz.getName();
int idx = name.lastIndexOf('.');
return (idx >= 0) ? name.substring(idx + 1) : name;
Modified: trunk/fs/src/test/org/jnode/test/support/TestUtils.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/TestUtils.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/fs/src/test/org/jnode/test/support/TestUtils.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -57,7 +57,7 @@
* @return
* @throws IOException
*/
- static public File makeTempFile(String filename, String size)
+ public static File makeTempFile(String filename, String size)
throws IOException {
File tempFile = File.createTempFile(filename, "");
tempFile.deleteOnExit();
@@ -65,7 +65,7 @@
return makeFile(tempFile.getAbsolutePath(), NumberUtils.getSize(size));
}
- static public File makeFile(String filename, long size) throws IOException {
+ public static File makeFile(String filename, long size) throws IOException {
byte[] buf = new byte[1024];
File file = new File(filename);
FileOutputStream output = new FileOutputStream(file);
@@ -85,7 +85,7 @@
return file;
}
- static public void listEntries(Iterator<? extends FSEntry> iterator) throws Exception {
+ public static void listEntries(Iterator<? extends FSEntry> iterator) throws Exception {
log.debug("<<< BEGIN listEntries >>>");
int i = 0;
log.debug("------- entries ------");
@@ -98,7 +98,7 @@
log.debug("<<< END listEntries >>>");
}
- static public List<String> getEntryNames(Iterator<? extends FSEntry> it) {
+ public static List<String> getEntryNames(Iterator<? extends FSEntry> it) {
List<String> names = new ArrayList<String>();
while (it.hasNext()) {
FSEntry entry = it.next();
@@ -107,7 +107,7 @@
return names;
}
- static public String toString(String filename, int offset, int length)
+ public static String toString(String filename, int offset, int length)
throws IOException {
// byte[] buf = new byte[1024];
File file = new File(filename);
@@ -119,7 +119,7 @@
return dump;
}
- static public String toString(String[] array) {
+ public static String toString(String[] array) {
StringBuffer sb = new StringBuffer("[");
if (array != null) {
@@ -136,7 +136,7 @@
return sb.toString();
}
- static public String toString(List<String> list) {
+ public static String toString(List<String> list) {
StringBuffer sb = new StringBuffer("[");
for (int i = 0; i < list.size(); i++) {
@@ -151,13 +151,13 @@
return sb.toString();
}
- static public File copyFile(String srcFile, String destFile)
+ public static File copyFile(String srcFile, String destFile)
throws SecurityException, IOException {
return copyInputStreamToFile(new FileInputStream(new File(srcFile)),
destFile);
}
- static public File copyInputStreamToFile(InputStream src, String destFile)
+ public static File copyInputStreamToFile(InputStream src, String destFile)
throws SecurityException, IOException {
File dest = new File(destFile);
@@ -190,7 +190,7 @@
return dest;
}
- static public File copyDeviceToFile(Device imageDevice, String destFile)
+ public static File copyDeviceToFile(Device imageDevice, String destFile)
throws SecurityException, IOException, ApiNotFoundException {
File dest = new File(destFile);
BlockDeviceAPI imgApi = imageDevice
@@ -303,10 +303,10 @@
* null) fs.close(); } return imageFile; }
*/
/*
- * static public void deleteFile(TestConfig config, FileDevice device) { new
+ * public static void deleteFile(TestConfig config, FileDevice device) { new
* File(device.getFileName()).delete(); }
*/
- static public String[] append(String[] a1, String[] a2) {
+ public static String[] append(String[] a1, String[] a2) {
if (a1 == null)
return a2;
if (a2 == null)
@@ -319,7 +319,7 @@
return a;
}
- static public byte[] getTestData(int lengthInWords) {
+ public static byte[] getTestData(int lengthInWords) {
byte[] data = new byte[lengthInWords * 2];
int index = 0;
for (int i = 0; i < lengthInWords; i++) {
@@ -333,7 +333,7 @@
return data;
}
- static public boolean equals(byte[] origData, byte[] data) {
+ public static boolean equals(byte[] origData, byte[] data) {
// return Arrays.equals(origData, data);
if (origData == data)
return true;
@@ -360,7 +360,7 @@
return true;
}
- static public RamDiskDevice createRamDisk(int size) {
+ public static RamDiskDevice createRamDisk(int size) {
RamDiskDevice dev = null;
try {
final DeviceManager dm = InitialNaming
@@ -393,7 +393,7 @@
* @return
* @throws Exception
*/
- static public Object newInstance(String className, Class<?> cls)
+ public static Object newInstance(String className, Class<?> cls)
throws Exception {
Class<?> clazz = Class.forName(className);
Object instance = clazz.newInstance();
@@ -404,5 +404,5 @@
return instance;
}
- static private final Logger log = Logger.getLogger(TestUtils.class);
+ private static final Logger log = Logger.getLogger(TestUtils.class);
}
Modified: trunk/gui/src/awt/org/jnode/awt/JNodeRobotPeer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/JNodeRobotPeer.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/JNodeRobotPeer.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -174,7 +174,7 @@
* @param keycode
* @param pressed true=key pressed, false=key released
*/
- final private void sendKeyboardEvent(int keycode, boolean pressed) {
+ private void sendKeyboardEvent(int keycode, boolean pressed) {
final KeyboardHandler kbHandler = getToolkitImpl().getKeyboardHandler();
final KeyboardAPI api = kbHandler.getKeyboardAPI();
final KeyboardInterpreter kbInt = api.getKbInterpreter();
Modified: trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/JNodeToolkit.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -985,19 +985,19 @@
return new ImageProducer() {
Set<ImageConsumer> consumers = new HashSet<ImageConsumer>();
- synchronized public void addConsumer(ImageConsumer ic) {
+ public synchronized void addConsumer(ImageConsumer ic) {
consumers.add(ic);
}
- synchronized public boolean isConsumer(ImageConsumer ic) {
+ public synchronized boolean isConsumer(ImageConsumer ic) {
return consumers.contains(ic);
}
- synchronized public void removeConsumer(ImageConsumer ic) {
+ public synchronized void removeConsumer(ImageConsumer ic) {
consumers.remove(ic);
}
- synchronized public void startProduction(ImageConsumer ic) {
+ public synchronized void startProduction(ImageConsumer ic) {
consumers.add(ic);
for (ImageConsumer c : consumers) {
c.imageComplete(ImageConsumer.IMAGEERROR);
Modified: trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFTextRenderer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFTextRenderer.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/font/bdf/BDFTextRenderer.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -64,7 +64,7 @@
* @param color string color
* @see java.awt.Graphics
*/
- final public void render(Surface surface, Shape clip, AffineTransform tx,
+ public final void render(Surface surface, Shape clip, AffineTransform tx,
CharSequence str, int x, int y, Color color) {
if (str == null || str.length() == 0)
return;
Modified: trunk/gui/src/awt/org/jnode/awt/font/renderer/RenderCache.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/renderer/RenderCache.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/font/renderer/RenderCache.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -28,7 +28,7 @@
/**
* @author Ewout Prangsma (ep...@us...)
*/
-final public class RenderCache {
+public final class RenderCache {
/**
* The current rendering context
Modified: trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractFontProvider.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -39,7 +39,7 @@
* @author epr
* @author Fabien DUMINY (fd...@jn...)
*/
-abstract public class AbstractFontProvider implements FontProvider {
+public abstract class AbstractFontProvider implements FontProvider {
/**
* My logger
@@ -83,7 +83,7 @@
* Give the name of the font (used for setting the first provider to use
* among all available ones)
*/
- final public String getName() {
+ public final String getName() {
return name;
}
@@ -94,7 +94,7 @@
* @param font
* @return True if this provider provides the given font, false otherwise
*/
- final public boolean provides(Font font) {
+ public final boolean provides(Font font) {
if (font == null) return false; // don't provide default (null) fonts
if (!fontsLoaded) {
@@ -117,7 +117,7 @@
*
* @return The set containing all fonts provides by this provider.
*/
- final public Set<Font> getAllFonts() {
+ public final Set<Font> getAllFonts() {
if (!fontsLoaded) {
loadFonts();
}
@@ -130,7 +130,7 @@
* @param font
* @return The renderer
*/
- final public TextRenderer getTextRenderer(Font font) {
+ public final TextRenderer getTextRenderer(Font font) {
TextRenderer r = (TextRenderer) renderers.get(font);
if (r == null) {
r = createTextRenderer(renderCache, font);
@@ -139,7 +139,7 @@
return r;
}
- abstract protected TextRenderer createTextRenderer(RenderCache renderCache, Font font);
+ protected abstract TextRenderer createTextRenderer(RenderCache renderCache, Font font);
/**
* Gets the font metrics for the given font.
@@ -147,7 +147,7 @@
* @param font
* @return The metrics
*/
- final public FontMetrics getFontMetrics(Font font) {
+ public final FontMetrics getFontMetrics(Font font) {
FontMetrics fm = (FontMetrics) metrics.get(font);
/*
if(log.isDebugEnabled()) log.debug("FontMetrics got from cache: "+fm+" font="+font);
@@ -166,13 +166,13 @@
return fm;
}
- abstract protected FontMetrics createFontMetrics(Font font) throws IOException;
+ protected abstract FontMetrics createFontMetrics(Font font) throws IOException;
- abstract protected String[] getSystemFonts();
+ protected abstract String[] getSystemFonts();
- abstract protected Font loadFont(URL url) throws IOException;
+ protected abstract Font loadFont(URL url) throws IOException;
- final protected Font getCompatibleFont(Font font) {
+ protected final Font getCompatibleFont(Font font) {
Font f = null;
try {
f = fontsByName.get(font.getFamily());
Modified: trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractTextRenderer.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractTextRenderer.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/font/spi/AbstractTextRenderer.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -40,7 +40,7 @@
* @author epr
* @author Fabien DUMINY (fd...@jn...)
*/
-abstract public class AbstractTextRenderer implements TextRenderer {
+public abstract class AbstractTextRenderer implements TextRenderer {
/**
* My logger
@@ -76,7 +76,7 @@
*
* @return
*/
- final protected WritableRaster createAlphaRaster() {
+ protected final WritableRaster createAlphaRaster() {
final RenderContext ctx = renderCache.getContext();
WritableRaster r = (WritableRaster) ctx.getObject(ALPHA_RASTER);
final int fontSizeUp = (int) (fontMetrics.getFont().getSize() + 0.5);
Modified: trunk/gui/src/awt/org/jnode/awt/font/spi/Glyph.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/font/spi/Glyph.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/font/spi/Glyph.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -46,7 +46,7 @@
this.yMax = yMax;
}
- final public Rectangle getBBox() {
+ public final Rectangle getBBox() {
return new Rectangle(xMin, yMin, xMax - xMin, yMax - yMin);
}
Modified: trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/swingpeers/SwingToolkit.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -117,7 +117,7 @@
* @param awtComponent
* @param peer
*/
- final static void copyAwtProperties(Component awtComponent, Component peer) {
+ static void copyAwtProperties(Component awtComponent, Component peer) {
Color c;
Font f;
if ((c = awtComponent.getForeground()) != null) {
Modified: trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/util/AbstractBitmapGraphics.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -55,7 +55,7 @@
this.height = height;
}
- abstract protected int getOffset(int x, int y);
+ protected abstract int getOffset(int x, int y);
/**
@@ -256,7 +256,7 @@
}
}
- abstract protected int getBytesForWidth(int width);
+ protected abstract int getBytesForWidth(int width);
protected abstract void doDrawAlphaRaster(Raster raster, int srcX,
int srcY, int dstX, int dstY, int width, int height, int color);
Modified: trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics.java
===================================================================
--- trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/awt/org/jnode/awt/util/BitmapGraphics.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -41,9 +41,9 @@
*/
public abstract class BitmapGraphics {
- abstract public int getWidth();
+ public abstract int getWidth();
- abstract public int getHeight();
+ public abstract int getHeight();
/**
* @see org.jnode.driver.video.Surface#copyArea(int, int, int, int, int,
Modified: trunk/gui/src/desktop/org/jnode/desktop/ApplicationBar.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/ApplicationBar.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/desktop/org/jnode/desktop/ApplicationBar.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -42,11 +42,11 @@
*/
public class ApplicationBar extends JPanel {
- final static Logger log = Logger.getLogger(ApplicationBar.class);
+ static final Logger log = Logger.getLogger(ApplicationBar.class);
private final ExtensionPoint ep;
- private final static Class[] mainTypes = {String[].class};
+ private static final Class[] mainTypes = {String[].class};
public ApplicationBar(ExtensionPoint ep) {
this.ep = ep;
Modified: trunk/gui/src/desktop/org/jnode/desktop/Desktop.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/Desktop.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/desktop/org/jnode/desktop/Desktop.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -47,7 +47,7 @@
*/
public class Desktop implements Runnable {
- final static Logger log = Logger.getLogger(Desktop.class);
+ static final Logger log = Logger.getLogger(Desktop.class);
ControlBar controlBar;
Modified: trunk/gui/src/desktop/org/jnode/desktop/WindowBar.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/WindowBar.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/desktop/org/jnode/desktop/WindowBar.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -40,7 +40,7 @@
*/
public class WindowBar extends JPanel {
- private final static Logger log = Logger.getLogger(WindowBar.class);
+ private static final Logger log = Logger.getLogger(WindowBar.class);
private final JList list;
private final DefaultListModel model;
Modified: trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/desktop/org/jnode/desktop/classic/Desktop.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -62,7 +62,7 @@
*/
public class Desktop implements Runnable {
- final static Logger log = Logger.getLogger(Desktop.class);
+ static final Logger log = Logger.getLogger(Desktop.class);
TaskBar taskBar;
JPopupMenu desktopMenu;
Modified: trunk/gui/src/desktop/org/jnode/desktop/classic/TaskBar.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/classic/TaskBar.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/desktop/org/jnode/desktop/classic/TaskBar.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -59,8 +59,8 @@
* @author Levente S\u00e1ntha
*/
public class TaskBar extends JPanel {
- final static Logger log = Logger.getLogger(TaskBar.class);
- private final static Class[] mainTypes = {String[].class};
+ static final Logger log = Logger.getLogger(TaskBar.class);
+ private static final Class[] mainTypes = {String[].class};
JButton startButton;
JPopupMenu startMenu;
WindowBar windowBar;
Modified: trunk/gui/src/desktop/org/jnode/desktop/classic/WindowBar.java
===================================================================
--- trunk/gui/src/desktop/org/jnode/desktop/classic/WindowBar.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/desktop/org/jnode/desktop/classic/WindowBar.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -50,7 +50,7 @@
* @author Levente S\u00e1ntha
*/
public class WindowBar extends JPanel {
- private final static Logger log = Logger.getLogger(WindowBar.class);
+ private static final Logger log = Logger.getLogger(WindowBar.class);
private final Map<JInternalFrame, FrameWrapper> wrappers;
public WindowBar() {
Modified: trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -88,7 +88,7 @@
}
}
- static abstract class PrettyFrame extends Frame {
+ abstract static class PrettyFrame extends Frame {
public PrettyFrame() {
((BorderLayout) getLayout()).setHgap(5);
((BorderLayout) getLayout()).setVgap(5);
@@ -101,7 +101,7 @@
}
}
- static abstract class SubFrame extends PrettyFrame implements SubWindow {
+ abstract static class SubFrame extends PrettyFrame implements SubWindow {
boolean initted = false;
public void setVisible(boolean visible) {
Modified: trunk/gui/src/test/org/jnode/test/gui/Emu.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/Emu.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/test/org/jnode/test/gui/Emu.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -139,7 +139,7 @@
/**
* Start this manager
*/
- final public void start() {
+ public final void start() {
// Thread thread = new Thread()
// {
// public void run()
Modified: trunk/gui/src/test/org/jnode/test/gui/ImageTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/ImageTest.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/test/org/jnode/test/gui/ImageTest.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -35,7 +35,7 @@
*/
public class ImageTest {
- final static String IMAGE_PATH = "/org/zaval/lw/rs/img/tree.gif";
+ static final String IMAGE_PATH = "/org/zaval/lw/rs/img/tree.gif";
static class TestComponent extends Component implements ImageObserver {
Modified: trunk/gui/src/test/org/jnode/test/gui/Tetris.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/Tetris.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/gui/src/test/org/jnode/test/gui/Tetris.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -98,7 +98,7 @@
private static final int HEIGHT_C = 20;
- private final static Color[] COLORS = {Color.BLACK, Color.YELLOW,
+ private static final Color[] COLORS = {Color.BLACK, Color.YELLOW,
Color.RED, Color.CYAN, Color.BLUE, Color.MAGENTA, Color.ORANGE,
Color.LIGHT_GRAY, Color.DARK_GRAY};
Modified: trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java
===================================================================
--- trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java 2008-06-03 14:02:38 UTC (rev 4186)
+++ trunk/shell/src/test/org/jnode/test/shell/DeviceManager.java 2008-06-04 08:26:35 UTC (rev 4187)
@@ -62,7 +62,7 @@
/**
* Start this manager
*/
- final public void start() {
+ public final void start() {
// Thread thread = new Thread()
// {
// public void run()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
