[Jnode-svn-commits] SF.net SVN: jnode:[4444] trunk

[<fd...@us...>]

Revision: 4444
          http://jnode.svn.sourceforge.net/jnode/?rev=4444&view=rev
Author:   fduminy
Date:     2008-08-15 15:18:43 +0000 (Fri, 15 Aug 2008)

Log Message:
-----------
added @Override annotations + some final keywords

Modified Paths:
--------------
    trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java
    trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.java
    trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreen.java

Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java	2008-08-15 14:23:37 UTC (rev 4443)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java	2008-08-15 15:18:43 UTC (rev 4444)
@@ -59,27 +59,31 @@
     /**
      * @see org.jnode.driver.textscreen.TextScreen#copyContent(int, int, int)
      */
-    public void copyContent(int srcOffset, int destOffset, int length) {
+    @Override
+    public final void copyContent(int srcOffset, int destOffset, int length) {
         System.arraycopy(buffer, srcOffset, buffer, destOffset, length);
     }
 
     /**
      * @see org.jnode.driver.textscreen.TextScreen#getChar(int)
      */
-    public char getChar(int offset) {
+    @Override
+    public final char getChar(int offset) {
         return (char) (buffer[offset] & 0xFF);
     }
 
     /**
      * @see org.jnode.driver.textscreen.TextScreen#getColor(int)
      */
-    public int getColor(int offset) {
+    @Override
+    public final int getColor(int offset) {
         return (char) ((buffer[offset] >> 8) & 0xFF);
     }
 
     /**
      * @see org.jnode.driver.textscreen.TextScreen#set(int, char, int, int)
      */
+    @Override
     public void set(int offset, char ch, int count, int color) {
         final char v = (char) ((ch & 0xFF) | ((color & 0xFF) << 8));
         count = Math.min(count, buffer.length - offset);
@@ -92,7 +96,8 @@
      * @see org.jnode.driver.textscreen.TextScreen#set(int, char[], int, int,
      *      int)
      */
-    public void set(int offset, char[] ch, int chOfs, int length, int color) {
+    @Override
+    public void set(final int offset, final char[] ch, final int chOfs, int length, int color) {
         color = (color & 0xFF) << 8;
         length = Math.min(length, buffer.length - offset);
         for (int i = 0; i < length; i++) {
@@ -175,7 +180,7 @@
     public abstract void sync(int offset, int length);
 
     @Override
-    public int setCursor(int x, int y) {
+    public final int setCursor(int x, int y) {
         this.cursorIndex = getOffset(x, y);
         setParentCursor(x, y);
         return cursorIndex;
@@ -183,7 +188,8 @@
 
     protected abstract void setParentCursor(int x, int y);
 
-    public int setCursorVisible(boolean visible) {
+    @Override
+    public final int setCursorVisible(boolean visible) {
         this.cursorVisible = visible;
         return cursorIndex;
     }

Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.java	2008-08-15 14:23:37 UTC (rev 4443)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.java	2008-08-15 15:18:43 UTC (rev 4444)
@@ -47,7 +47,7 @@
      * Synchronize the state with the actual device.
      */
     @Override
-    public void sync(int offset, int length) {
+    public final void sync(int offset, int length) {
         copyTo(parent, offset, length);
     }
 

Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreen.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreen.java	2008-08-15 14:23:37 UTC (rev 4443)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/fb/FbTextScreen.java	2008-08-15 15:18:43 UTC (rev 4444)
@@ -117,12 +117,6 @@
 
     }
 
-    public void sync(int offset, int length) {
-        if (painter != null) {
-            painter.repaint();
-        }
-    }
-
     public int setCursor(int x, int y) {
         cursorOffset = getOffset(x, y);
         sync(cursorOffset, 1);
@@ -136,6 +130,13 @@
         return cursorOffset;
     }
 
+    @Override
+    public void sync(int offset, int length) {
+        if (painter != null) {
+            painter.repaint();
+        }
+    }
+
     /**
      * Copy the content of the given rawData into this screen.
      *


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