[Jnode-svn-commits] SF.net SVN: jnode: [4195] trunk/core/src

[<ls...@us...>]

Revision: 4195
          http://jnode.svn.sourceforge.net/jnode/?rev=4195&view=rev
Author:   lsantha
Date:     2008-06-04 12:38:45 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Code style fixes.

Modified Paths:
--------------
    trunk/core/src/core/org/jnode/imageio/jpeg/JPEGDecoder.java
    trunk/core/src/core/org/jnode/system/event/SystemEvent.java
    trunk/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java
    trunk/core/src/core/org/jnode/util/BinaryScaleFactor.java
    trunk/core/src/core/org/jnode/util/ByteQueue.java
    trunk/core/src/core/org/jnode/util/Counter.java
    trunk/core/src/core/org/jnode/util/DecimalScaleFactor.java
    trunk/core/src/core/org/jnode/util/SizeUnit.java
    trunk/core/src/core/org/jnode/util/SystemInputStream.java
    trunk/core/src/core/org/jnode/vm/MemoryBlockManager.java
    trunk/core/src/core/org/jnode/vm/MemoryResourceImpl.java
    trunk/core/src/core/org/jnode/vm/VmAbstractClassLoader.java
    trunk/core/src/core/org/jnode/vm/VmMagic.java
    trunk/core/src/core/org/jnode/vm/VmSystem.java
    trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java
    trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java
    trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java
    trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariable.java
    trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariableTable.java
    trunk/core/src/core/org/jnode/vm/classmgr/VmType.java
    trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
    trunk/core/src/core/org/jnode/vm/memmgr/def/DefHeapStatistics.java
    trunk/core/src/core/org/jnode/vm/scheduler/MonitorManager.java
    trunk/core/src/core/org/jnode/vm/scheduler/VmThread.java
    trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueue.java
    trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture32.java
    trunk/core/src/core/org/jnode/vm/x86/X86IRQManager.java
    trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerFPU.java
    trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerFPU.java
    trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java
    trunk/core/src/driver/org/jnode/driver/bus/pci/PCIRomAddress.java
    trunk/core/src/driver/org/jnode/driver/bus/smbus/DIMM.java
    trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java
    trunk/core/src/driver/org/jnode/driver/console/textscreen/Line.java
    trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java
    trunk/core/src/driver/org/jnode/driver/input/AbstractKeyboardDriver.java
    trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java
    trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java
    trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java
    trunk/core/src/test/org/jnode/test/AllTests.java
    trunk/core/src/test/org/jnode/test/IfNullTest.java
    trunk/core/src/test/org/jnode/test/InlineTestClass.java
    trunk/core/src/test/org/jnode/test/X86StreamTest.java
    trunk/core/src/test/org/jnode/test/framework/TestManager.java
    trunk/core/src/test/org/jnode/test/security/TestSecurityManager.java
    trunk/core/src/test/org/jnode/test/threads/ThreadingUtils.java

Modified: trunk/core/src/core/org/jnode/imageio/jpeg/JPEGDecoder.java
===================================================================
--- trunk/core/src/core/org/jnode/imageio/jpeg/JPEGDecoder.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/imageio/jpeg/JPEGDecoder.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -48,7 +48,7 @@
     private int x = 0, y = 0, num = 0, yp = 0; // the begin point of MCU
 
     private int IDCT_Source[] = new int[64];
-    private final static int IDCT_P[] = {
+    private static final int IDCT_P[] = {
         0, 5, 40, 16, 45, 2, 7, 42,
         21, 56, 8, 61, 18, 47, 1, 4,
         41, 23, 58, 13, 32, 24, 37, 10,
@@ -58,7 +58,7 @@
         50, 55, 25, 36, 11, 62, 14, 35,
         28, 49, 52, 27, 38, 30, 51, 54
     };
-    private final static int table[] = {
+    private static final int table[] = {
         0, 1, 5, 6, 14, 15, 27, 28,
         2, 4, 7, 13, 16, 26, 29, 42,
         3, 8, 12, 17, 25, 30, 41, 43,

Modified: trunk/core/src/core/org/jnode/system/event/SystemEvent.java
===================================================================
--- trunk/core/src/core/org/jnode/system/event/SystemEvent.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/system/event/SystemEvent.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -60,21 +60,21 @@
     /**
      * @return int
      */
-    final public int getId() {
+    public final int getId() {
         return id;
     }
 
     /**
      * @return long
      */
-    final public long getTime() {
+    public final long getTime() {
         return time;
     }
 
     /**
      * Mark this event as being consumed.
      */
-    final public void consume() {
+    public final void consume() {
         consumed = true;
     }
 
@@ -83,7 +83,7 @@
      *
      * @return boolean
      */
-    final public boolean isConsumed() {
+    public final boolean isConsumed() {
         return consumed;
     }
 }

Modified: trunk/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java
===================================================================
--- trunk/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/system/repository/plugins/PluginLoaderPlugin.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -44,7 +44,7 @@
     /**
      * Empty array of providers
      */
-    final static SystemRepositoryProvider[] EMPTY_ARR = new SystemRepositoryProvider[0];
+    static final SystemRepositoryProvider[] EMPTY_ARR = new SystemRepositoryProvider[0];
 
     private PluginRegistry registry;
 

Modified: trunk/core/src/core/org/jnode/util/BinaryScaleFactor.java
===================================================================
--- trunk/core/src/core/org/jnode/util/BinaryScaleFactor.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/util/BinaryScaleFactor.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -22,8 +22,8 @@
     public static final BinaryScaleFactor MIN = B;
     public static final BinaryScaleFactor MAX = E;
 
-    final private long multiplier;
-    final private String unit;
+    private final long multiplier;
+    private final String unit;
 
     private BinaryScaleFactor(long multiplier, String unit) {
         this.multiplier = multiplier;

Modified: trunk/core/src/core/org/jnode/util/ByteQueue.java
===================================================================
--- trunk/core/src/core/org/jnode/util/ByteQueue.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/util/ByteQueue.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -30,7 +30,7 @@
  */
 public class ByteQueue {
 
-    final static int Q_SIZE = 10;
+    static final int Q_SIZE = 10;
 
     private final byte[] data;
     private final int size;

Modified: trunk/core/src/core/org/jnode/util/Counter.java
===================================================================
--- trunk/core/src/core/org/jnode/util/Counter.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/util/Counter.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -26,7 +26,7 @@
  */
 public final class Counter extends Statistic implements Comparable<Counter> {
 
-    private final static String is = "=";
+    private static final String is = "=";
 
     private int counter = 0;
 

Modified: trunk/core/src/core/org/jnode/util/DecimalScaleFactor.java
===================================================================
--- trunk/core/src/core/org/jnode/util/DecimalScaleFactor.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/util/DecimalScaleFactor.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -22,8 +22,8 @@
     public static final DecimalScaleFactor MIN = B;
     public static final DecimalScaleFactor MAX = E;
 
-    final private long multiplier;
-    final private String unit;
+    private final long multiplier;
+    private final String unit;
 
     private DecimalScaleFactor(long multiplier, String unit) {
         this.multiplier = multiplier;

Modified: trunk/core/src/core/org/jnode/util/SizeUnit.java
===================================================================
--- trunk/core/src/core/org/jnode/util/SizeUnit.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/util/SizeUnit.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -22,8 +22,8 @@
     public static final SizeUnit MIN = B;
     public static final SizeUnit MAX = E;
 
-    final private long multiplier;
-    final private String unit;
+    private final long multiplier;
+    private final String unit;
 
     private SizeUnit(long multiplier, String unit) {
         this.multiplier = multiplier;

Modified: trunk/core/src/core/org/jnode/util/SystemInputStream.java
===================================================================
--- trunk/core/src/core/org/jnode/util/SystemInputStream.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/util/SystemInputStream.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -24,10 +24,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-final public class SystemInputStream extends InputStream {
-    final private static InputStream EMPTY = new EmptyInputStream();
+public final class SystemInputStream extends InputStream {
+    private static final InputStream EMPTY = new EmptyInputStream();
 
-    final private class ThreadLocalInputStream extends InheritableThreadLocal {
+    private final class ThreadLocalInputStream extends InheritableThreadLocal {
         public Object get() {
             Object o = super.get();
             if (o == EMPTY) {
@@ -48,13 +48,13 @@
 
     private ThreadLocalInputStream systemInOwnerLocal;
 
-    final private ThreadLocalInputStream localeIn = new ThreadLocalInputStream();
+    private final ThreadLocalInputStream localeIn = new ThreadLocalInputStream();
 
-    final public InputStream getIn() {
+    public final InputStream getIn() {
         return getLocalIn();
     }
 
-    final public void setIn(InputStream in) {
+    public final void setIn(InputStream in) {
         if (in != this) {
             localeIn.set(in);
         }
@@ -63,11 +63,11 @@
     /**
      * TODO must be protected by the SecurityManager
      */
-    final public void claimSystemIn() {
+    public final void claimSystemIn() {
         setIn(systemIn);
     }
 
-    final public void releaseSystemIn() {
+    public final void releaseSystemIn() {
         this.systemIn = EMPTY;
     }
 
@@ -109,7 +109,7 @@
      *
      * @param readlimit The parameter passed to <code>in.mark(int)</code>
      */
-    final public void mark(int readlimit) {
+    public final void mark(int readlimit) {
         getLocalIn().mark(readlimit);
     }
 
@@ -119,7 +119,7 @@
      * @return <code>true</code> if mark/reset is supported, <code>false</code>
      *         otherwise
      */
-    final public boolean markSupported() {
+    public final boolean markSupported() {
         return getLocalIn().markSupported();
     }
 
@@ -128,7 +128,7 @@
      *
      * @throws IOException If an error occurs
      */
-    final public void reset() throws IOException {
+    public final void reset() throws IOException {
         getLocalIn().reset();
     }
 
@@ -138,7 +138,7 @@
      * @return The value returned from <code>in.available()</code>
      * @throws IOException If an error occurs
      */
-    final public int available() throws IOException {
+    public final int available() throws IOException {
         return getLocalIn().available();
     }
 
@@ -149,7 +149,7 @@
      * @return The value returned from <code>in.skip(long)</code>
      * @throws IOException If an error occurs
      */
-    final public long skip(long numBytes) throws IOException {
+    public final long skip(long numBytes) throws IOException {
         return getLocalIn().skip(numBytes);
     }
 
@@ -159,7 +159,7 @@
      * @return The value returned from <code>in.read()</code>
      * @throws IOException If an error occurs
      */
-    final public int read() throws IOException {
+    public final int read() throws IOException {
         return getLocalIn().read();
     }
 
@@ -174,7 +174,7 @@
      * @return The value retured from <code>in.read(byte[], int, int)</code>
      * @throws IOException If an error occurs
      */
-    final public int read(byte[] buf) throws IOException {
+    public final int read(byte[] buf) throws IOException {
         return read(buf, 0, buf.length);
     }
 
@@ -187,7 +187,7 @@
      * @return The value retured from <code>in.read(byte[], int, int)</code>
      * @throws IOException If an error occurs
      */
-    final public int read(byte[] buf, int offset, int len) throws IOException {
+    public final int read(byte[] buf, int offset, int len) throws IOException {
         return getLocalIn().read(buf, offset, len);
     }
 
@@ -198,11 +198,11 @@
      *
      * @throws IOException If an error occurs
      */
-    final public void close() throws IOException {
+    public final void close() throws IOException {
         getLocalIn().close();
     }
 
-    final private InputStream getLocalIn() {
+    private InputStream getLocalIn() {
         return (InputStream) localeIn.get();
     }
 }

Modified: trunk/core/src/core/org/jnode/vm/MemoryBlockManager.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/MemoryBlockManager.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/MemoryBlockManager.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -91,7 +91,7 @@
     private static Word nextBlockNr;
 
     /* Predictive Compilation */
-    private final static boolean DBG = false;
+    private static final boolean DBG = false;
 
     /**
      * Allocate a new block of memory at blockSize large. The actual size is
@@ -245,7 +245,7 @@
     /**
      * Initialize this manager.
      */
-    private final static void initialize() {
+    private static void initialize() {
         Unsafe.debug("Initialize MemoryBlockManager\n");
 
         startPtr = blockAlign(Unsafe.getMemoryStart().toWord(), true).toAddress();

Modified: trunk/core/src/core/org/jnode/vm/MemoryResourceImpl.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/MemoryResourceImpl.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/MemoryResourceImpl.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -730,7 +730,7 @@
      *
      * @param child
      */
-    private synchronized final void removeChild(MemoryResourceImpl child) {
+    private synchronized void removeChild(MemoryResourceImpl child) {
         this.children = (MemoryResourceImpl) remove(this.children, child);
     }
 

Modified: trunk/core/src/core/org/jnode/vm/VmAbstractClassLoader.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmAbstractClassLoader.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/VmAbstractClassLoader.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -78,7 +78,7 @@
      * @param createdType
      * @return VmClass
      */
-    public synchronized final VmType<?> defineClass(VmType<?> createdType) {
+    public final synchronized VmType<?> defineClass(VmType<?> createdType) {
         if (createdType.getLoader() != this) {
             throw new SecurityException("Created type not for this loader");
         }

Modified: trunk/core/src/core/org/jnode/vm/VmMagic.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmMagic.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/VmMagic.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -174,7 +174,7 @@
      * @return the processor executing the current thread
      */
     @KernelSpace
-    public final static VmProcessor currentProcessor() {
+    public static VmProcessor currentProcessor() {
         return null;
     }
 
@@ -184,7 +184,7 @@
      * @param index
      * @return the address of a shared static field
      */
-    public final static Address getSharedStaticFieldAddress(int index) {
+    public static Address getSharedStaticFieldAddress(int index) {
         return null;
     }
 
@@ -194,7 +194,7 @@
      * @param index
      * @return the address of a isolated static field
      */
-    public final static Address getIsolatedStaticFieldAddress(int index) {
+    public static Address getIsolatedStaticFieldAddress(int index) {
         return null;
     }
 
@@ -203,7 +203,7 @@
      *
      * @return true when running JNode, false when running any other VM.
      */
-    public final static boolean isRunningJNode() {
+    public static boolean isRunningJNode() {
         return false;
     }
 

Modified: trunk/core/src/core/org/jnode/vm/VmSystem.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmSystem.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/VmSystem.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -205,7 +205,7 @@
         });
     }
 
-    final static boolean isInitialized() {
+    static boolean isInitialized() {
         return inited;
     }
 
@@ -952,7 +952,7 @@
      * @return the speed of the current processor in "JNodeMips"
      */
     @Uninterruptible
-    public final static float calculateJNodeMips() {
+    public static float calculateJNodeMips() {
         final long millis = currentTimeMillis % 1000;
         while (millis == (currentTimeMillis % 1000)) {
             // Wait

Modified: trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -65,7 +65,7 @@
 
     private transient URL classesURL;
 
-    static private transient boolean verbose = false;
+    private static transient boolean verbose = false;
 
     private transient boolean failOnNewLoad = false;
 

Modified: trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/classmgr/ClassDecoder.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -1238,7 +1238,7 @@
         return result;
     }
 
-    private transient static ThreadLocal utfConversionBuffer;
+    private static transient ThreadLocal utfConversionBuffer;
 
     private static final char[] getUtfConversionBuffer(int utfLength) {
         if (utfConversionBuffer == null) {

Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmAnnotation.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -37,7 +37,7 @@
     /**
      * An empty array of annotations
      */
-    final static VmAnnotation[] EMPTY_ARR = new VmAnnotation[0];
+    static final VmAnnotation[] EMPTY_ARR = new VmAnnotation[0];
 
     /**
      * The descriptor of the annotation type
@@ -222,9 +222,9 @@
      *
      * @author Ewout Prangsma (ep...@us...)
      */
-    final static class ElementValue extends VmSystemObject {
+    static final class ElementValue extends VmSystemObject {
 
-        final static ElementValue[] EMPTY_ARR = new ElementValue[0];
+        static final ElementValue[] EMPTY_ARR = new ElementValue[0];
 
         private final String name;
 
@@ -286,7 +286,7 @@
      *
      * @author Ewout Prangsma (ep...@us...)
      */
-    final static class EnumValue {
+    static final class EnumValue {
         private final String typeDescr;
 
         private final String constName;
@@ -345,7 +345,7 @@
      *
      * @author Ewout Prangsma (ep...@us...)
      */
-    final static class ClassInfo extends VmSystemObject {
+    static final class ClassInfo extends VmSystemObject {
         private final String classDescr;
 
         private transient Class value;

Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariable.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariable.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariable.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -34,7 +34,7 @@
     /**
      * Sharable empty array.
      */
-    final static VmLocalVariable[] EMPTY = new VmLocalVariable[0];
+    static final VmLocalVariable[] EMPTY = new VmLocalVariable[0];
 
     /**
      * Start of the value value range.

Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariableTable.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariableTable.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmLocalVariableTable.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -31,7 +31,7 @@
     /**
      * Empty table
      */
-    final static VmLocalVariableTable EMPTY = new VmLocalVariableTable(VmLocalVariable.EMPTY);
+    static final VmLocalVariableTable EMPTY = new VmLocalVariableTable(VmLocalVariable.EMPTY);
 
     /**
      * Local variables

Modified: trunk/core/src/core/org/jnode/vm/classmgr/VmType.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/classmgr/VmType.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/classmgr/VmType.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -339,7 +339,7 @@
      * @throws ClassNotFoundException
      */
     @SuppressWarnings("unchecked")
-    public final static VmType[] initializeForBootImage(VmSystemClassLoader clc)
+    public static VmType[] initializeForBootImage(VmSystemClassLoader clc)
         throws ClassNotFoundException {
         ObjectClass = (VmNormalClass) clc.loadClass("java.lang.Object", false);
         CloneableClass = (VmInterfaceClass) clc.loadClass(
@@ -568,7 +568,7 @@
      *
      * @return The class
      */
-    public final static VmNormalClass<Object> getObjectClass() {
+    public static VmNormalClass<Object> getObjectClass() {
         if (ObjectClass == null) {
             Unsafe.die("ObjectClass == null");
         }
@@ -581,7 +581,7 @@
      * @param type
      * @return VmClass
      */
-    public final static VmNormalClass<?> getPrimitiveClass(char type) {
+    public static VmNormalClass<?> getPrimitiveClass(char type) {
         switch (type) {
             case 'Z':
                 return BooleanClass;
@@ -612,7 +612,7 @@
      * @param type
      * @return VmClass
      */
-    public final static VmType getPrimitiveArrayClass(char type) {
+    public static VmType getPrimitiveArrayClass(char type) {
         switch (type) {
             case 'Z':
                 return BooleanArrayClass;
@@ -642,7 +642,7 @@
      * @param type
      * @return VmClass
      */
-    public final static VmArrayClass getPrimitiveArrayClass(int type) {
+    public static VmArrayClass getPrimitiveArrayClass(int type) {
         switch (type) {
             case 4:
                 return BooleanArrayClass;
@@ -2194,7 +2194,7 @@
     /**
      * Invoke the static initializer of this class.
      */
-    private synchronized final void doInitialize() {
+    private synchronized void doInitialize() {
         if (!isInitialized()) {
             if (!isInitializing()) {
                 final boolean sharedStatics = isSharedStatics();

Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -383,7 +383,7 @@
     /**
      * Gets the links passed to the start of the current isolate.
      */
-    public final static Link[] getLinks() {
+    public static Link[] getLinks() {
         final VmDataLink[] vmLinks = currentIsolate().dataLinks;
 
         if ((vmLinks == null) || (vmLinks.length == 0)) {

Modified: trunk/core/src/core/org/jnode/vm/memmgr/def/DefHeapStatistics.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/memmgr/def/DefHeapStatistics.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/memmgr/def/DefHeapStatistics.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -98,7 +98,7 @@
         private int instanceCount;
         private int objectSize = 0;
 
-        private final static String usage = " memory usage=";
+        private static final String usage = " memory usage=";
 
         public HeapCounter(String objectName, int objectSize) {
             this.name = objectName;

Modified: trunk/core/src/core/org/jnode/vm/scheduler/MonitorManager.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/scheduler/MonitorManager.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/scheduler/MonitorManager.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -252,7 +252,7 @@
      *
      * @param k
      */
-    final static void setupInflatedLock(Object k) {
+    static void setupInflatedLock(Object k) {
         installInflatedLock(k);
     }
 
@@ -383,7 +383,7 @@
      *
      * @param tid
      */
-    final static void testThreadId(int tid) {
+    static void testThreadId(int tid) {
         if ((tid & ~ObjectFlags.THREAD_ID_MASK) != 0) {
             throw new InternalError("Invalid thread id " + tid);
         }

Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmThread.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/scheduler/VmThread.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/scheduler/VmThread.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -218,29 +218,29 @@
      *    &lt;/blockquote&gt;
      * </pre>
      */
-    final static int CREATED = 0;
+    static final int CREATED = 0;
 
-    final static int ASLEEP = 3;
+    static final int ASLEEP = 3;
 
-    final static int DESTROYED = 5;
+    static final int DESTROYED = 5;
 
-    final static int RUNNING = 1;
+    static final int RUNNING = 1;
 
-    final static int STOPPED = 4;
+    static final int STOPPED = 4;
 
-    final static int SUSPENDED = 2;
+    static final int SUSPENDED = 2;
 
-    final static int WAITING_ENTER = 6;
+    static final int WAITING_ENTER = 6;
 
-    final static int WAITING_NOTIFY = 7;
+    static final int WAITING_NOTIFY = 7;
 
-    final static int WAITING_NOTIFY_TIMEOUT = 8;
+    static final int WAITING_NOTIFY_TIMEOUT = 8;
 
-    final static int YIELDING = 9;
+    static final int YIELDING = 9;
 
-    final static int MAXSTATE = YIELDING;
+    static final int MAXSTATE = YIELDING;
 
-    final static String[] STATE_NAMES = {"CREATED", "RUNNING", "SUSPENDED",
+    static final String[] STATE_NAMES = {"CREATED", "RUNNING", "SUSPENDED",
         "ASLEEP", "STOPPED", "DESTROYED", "WAITING_ENTER",
         "WAITING_NOTIFY", "WAITING_NOTIFY_TIMEOUT", "YIELDING"};
 

Modified: trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueue.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueue.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/scheduler/VmThreadQueue.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -278,7 +278,7 @@
      *
      * @author Ewout Prangsma (ep...@us...)
      */
-    final static class AllThreadsQueue extends VmThreadQueue {
+    static final class AllThreadsQueue extends VmThreadQueue {
 
         /**
          * Initialize this instance.
@@ -302,7 +302,7 @@
      *
      * @author Ewout Prangsma (ep...@us...)
      */
-    final static class SleepQueue extends VmThreadQueue {
+    static final class SleepQueue extends VmThreadQueue {
 
         /**
          * Initialize this instance.
@@ -329,7 +329,7 @@
      *
      * @author Ewout Prangsma (ep...@us...)
      */
-    final static class ScheduleQueue extends VmThreadQueue {
+    static final class ScheduleQueue extends VmThreadQueue {
 
         /**
          * Initialize this instance.

Modified: trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture32.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture32.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/x86/VmX86Architecture32.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -113,7 +113,7 @@
     /**
      * Default page entry flags
      */
-    private final static int PF_DEFAULT = PF_PRESENT | PF_WRITE | PF_USER | PF_PSE;
+    private static final int PF_DEFAULT = PF_PRESENT | PF_WRITE | PF_USER | PF_PSE;
 
     /**
      * Initialize this instance.

Modified: trunk/core/src/core/org/jnode/vm/x86/X86IRQManager.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/X86IRQManager.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/x86/X86IRQManager.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -12,7 +12,7 @@
     /**
      * Number of IRQ vectors
      */
-    final static int IRQ_COUNT = 16;
+    static final int IRQ_COUNT = 16;
 
     /**
      * Programmable interrupt controller

Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerFPU.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerFPU.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1a/FPCompilerFPU.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -324,7 +324,7 @@
     /**
      * Make sure that the given operand is on the top on the FPU stack.
      */
-    private final static void prepareForOperation(X86Assembler os,
+    private static void prepareForOperation(X86Assembler os,
                                                   EmitterContext ec, VirtualStack vstack, FPUStack fpuStack,
                                                   Item left) {
         final boolean onFpu = left.isFPUStack();
@@ -359,7 +359,7 @@
      * @param left
      * @param right
      */
-    private final static FPU prepareForOperation(X86Assembler os,
+    private static FPU prepareForOperation(X86Assembler os,
                                                  EmitterContext ec, VirtualStack vstack, FPUStack fpuStack,
                                                  Item left, Item right, boolean commutative) {
         final boolean lOnFpu = left.isFPUStack();

Modified: trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerFPU.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerFPU.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/core/org/jnode/vm/x86/compiler/l1b/FPCompilerFPU.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -324,7 +324,7 @@
     /**
      * Make sure that the given operand is on the top on the FPU stack.
      */
-    private final static void prepareForOperation(X86Assembler os,
+    private static void prepareForOperation(X86Assembler os,
                                                   EmitterContext ec, VirtualStack vstack, FPUStack fpuStack,
                                                   Item left) {
         final boolean onFpu = left.isFPUStack();
@@ -359,7 +359,7 @@
      * @param left
      * @param right
      */
-    private final static FPU prepareForOperation(X86Assembler os,
+    private static FPU prepareForOperation(X86Assembler os,
                                                  EmitterContext ec, VirtualStack vstack, FPUStack fpuStack,
                                                  Item left, Item right, boolean commutative) {
         final boolean lOnFpu = left.isFPUStack();

Modified: trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -100,7 +100,7 @@
      *
      * @return All known devices.
      */
-    final public Collection<Device> getDevices() {
+    public final Collection<Device> getDevices() {
         return Collections.unmodifiableCollection(devices.values());
     }
 
@@ -129,7 +129,7 @@
      * @return The device with the given id
      * @throws DeviceNotFoundException No device with the given id was found.
      */
-    final public Device getDevice(String id) throws DeviceNotFoundException {
+    public final Device getDevice(String id) throws DeviceNotFoundException {
         final Device device = devices.get(id);
         if (device == null) {
             throw new DeviceNotFoundException(id);
@@ -155,7 +155,7 @@
      *
      * @throws DriverException
      */
-    final public void register(Device device)
+    public final void register(Device device)
         throws DeviceAlreadyRegisteredException, DriverException {
 
         boolean shouldStart;
@@ -194,7 +194,7 @@
      *
      * @throws DriverException
      */
-    private synchronized final boolean doRegister(Device device)
+    private synchronized boolean doRegister(Device device)
         throws DeviceAlreadyRegisteredException, DriverException {
         final String devID = device.getId();
         if (devices.containsKey(devID)) {
@@ -228,7 +228,7 @@
      * @param device
      * @throws DriverException
      */
-    final public void unregister(Device device) throws DriverException {
+    public final void unregister(Device device) throws DriverException {
         // First stop the device if it is running
         try {
             stop(device);
@@ -251,7 +251,7 @@
      * @throws DeviceNotFoundException The device has not been registered.
      * @throws DriverException
      */
-    final public void start(Device device) throws DeviceNotFoundException,
+    public final void start(Device device) throws DeviceNotFoundException,
         DriverException {
         // Make sure the device exists.
         getDevice(device.getId());
@@ -288,7 +288,7 @@
      * @throws DeviceNotFoundException The device has not been registered.
      * @throws DriverException
      */
-    final public void stop(Device device) throws DeviceNotFoundException,
+    public final void stop(Device device) throws DeviceNotFoundException,
         DriverException {
         // Make sure the device exists.
         getDevice(device.getId());
@@ -309,7 +309,7 @@
      * @throws DeviceAlreadyRegisteredException
      *
      */
-    final public synchronized void rename(Device device, String name,
+    public final synchronized void rename(Device device, String name,
                                           boolean autonumber) throws DeviceAlreadyRegisteredException {
         if (!device.getId().startsWith(name)) {
             String newId;
@@ -343,7 +343,7 @@
      *
      * @param listener
      */
-    final public void addListener(DeviceManagerListener listener) {
+    public final void addListener(DeviceManagerListener listener) {
         synchronized (listeners) {
             listeners.add(listener);
         }
@@ -354,7 +354,7 @@
      *
      * @param listener
      */
-    final public void removeListener(DeviceManagerListener listener) {
+    public final void removeListener(DeviceManagerListener listener) {
         synchronized (listeners) {
             listeners.remove(listener);
         }
@@ -365,7 +365,7 @@
      *
      * @param listener
      */
-    final public void addListener(DeviceListener listener) {
+    public final void addListener(DeviceListener listener) {
         synchronized (deviceListeners) {
             deviceListeners.add(listener);
         }
@@ -376,7 +376,7 @@
      *
      * @param listener
      */
-    final public void removeListener(DeviceListener listener) {
+    public final void removeListener(DeviceListener listener) {
         synchronized (deviceListeners) {
             deviceListeners.remove(listener);
         }
@@ -385,7 +385,7 @@
     /**
      * Stop all devices
      */
-    final public void stopDevices() {
+    public final void stopDevices() {
         while (!devices.isEmpty()) {
             final Device dev = (Device) devices.values().iterator().next();
             try {
@@ -404,7 +404,7 @@
      *
      * @return The system bus
      */
-    final public Bus getSystemBus() {
+    public final Bus getSystemBus() {
         return systemBus;
     }
 
@@ -438,7 +438,7 @@
     /**
      * Use all device finders to find all system devices.
      */
-    final protected void findDevices() throws InterruptedException {
+    protected final void findDevices() throws InterruptedException {
         waitUntilExtensionsLoaded();
         final ArrayList<DeviceFinder> finders;
         synchronized (this) {
@@ -465,7 +465,7 @@
      * @return The first suitable driver for the given device, or a NullDriver
      *         if no suitable driver has been found.
      */
-    final protected Driver findDriver(Device device) {
+    protected final Driver findDriver(Device device) {
         synchronized (mappers) {
             for (DeviceToDriverMapper mapper : mappers) {
                 final Driver drv = mapper.findDriver(device);
@@ -485,16 +485,16 @@
      *
      * @throws PluginException
      */
-    abstract public void start() throws PluginException;
+    public abstract void start() throws PluginException;
 
-    final protected synchronized void loadExtensions() {
+    protected final synchronized void loadExtensions() {
         refreshFinders(finders);
         refreshMappers(mappers);
         extensionsLoaded = true;
         notifyAll();
     }
 
-    final private synchronized void waitUntilExtensionsLoaded()
+    private synchronized void waitUntilExtensionsLoaded()
         throws IllegalMonitorStateException, InterruptedException {
         while (!extensionsLoaded) {
             wait();
@@ -506,7 +506,7 @@
      *
      * @throws PluginException
      */
-    final public void stop() throws PluginException {
+    public final void stop() throws PluginException {
         stopDevices();
         InitialNaming.unbind(NAME);
     }
@@ -558,7 +558,7 @@
      *
      * @param device
      */
-    final public void fireStartedEvent(Device device) {
+    public final void fireStartedEvent(Device device) {
         final List<DeviceListener> list;
         synchronized (this.deviceListeners) {
             list = new ArrayList<DeviceListener>(this.deviceListeners);
@@ -600,14 +600,14 @@
      *
      * @param finders
      */
-    abstract protected void refreshFinders(List<DeviceFinder> finders);
+    protected abstract void refreshFinders(List<DeviceFinder> finders);
 
     /**
      * Refresh the list of mappers, based on the mappers extension-point.
      *
      * @param mappers
      */
-    abstract protected void refreshMappers(List<DeviceToDriverMapper> mappers);
+    protected abstract void refreshMappers(List<DeviceToDriverMapper> mappers);
 
     /**
      * The root bus of every system.

Modified: trunk/core/src/driver/org/jnode/driver/bus/pci/PCIRomAddress.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/bus/pci/PCIRomAddress.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/bus/pci/PCIRomAddress.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -45,7 +45,7 @@
      */
     private final int size;
 
-    final static PCIRomAddress read(PCIDevice dev, int headerType, int offset) {
+    static PCIRomAddress read(PCIDevice dev, int headerType, int offset) {
         final int rawData = dev.readConfigDword(offset);
         // Determine the size
         dev.writeConfigDword(offset, ~PCI_ROM_ADDRESS_ENABLE);

Modified: trunk/core/src/driver/org/jnode/driver/bus/smbus/DIMM.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/bus/smbus/DIMM.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/bus/smbus/DIMM.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -42,7 +42,7 @@
 
 public class DIMM extends SMBusDevice {
 
-    final public static int SPDTABLE_SIZE = 128;
+    public static final int SPDTABLE_SIZE = 128;
 
     byte[] rawSPDTable = null;
 

Modified: trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -246,7 +246,7 @@
     /**
      * Handle an interrupt.
      */
-    protected synchronized final void handleInterrupt() {
+    protected final synchronized void handleInterrupt() {
         if (this.open) {
             final UHCIRequest req = this.activeRequest;
             if (req != null) {

Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/Line.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/Line.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/Line.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -43,7 +43,7 @@
  */
 class Line {
     //TODO get the real screen width (in columns)
-    final static private int SCREEN_WIDTH = 80;
+    private static final int SCREEN_WIDTH = 80;
 
     private int consoleX;
 

Modified: trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -30,14 +30,14 @@
 import org.jnode.util.QueueProcessor;
 import org.jnode.util.QueueProcessorThread;
 
-abstract public class AbstractInputDriver<E extends SystemEvent> extends Driver {
-    final private ArrayList<SystemListener> listeners = new ArrayList<SystemListener>();
+public abstract class AbstractInputDriver<E extends SystemEvent> extends Driver {
+    private final ArrayList<SystemListener> listeners = new ArrayList<SystemListener>();
 
     private QueueProcessorThread<E> eventQueueThread;
-    final private Queue<E> eventQueue = new Queue<E>();
+    private final Queue<E> eventQueue = new Queue<E>();
     private InputDaemon daemon;
 
-    final protected void startDispatcher(String id) {
+    protected final void startDispatcher(String id) {
         this.daemon = new InputDaemon(id + "-daemon");
         daemon.start();
 
@@ -46,7 +46,7 @@
         eventQueueThread.start();
     }
 
-    final protected void stopDispatcher() {
+    protected final void stopDispatcher() {
         if (eventQueueThread != null) {
             eventQueueThread.stopProcessor();
         }
@@ -75,14 +75,14 @@
         }
     }
 
-    abstract protected void sendEvent(SystemListener<E> l, E e);
+    protected abstract void sendEvent(SystemListener<E> l, E e);
 
     /**
      * Add a pointer listener
      *
      * @param l
      */
-    final public synchronized void addListener(SystemListener<E> l) {
+    public final synchronized void addListener(SystemListener<E> l) {
         listeners.add(l);
     }
 
@@ -91,7 +91,7 @@
      *
      * @param l
      */
-    final public synchronized void removeListener(SystemListener<E> l) {
+    public final synchronized void removeListener(SystemListener<E> l) {
         listeners.remove(l);
     }
 
@@ -102,14 +102,14 @@
      *
      * @param l
      */
-    final protected synchronized void setPreferredListener(SystemListener<E> l) {
+    protected final synchronized void setPreferredListener(SystemListener<E> l) {
         if (listeners.remove(l)) {
             listeners.add(0, l);
         }
     }
 
 
-    abstract protected E handleScancode(byte b);
+    protected abstract E handleScancode(byte b);
 
     /**
      * Gets the byte channel. This is implementation specific

Modified: trunk/core/src/driver/org/jnode/driver/input/AbstractKeyboardDriver.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/input/AbstractKeyboardDriver.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/input/AbstractKeyboardDriver.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -46,11 +46,11 @@
 
     private final ArrayList<SystemTriggerListener> stListeners = new ArrayList<SystemTriggerListener>();
 
-    final public void addKeyboardListener(KeyboardListener l) {
+    public final void addKeyboardListener(KeyboardListener l) {
         super.addListener(l);
     }
 
-    final public void removeKeyboardListener(KeyboardListener l) {
+    public final void removeKeyboardListener(KeyboardListener l) {
         super.removeListener(l);
     }
 

Modified: trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -49,8 +49,8 @@
     private final char enter = '\n';
     private final char divide = '/';
 
-    public final static int XT_RELEASE = 0x80;
-    public final static int XT_EXTENDED = 0xE0;
+    public static final int XT_RELEASE = 0x80;
+    public static final int XT_EXTENDED = 0xE0;
 
     public KeyboardInterpreter() {
         keys = new Keys();

Modified: trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -176,7 +176,7 @@
      * @return The table or null for an unknown table.
      * @throws ResourceNotFreeException
      */
-    final static AcpiTable getTable(AcpiDriver drv, ResourceOwner owner, ResourceManager rm,
+    static AcpiTable getTable(AcpiDriver drv, ResourceOwner owner, ResourceManager rm,
                                     Address ptr) throws ResourceNotFreeException {
         try {
             // Convert physical address to virtual address.

Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -165,14 +165,14 @@
     /**
      * Synchronize the state with the actual device.
      */
-    abstract public void sync();
+    public abstract void sync();
 
     public void setCursor(int x, int y) {
         this.cursorIndex = getOffset(x, y);
         setParentCursor(x, y);
     }
 
-    abstract protected void setParentCursor(int x, int y);
+    protected abstract void setParentCursor(int x, int y);
 
     public void setCursorVisible(boolean visible) {
         this.cursorVisible = visible;

Modified: trunk/core/src/test/org/jnode/test/AllTests.java
===================================================================
--- trunk/core/src/test/org/jnode/test/AllTests.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/AllTests.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -30,7 +30,7 @@
  */
 public class AllTests {
 
-    final static Logger log = Logger.getLogger(AllTests.class);
+    static final Logger log = Logger.getLogger(AllTests.class);
 
     public static Test suite() {
         log.info("Starting test");

Modified: trunk/core/src/test/org/jnode/test/IfNullTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/IfNullTest.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/IfNullTest.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -5,8 +5,8 @@
 
 public class IfNullTest {
 
-    final static Object nullVariable = null;
-    final static Object nonNullVariable = new Object();
+    static final Object nullVariable = null;
+    static final Object nonNullVariable = new Object();
 
     /**
      * @param args

Modified: trunk/core/src/test/org/jnode/test/InlineTestClass.java
===================================================================
--- trunk/core/src/test/org/jnode/test/InlineTestClass.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/InlineTestClass.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -28,7 +28,7 @@
 
     private int x;
 
-    public synchronized static int f1() {
+    public static synchronized int f1() {
         int r;
         r = f2();
         return r;

Modified: trunk/core/src/test/org/jnode/test/X86StreamTest.java
===================================================================
--- trunk/core/src/test/org/jnode/test/X86StreamTest.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/X86StreamTest.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -59,7 +59,7 @@
         fos.close();
     }
 
-    private final static void testCode64(X86Assembler os) throws UnresolvedObjectRefException {
+    private static void testCode64(X86Assembler os) throws UnresolvedObjectRefException {
         os.writeCDQE();
         os.writeMOV_Const(X86Register.R15, 0xFFFFFFFFL);
         os.writeAND(X86Register.RAX, X86Register.R15);
@@ -101,7 +101,7 @@
         os.writePOP(X86Register.RBP);
     }
 
-    private final static void testCode32(X86Assembler os) throws UnresolvedObjectRefException {
+    private static void testCode32(X86Assembler os) throws UnresolvedObjectRefException {
         GPR regs[] = {X86Register.EAX, X86Register.EBX, X86Register.ECX, X86Register.EDX, X86Register.ESI};
         for (GPR reg1 : regs) {
             os.writeIDIV_EAX(reg1);

Modified: trunk/core/src/test/org/jnode/test/framework/TestManager.java
===================================================================
--- trunk/core/src/test/org/jnode/test/framework/TestManager.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/framework/TestManager.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -42,7 +42,7 @@
 /**
  * @author Fabien DUMINY (fduminy at jnode.org)
  */
-final public class TestManager implements ExtensionPointListener {
+public final class TestManager implements ExtensionPointListener {
     public static final String ALL_CATEGORY = "all";
     public static final List<String> DEFAULT_CATEGORY =
         Collections.unmodifiableList(Arrays.asList(new String[]{ALL_CATEGORY, "default"}));
@@ -136,7 +136,7 @@
     /**
      * Get a TestSuite with all tests that have one of the given categories.
      */
-    synchronized public TestSuite getTestSuite(List<String> wantedCategories) {
+    public synchronized TestSuite getTestSuite(List<String> wantedCategories) {
         refreshTests();
         TestSuite suite = new TestSuite();
 
@@ -183,7 +183,7 @@
     /**
      * Refresh all known tests.
      */
-    synchronized private void refreshTests() {
+    private synchronized void refreshTests() {
         log.debug("<<< BEGIN refreshTests >>>");
 
         suites.clear();

Modified: trunk/core/src/test/org/jnode/test/security/TestSecurityManager.java
===================================================================
--- trunk/core/src/test/org/jnode/test/security/TestSecurityManager.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/security/TestSecurityManager.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -40,7 +40,7 @@
         }
     }
 
-    static public void main(String args[]) throws Exception {
+    public static void main(String args[]) throws Exception {
         Class sc = SecurityManager.class;
         Class sc2 = Security.class;
         Class sc3 = java.security.Permission.class;

Modified: trunk/core/src/test/org/jnode/test/threads/ThreadingUtils.java
===================================================================
--- trunk/core/src/test/org/jnode/test/threads/ThreadingUtils.java	2008-06-04 18:31:57 UTC (rev 4194)
+++ trunk/core/src/test/org/jnode/test/threads/ThreadingUtils.java	2008-06-04 19:38:45 UTC (rev 4195)
@@ -60,7 +60,7 @@
         return elem.getClassName() + "." + elem.getMethodName();
     }
 
-    static abstract class Forkable implements Runnable {
+    abstract static class Forkable implements Runnable {
         private Thread thread;
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.