Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[4415] trunk
|
From: <fd...@us...> - 2008-08-09 10:36:20
|
Revision: 4415
http://jnode.svn.sourceforge.net/jnode/?rev=4415&view=rev
Author: fduminy
Date: 2008-08-09 10:36:16 +0000 (Sat, 09 Aug 2008)
Log Message:
-----------
added @Override annotations
Modified Paths:
--------------
trunk/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcScrollableTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
trunk/gui/src/test/org/jnode/test/gui/FBConsole.java
Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java 2008-08-09 02:04:39 UTC (rev 4414)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java 2008-08-09 10:36:16 UTC (rev 4415)
@@ -71,6 +71,7 @@
/**
* @see org.jnode.driver.input.KeyboardListener#keyPressed(org.jnode.driver.input.KeyboardEvent)
*/
+ @Override
public void keyPressed(KeyboardEvent event) {
if (isFocused() && !event.isConsumed()) {
final int modifiers = event.getModifiers();
@@ -103,6 +104,7 @@
/**
* @see org.jnode.driver.input.PointerListener#pointerStateChanged(org.jnode.driver.input.PointerEvent)
*/
+ @Override
public void pointerStateChanged(PointerEvent event) {
if (isFocused() && (event.getZ() != 0)) {
final int z = event.getZ();
Modified: trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java 2008-08-09 02:04:39 UTC (rev 4414)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java 2008-08-09 10:36:16 UTC (rev 4415)
@@ -120,6 +120,7 @@
*
* @see org.jnode.driver.console.TextConsole#clear()
*/
+ @Override
public void clear() {
final int size = screen.getWidth() * screen.getHeight();
screen.set(0, ' ', size, 0x07);
@@ -129,6 +130,7 @@
/**
* Clear a given row
*/
+ @Override
public void clearRow(int row) {
final int size = screen.getWidth();
final int offset = screen.getOffset(0, row);
@@ -144,6 +146,7 @@
* @param lenght
* @param color
*/
+ @Override
public void putChar(char v[], int offset, int lenght, int color) {
int mark = 0;
for (int i = 0; i < lenght; i++) {
@@ -171,6 +174,7 @@
* @param v
* @param color
*/
+ @Override
public void putChar(char v, int color) {
doPutChar(v, color);
screen.ensureVisible(curY, isFocused()); // synchronize if focused
@@ -214,6 +218,7 @@
/**
* @return Returns the tabSize.
*/
+ @Override
public int getTabSize() {
return tabSize;
}
@@ -221,6 +226,7 @@
/**
* @param tabSize The tabSize to set.
*/
+ @Override
public void setTabSize(int tabSize) {
this.tabSize = tabSize;
}
@@ -228,6 +234,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getColor(int, int)
*/
+ @Override
public int getColor(int x, int y) {
return screen.getColor(screen.getOffset(x, y));
}
@@ -235,6 +242,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getChar(int, int)
*/
+ @Override
public char getChar(int x, int y) {
return screen.getChar(screen.getOffset(x, y));
}
@@ -242,6 +250,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getCursorX()
*/
+ @Override
public int getCursorX() {
return curX;
}
@@ -249,6 +258,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getCursorY()
*/
+ @Override
public int getCursorY() {
return curY;
}
@@ -256,6 +266,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getHeight()
*/
+ @Override
public int getHeight() {
return screen.getHeight();
}
@@ -263,6 +274,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getWidth()
*/
+ @Override
public int getWidth() {
return screen.getWidth();
}
@@ -270,18 +282,21 @@
/**
* @see org.jnode.driver.console.TextConsole#setChar(int, int, char, int)
*/
+ @Override
public void setChar(int x, int y, char ch, int color) {
int offset = screen.getOffset(x, y);
screen.set(offset, ch, 1, color);
syncScreen(offset, 1);
}
+ @Override
public void setChar(int x, int y, char[] ch, int color) {
int offset = screen.getOffset(x, y);
screen.set(offset, ch, 0, ch.length, color);
syncScreen(offset, ch.length);
}
+ @Override
public void setChar(int x, int y, char[] ch, int cOfset, int cLength, int color) {
int offset = screen.getOffset(x, y);
screen.set(offset, ch, cOfset, cLength, color);
@@ -291,6 +306,7 @@
/**
* @see org.jnode.driver.console.TextConsole#setCursor(int, int)
*/
+ @Override
public void setCursor(int x, int y) {
this.curX = x;
this.curY = y;
@@ -313,6 +329,7 @@
screen.ensureVisible(row, isFocused()); // synchronize if focused
}
+ @Override
public InputCompleter getCompleter() {
if (in instanceof KeyboardInputStream) {
return ((KeyboardInputStream) in).getCompleter();
@@ -321,6 +338,7 @@
}
}
+ @Override
public void setCompleter(InputCompleter completer) {
if (in instanceof KeyboardInputStream) {
((KeyboardInputStream) in).setCompleter(completer);
@@ -330,6 +348,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getIn()
*/
+ @Override
public InputStream getIn() {
return in;
}
@@ -341,6 +360,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getErr()
*/
+ @Override
public PrintStream getErr() {
return err;
}
@@ -348,6 +368,7 @@
/**
* @see org.jnode.driver.console.TextConsole#getOut()
*/
+ @Override
public PrintStream getOut() {
return out;
}
@@ -355,6 +376,7 @@
/**
* Is the cursor visible.
*/
+ @Override
public boolean isCursorVisible() {
return cursorVisible;
}
@@ -364,6 +386,7 @@
*
* @param visible
*/
+ @Override
public void setCursorVisible(boolean visible) {
this.cursorVisible = visible;
int offset = screen.setCursorVisible(visible);
@@ -373,6 +396,7 @@
/**
* @see org.jnode.system.event.FocusListener#focusGained(org.jnode.system.event.FocusEvent)
*/
+ @Override
public void focusGained(FocusEvent event) {
super.focusGained(event);
syncScreen(0, screen.getWidth() * screen.getHeight());
@@ -397,6 +421,7 @@
/**
* @see org.jnode.system.event.FocusListener#focusLost(org.jnode.system.event.FocusEvent)
*/
+ @Override
public void focusLost(FocusEvent event) {
if (in instanceof FocusListener) {
((FocusListener) in).focusLost(event);
Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcScrollableTextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcScrollableTextScreen.java 2008-08-09 02:04:39 UTC (rev 4414)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcScrollableTextScreen.java 2008-08-09 10:36:16 UTC (rev 4415)
@@ -56,6 +56,7 @@
/**
* @see org.jnode.driver.textscreen.ScrollableTextScreen#ensureVisible(int, boolean)
*/
+ @Override
public void ensureVisible(int row, boolean sync) {
if (row < ofsY) {
ofsY = row;
@@ -67,6 +68,7 @@
/**
* @see org.jnode.driver.textscreen.ScrollableTextScreen#scrollDown(int)
*/
+ @Override
public void scrollDown(int rows) {
if (rows < 0) {
throw new IllegalArgumentException("rows < 0");
@@ -87,6 +89,7 @@
/**
* @see org.jnode.driver.textscreen.ScrollableTextScreen#scrollUp(int)
*/
+ @Override
public void scrollUp(int rows) {
if (rows < 0) {
throw new IllegalArgumentException("rows < 0");
@@ -101,6 +104,7 @@
*
* @return
*/
+ @Override
protected int getTopOffset() {
return ofsY * getWidth();
}
@@ -108,6 +112,7 @@
/**
* @see org.jnode.driver.textscreen.TextScreen#set(int, char, int, int)
*/
+ @Override
public void set(int offset, char ch, int count, int color) {
maxValidY = Math.max(maxValidY, offset / getWidth());
super.set(offset, ch, count, color);
@@ -115,6 +120,7 @@
/**
* @see org.jnode.driver.textscreen.TextScreen#set(int, char[], int, int, int)
*/
+ @Override
public void set(int offset, char[] ch, int chOfs, int length, int color) {
maxValidY = Math.max(maxValidY, (offset + length - 1) / getWidth());
super.set(offset, ch, chOfs, length, color);
@@ -122,6 +128,7 @@
/**
* @see org.jnode.driver.textscreen.TextScreen#set(int, char[], int, int, int[], int)
*/
+ @Override
public void set(int offset, char[] ch, int chOfs, int length, int[] colors,
int colorsOfs) {
maxValidY = Math.max(maxValidY, (offset + length - 1) / getWidth());
Modified: trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java 2008-08-09 02:04:39 UTC (rev 4414)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java 2008-08-09 10:36:16 UTC (rev 4415)
@@ -90,6 +90,7 @@
/**
* @see org.jnode.driver.textscreen.TextScreen#copyContent(int, int, int)
*/
+ @Override
public void copyContent(int srcOffset, int destOffset, int length) {
memory.copy(srcOffset * 2, destOffset * 2, length * 2);
}
@@ -97,6 +98,7 @@
/**
* @see org.jnode.driver.textscreen.TextScreen#getChar(int)
*/
+ @Override
public char getChar(int offset) {
return (char) (memory.getByte(offset * 2) & 0xFF);
}
@@ -104,6 +106,7 @@
/**
* @see org.jnode.driver.textscreen.TextScreen#getColor(int)
*/
+ @Override
public int getColor(int offset) {
return memory.getByte(offset * 2 + 1) & 0xFF;
}
@@ -111,6 +114,7 @@
/**
* @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));
memory.setChar(offset * 2, v, count);
@@ -120,6 +124,7 @@
* @see org.jnode.driver.textscreen.TextScreen#set(int, char[], int, int,
* int)
*/
+ @Override
public void set(int offset, char[] ch, int chOfs, int length, int color) {
color = (color & 0xFF) << 8;
for (int i = 0; i < length; i++) {
@@ -132,6 +137,7 @@
* @see org.jnode.driver.textscreen.TextScreen#set(int, char[], int, int,
* int[], int)
*/
+ @Override
public void set(int offset, char[] ch, int chOfs, int length, int[] colors,
int colorsOfs) {
for (int i = 0; i < length; i++) {
@@ -147,6 +153,7 @@
* @param rawData
* @param rawDataOffset
*/
+ @Override
public final void copyFrom(char[] rawData, int rawDataOffset) {
if (rawDataOffset < 0) {
Unsafe.die("Screen:rawDataOffset = " + rawDataOffset);
@@ -160,6 +167,7 @@
*
* @param dst
*/
+ @Override
public void copyTo(TextScreen dst, int offset, int length) {
throw new UnsupportedOperationException();
}
@@ -176,6 +184,7 @@
return 0; // TODO what should we return if we don't call instance.setCursor ?
}
+ @Override
public int setCursorVisible(boolean visible) {
return instance.setCursorVisible(visible);
}
Modified: trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-08-09 02:04:39 UTC (rev 4414)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-08-09 10:36:16 UTC (rev 4415)
@@ -93,6 +93,7 @@
enableEvents(AWTEvent.KEY_EVENT_MASK);
enableEvents(AWTEvent.FOCUS_EVENT_MASK);
addMouseListener(new MouseAdapter() {
+ @Override
public void mousePressed(MouseEvent e) {
if (SwingUtilities.isLeftMouseButton(e)) {
if (contains(e.getX(), e.getY())) {
@@ -110,6 +111,7 @@
setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS, ftk);
}
+ @Override
protected void paintComponent(Graphics g) {
g.setColor(getBackground());
g.fillRect(0, 0, getWidth(), getHeight());
@@ -129,6 +131,7 @@
}
}
+ @Override
public void addNotify() {
super.addNotify();
FontMetrics fm = getGraphics().getFontMetrics();
@@ -137,10 +140,12 @@
screen.setSize(screen.getMaximumSize());
}
+ @Override
public Dimension getPreferredSize() {
return new Dimension(w * SCREEN_WIDTH + 2 * margin, (h + 1) * SCREEN_HEIGHT + 2 * margin);
}
+ @Override
public Dimension getMaximumSize() {
return getPreferredSize();
}
@@ -150,6 +155,7 @@
if (keyboardDevice == null) {
keyboardDriver = new MyKeyboardDriver();
keyListener = new KeyAdapter() {
+ @Override
public void keyPressed(KeyEvent e) {
char c = e.getKeyChar();
if (c == KeyEvent.CHAR_UNDEFINED) c = 0;
@@ -159,6 +165,7 @@
}
+ @Override
public void keyReleased(KeyEvent e) {
char c = e.getKeyChar();
if (c == KeyEvent.CHAR_UNDEFINED) c = 0;
@@ -181,30 +188,35 @@
}
private class MouseHandler extends MouseAdapter implements MouseMotionListener, MouseWheelListener {
+ @Override
public void mousePressed(MouseEvent e) {
// todo complete event parameters
PointerEvent p = new PointerEvent(0, e.getX(), e.getY(), true);
pointerDriver.dispatchEvent(p);
}
+ @Override
public void mouseReleased(MouseEvent e) {
// todo complete event parameters
PointerEvent p = new PointerEvent(0, e.getX(), e.getY(), true);
pointerDriver.dispatchEvent(p);
}
+ @Override
public void mouseDragged(MouseEvent e) {
// todo complete event parameters
PointerEvent p = new PointerEvent(0, e.getX(), e.getY(), true);
pointerDriver.dispatchEvent(p);
}
+ @Override
public void mouseMoved(MouseEvent e) {
// todo complete event parameters
PointerEvent p = new PointerEvent(0, e.getX(), e.getY(), true);
pointerDriver.dispatchEvent(p);
}
+ @Override
public void mouseWheelMoved(MouseWheelEvent e) {
// todo complete event parameters
PointerEvent p = new PointerEvent(0, e.getX(), e.getY(), e.getWheelRotation(), true);
@@ -283,6 +295,7 @@
}
};
+ @Override
public void sync(int offset, int length) {
SwingUtilities.invokeLater(repaintCmd);
}
@@ -318,10 +331,12 @@
private static class MyPointerDriver extends Driver implements PointerAPI {
private final ArrayList<PointerListener> listeners = new ArrayList<PointerListener>();
+ @Override
protected synchronized void startDevice() throws DriverException {
getDevice().registerAPI(PointerAPI.class, this);
}
+ @Override
protected synchronized void stopDevice() throws DriverException {
}
@@ -335,10 +350,12 @@
}
}
+ @Override
public void addPointerListener(PointerListener l) {
listeners.add(l);
}
+ @Override
public void removePointerListener(PointerListener l) {
listeners.remove(l);
}
@@ -351,6 +368,7 @@
*
* @param listener the prefered pointer listener
*/
+ @Override
public void setPreferredListener(PointerListener listener) {
}
@@ -359,10 +377,12 @@
private static class MyKeyboardDriver extends Driver implements KeyboardAPI {
private final ArrayList<KeyboardListener> listeners = new ArrayList<KeyboardListener>();
+ @Override
protected synchronized void startDevice() throws DriverException {
getDevice().registerAPI(KeyboardAPI.class, this);
}
+ @Override
protected synchronized void stopDevice() throws DriverException {
}
@@ -384,22 +404,27 @@
}
}
+ @Override
public void addKeyboardListener(KeyboardListener l) {
listeners.add(l);
}
+ @Override
public KeyboardInterpreter getKbInterpreter() {
return null;
}
+ @Override
public void removeKeyboardListener(KeyboardListener l) {
listeners.remove(l);
}
+ @Override
public void setKbInterpreter(KeyboardInterpreter kbInterpreter) {
}
+ @Override
public void setPreferredListener(KeyboardListener l) {
}
Modified: trunk/gui/src/test/org/jnode/test/gui/FBConsole.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/FBConsole.java 2008-08-09 02:04:39 UTC (rev 4414)
+++ trunk/gui/src/test/org/jnode/test/gui/FBConsole.java 2008-08-09 10:36:16 UTC (rev 4415)
@@ -146,6 +146,7 @@
}
+ @Override
public void sync(int offset, int length) {
screen.repaint();
}
@@ -216,6 +217,7 @@
}
*/
new Thread(new Runnable() {
+ @Override
public void run() {
while (true) {
try {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
