Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[4440] trunk
|
From: <fd...@us...> - 2008-08-15 00:37:42
|
Revision: 4440
http://jnode.svn.sourceforge.net/jnode/?rev=4440&view=rev
Author: fduminy
Date: 2008-08-15 00:37:38 +0000 (Fri, 15 Aug 2008)
Log Message:
-----------
reverted all changes from revision 4439
Revision Links:
--------------
http://jnode.svn.sourceforge.net/jnode/?rev=4439&view=rev
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/TextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.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-15 00:05:22 UTC (rev 4439)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -29,7 +29,6 @@
import org.jnode.driver.input.KeyboardEvent;
import org.jnode.driver.input.PointerEvent;
import org.jnode.driver.textscreen.ScrollableTextScreen;
-import org.jnode.driver.textscreen.x86.AbstractPcBufferTextScreen;
/**
* @author Ewout Prangsma (ep...@us...)
@@ -55,11 +54,8 @@
final ScrollableTextScreen screen = getScrollableTextScreen();
screen.scrollUp(rows);
- //FIXME : the need to explicitly do the following call will be removed a bit later
- if(screen instanceof AbstractPcBufferTextScreen) {
- final int length = rows * screen.getWidth();
- ((AbstractPcBufferTextScreen) screen).sync(screen.getHeight() * screen.getWidth() - length, length);
- }
+ final int length = rows * screen.getWidth();
+ screen.sync(screen.getHeight() * screen.getWidth() - length, length);
}
/**
@@ -70,11 +66,7 @@
public void scrollDown(int rows) {
final ScrollableTextScreen screen = getScrollableTextScreen();
screen.scrollDown(rows);
-
- //FIXME : the need to explicitly do the following call will be removed a bit later
- if(screen instanceof AbstractPcBufferTextScreen) {
- ((AbstractPcBufferTextScreen) screen).sync(0, rows * screen.getWidth());
- }
+ screen.sync(0, rows * screen.getWidth());
}
/**
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-15 00:05:22 UTC (rev 4439)
+++ trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -34,7 +34,6 @@
import org.jnode.driver.console.spi.ConsolePrintStream;
import org.jnode.driver.textscreen.ScrollableTextScreen;
import org.jnode.driver.textscreen.TextScreen;
-import org.jnode.driver.textscreen.x86.AbstractPcBufferTextScreen;
import org.jnode.system.event.FocusEvent;
import org.jnode.system.event.FocusListener;
import org.jnode.vm.VmSystem;
@@ -318,10 +317,7 @@
private void syncScreen(int offset, int size) {
if (isFocused()) {
- //FIXME : the need to explicitly do the following call will be removed a bit later
- if(screen instanceof AbstractPcBufferTextScreen) {
- ((AbstractPcBufferTextScreen) screen).sync(offset, size);
- }
+ screen.sync(offset, size);
}
}
Modified: trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java 2008-08-15 00:05:22 UTC (rev 4439)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -118,6 +118,13 @@
public int getOffset(int x, int y);
/**
+ * Synchronize the state with the actual device.
+ * @param offset
+ * @param length
+ */
+ public void sync(int offset, int length);
+
+ /**
* Create an in-memory buffer text screen that is compatible
* with this screen.
*
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 00:05:22 UTC (rev 4439)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -47,7 +47,7 @@
* Synchronize the state with the actual device.
*/
@Override
- public final void sync(int offset, int length) {
+ public void sync(int offset, int length) {
copyTo(parent, offset, length);
}
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-15 00:05:22 UTC (rev 4439)
+++ trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -172,7 +172,15 @@
throw new UnsupportedOperationException();
}
+ /**
+ * Synchronize the state with the actual device.
+ */
@Override
+ public void sync(int offset, int length) {
+ // Nothing to do here
+ }
+
+ @Override
public int setCursor(int x, int y) {
return 0; // TODO what should we return if we don't call instance.setCursor ?
}
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-15 00:05:22 UTC (rev 4439)
+++ trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -295,6 +295,7 @@
}
};
+ @Override
public void sync(int offset, int length) {
SwingUtilities.invokeLater(repaintCmd);
}
Modified: trunk/gui/src/test/org/jnode/test/gui/FBConsole.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/FBConsole.java 2008-08-15 00:05:22 UTC (rev 4439)
+++ trunk/gui/src/test/org/jnode/test/gui/FBConsole.java 2008-08-15 00:37:38 UTC (rev 4440)
@@ -145,6 +145,8 @@
}
+
+ @Override
public void sync(int offset, int length) {
screen.repaint();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
