Revision: 5516
http://jnode.svn.sourceforge.net/jnode/?rev=5516&view=rev
Author: crawley
Date: 2009-05-24 05:17:23 +0000 (Sun, 24 May 2009)
Log Message:
-----------
Fixed compiler warnings
Modified Paths:
--------------
trunk/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDriver.java
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
trunk/gui/src/driver/org/jnode/driver/video/AlreadyOpenException.java
trunk/gui/src/driver/org/jnode/driver/video/FrameBufferException.java
trunk/gui/src/driver/org/jnode/driver/video/HardwareCursor.java
trunk/gui/src/driver/org/jnode/driver/video/NotOpenException.java
trunk/gui/src/driver/org/jnode/driver/video/UnknownConfigurationException.java
trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Core.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FpRegs.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/PllRegs.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonCore.java
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java
trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java
trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusVGAState.java
trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1Exception.java
trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1NoSignalException.java
trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1ParseException.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/MultibootInfos.java
trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
trunk/gui/src/driver/org/jnode/driver/video/vga/StandardVGAIO.java
trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java
trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java
trunk/gui/src/test/org/jnode/test/gui/AWTMenuTest.java
trunk/gui/src/test/org/jnode/test/gui/AWTTest.java
trunk/gui/src/test/org/jnode/test/gui/ConsoleTest.java
trunk/gui/src/test/org/jnode/test/gui/CurvesTest.java
trunk/gui/src/test/org/jnode/test/gui/DialogTest.java
trunk/gui/src/test/org/jnode/test/gui/Editor.java
trunk/gui/src/test/org/jnode/test/gui/GlyphTest.java
trunk/gui/src/test/org/jnode/test/gui/Graphics2DSurface.java
trunk/gui/src/test/org/jnode/test/gui/GraphicsTest.java
trunk/gui/src/test/org/jnode/test/gui/ImageIOTest.java
trunk/gui/src/test/org/jnode/test/gui/ImageTest.java
trunk/gui/src/test/org/jnode/test/gui/PolyLineTest.java
trunk/gui/src/test/org/jnode/test/gui/QuadCurveTest.java
trunk/gui/src/test/org/jnode/test/gui/RobotTest.java
trunk/gui/src/test/org/jnode/test/gui/SwingMenuTest.java
trunk/gui/src/test/org/jnode/test/gui/SwingTest.java
trunk/gui/src/test/org/jnode/test/gui/TTFFileTest.java
trunk/gui/src/test/org/jnode/test/gui/TextFieldTest.java
trunk/gui/src/thinlet/thinlet/ThinTest.java
trunk/gui/src/thinlet/thinlet/Thinlet.java
Modified:
trunk/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDriver.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDriver.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/sound/speaker/pc/PCSpeakerDriver.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -145,8 +145,8 @@
private IOResource claimPorts(final ResourceManager rm, final
ResourceOwner owner,
final int low, final int length) throws ResourceNotFreeException,
DriverException {
try {
- return (IOResource) AccessControllerUtils.doPrivileged(new
PrivilegedExceptionAction() {
- public Object run() throws ResourceNotFreeException {
+ return AccessControllerUtils.doPrivileged(new
PrivilegedExceptionAction<IOResource>() {
+ public IOResource run() throws ResourceNotFreeException {
return rm.claimIOResource(owner, low, length);
}
});
Modified:
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
===================================================================
---
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
2009-05-24 02:05:31 UTC (rev 5515)
+++
trunk/gui/src/driver/org/jnode/driver/textscreen/swing/SwingPcTextScreen.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -21,6 +21,7 @@
package org.jnode.driver.textscreen.swing;
import java.awt.AWTEvent;
+import java.awt.AWTKeyStroke;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
@@ -97,6 +98,7 @@
}
private class SwingPcScreen extends JComponent {
+ private static final long serialVersionUID = 1L;
int margin = 5;
int w;
int h;
@@ -133,7 +135,8 @@
});
setFocusable(true);
setBackground(Color.BLACK);
- Set ftk = new
HashSet(getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
+ Set<AWTKeyStroke> ftk = new HashSet<AWTKeyStroke>(
+
getFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS));
ftk.remove(KeyStroke.getKeyStroke(KeyEvent.VK_TAB, 0));
setFocusTraversalKeys(KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS,
ftk);
}
Modified: trunk/gui/src/driver/org/jnode/driver/video/AlreadyOpenException.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/AlreadyOpenException.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/AlreadyOpenException.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -24,6 +24,7 @@
* @author epr
*/
public class AlreadyOpenException extends FrameBufferException {
+ private static final long serialVersionUID = 1L;
/**
*
Modified: trunk/gui/src/driver/org/jnode/driver/video/FrameBufferException.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/FrameBufferException.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/FrameBufferException.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -24,6 +24,7 @@
* @author epr
*/
public class FrameBufferException extends Exception {
+ private static final long serialVersionUID = 1L;
/**
*
Modified: trunk/gui/src/driver/org/jnode/driver/video/HardwareCursor.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/HardwareCursor.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/HardwareCursor.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -68,9 +68,9 @@
/**
* Create an iterator over all images.
*
- * @return An iterator of {...@link HardwareCursor}instances.
+ * @return An iterator of {...@link HardwareCursorImage} instances.
*/
- public Iterator iterator() {
+ public Iterator<HardwareCursorImage> iterator() {
return imageMap.values().iterator();
}
Modified: trunk/gui/src/driver/org/jnode/driver/video/NotOpenException.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/NotOpenException.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/NotOpenException.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -21,6 +21,7 @@
package org.jnode.driver.video;
public class NotOpenException extends FrameBufferException {
+ private static final long serialVersionUID = 1L;
/**
*
Modified:
trunk/gui/src/driver/org/jnode/driver/video/UnknownConfigurationException.java
===================================================================
---
trunk/gui/src/driver/org/jnode/driver/video/UnknownConfigurationException.java
2009-05-24 02:05:31 UTC (rev 5515)
+++
trunk/gui/src/driver/org/jnode/driver/video/UnknownConfigurationException.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -24,6 +24,7 @@
* @author epr
*/
public class UnknownConfigurationException extends FrameBufferException {
+ private static final long serialVersionUID = 1L;
/**
*
Modified: trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Core.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Core.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/mach64/Mach64Core.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -94,7 +94,7 @@
final int fbBase = (int) fbAddr.getMemoryBase() /* & 0xFF800000 */;
final int memSize = fbAddr.getSize();
- log.info("Memory size " + NumberUtils.size(memSize));
+ log.info("Memory size " + NumberUtils.toBinaryByte(memSize));
// Map Device RAM
this.deviceRam =
Modified: trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FpRegs.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FpRegs.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/FpRegs.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -94,6 +94,7 @@
final void calcForConfiguration(RadeonConfiguration config, PLLInfo
pllInfo, RadeonVgaIO io,
FBInfo fbinfo, CrtcRegs crtc) {
final DisplayMode mode = config.getDisplayMode();
+ @SuppressWarnings("unused")
final int bpp = config.getBitsPerPixel();
final int panel_xres = fbinfo.getPanelXres();
@@ -153,6 +154,7 @@
fp_v_sync_strt_wid = crtc.getCrtc_v_sync_strt_wid();
}
+ @SuppressWarnings("unused")
private static final int round_div(int num, int den) {
return (num + (den / 2)) / den;
}
Modified: trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/PllRegs.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/PllRegs.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/PllRegs.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -246,6 +246,7 @@
this.ppll_div_3 = (feedback_div | (bitvalue << 16));
this.htotal_cntl = 0;
+ @SuppressWarnings("unused")
final int vclk_freq = (ref_clk * feedback_div) / (ref_div *
pll_output_freq);
// System.out.println("vclk_freq=" + vclk_freq + ", fbdiv="
// + feedback_div + ", postdiv=" + pll_output_freq
@@ -261,6 +262,7 @@
", htotal_cntl:0x" + NumberUtils.hex(htotal_cntl);
}
+ @SuppressWarnings("unused")
private final void PLLWriteUpdate(RadeonVgaIO io) {
PLLWaitForReadUpdateComplete(io);
io.setPLLP(crtc2 ? P2PLL_REF_DIV : PPLL_REF_DIV, PPLL_ATOMIC_UPDATE_W,
Modified: trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonCore.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonCore.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonCore.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -110,7 +110,7 @@
ResourceManager.MEMMODE_NORMAL);
this.vgaIO = new RadeonVgaIO(mmio);
final int memSize = readMemorySize();
- log.info("Memory size " + NumberUtils.size(memSize));
+ log.info("Memory size " + NumberUtils.toBinaryByte(memSize));
this.accel = new RadeonAcceleration(vgaIO);
// Map Device RAM
@@ -435,7 +435,7 @@
mem.release();
log.info("Found ATI ROM at 0x" + NumberUtils.hex(romAddr.toInt())
+ " size=" +
- NumberUtils.size(romSize));
+ NumberUtils.toBinaryByte(romSize));
return rm.claimMemoryResource(owner, romAddr, romSize,
ResourceManager.MEMMODE_NORMAL);
}
Modified:
trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ati/radeon/RadeonSurface.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -36,6 +36,7 @@
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
public class RadeonSurface extends AbstractSurface {
+ @SuppressWarnings("unused")
private final RadeonAcceleration accel;
private final BitmapGraphics bitmapGraphics;
Modified: trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusDriver.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -123,6 +123,7 @@
throw new DriverException(ex);
}
super.startDevice();
+ @SuppressWarnings("unused")
final Device dev = getDevice();
//dev.registerAPI(DisplayDataChannelAPI.class, driver);
// <-- should we register this one? We do read edid our own..
Modified: trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusMMIO.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -32,6 +32,7 @@
/** My logger */
private static final Logger log = Logger.getLogger(CirrusMMIO.class);
+ @SuppressWarnings("unused")
private final MemoryResource mmio;
private final IOResource ports;
Modified: trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusVGAState.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusVGAState.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/cirrus/CirrusVGAState.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -21,10 +21,13 @@
private int CR0, CR1, CR2, CR3, CR4, CR5, CR6, CR7, CR8, CR9;
+ @SuppressWarnings("unused")
private int CRA, CRB, CRC, CRD, CRE, CRF, CR10, CR11, CR12;
+ @SuppressWarnings("unused")
private int CR13, CR14, CR15, CR16, CR17, CR18, CR22, CR24;
+ @SuppressWarnings("unused")
private int CR26, CR1B;
public CirrusVGAState(CirrusMMIO vgaIO) {
Modified: trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1Exception.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1Exception.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1Exception.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -24,6 +24,7 @@
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
public class DDC1Exception extends Exception {
+ private static final long serialVersionUID = 1L;
/**
*
Modified:
trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1NoSignalException.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1NoSignalException.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1NoSignalException.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -24,6 +24,7 @@
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
public class DDC1NoSignalException extends DDC1Exception {
+ private static final long serialVersionUID = 1L;
/**
*
Modified:
trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1ParseException.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1ParseException.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/ddc/DDC1ParseException.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -24,6 +24,7 @@
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
public class DDC1ParseException extends DDC1Exception {
+ private static final long serialVersionUID = 1L;
/**
*
Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/MultibootInfos.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/MultibootInfos.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/MultibootInfos.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -23,6 +23,7 @@
import org.vmmagic.unboxed.Address;
public class MultibootInfos {
+ @SuppressWarnings("unused")
private final Address address;
MultibootInfos(Address address) {
Modified: trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/vesa/VESACommand.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -155,6 +155,7 @@
int size = 0x7FFF; // 32 Kb
int mode = ResourceManager.MEMMODE_NORMAL;
int address = 0xA0000;
+ @SuppressWarnings("unused")
MemoryResource resource =
manager.claimMemoryResource(owner,
Address.fromInt(address), size, mode);
@@ -163,6 +164,8 @@
println("before call to vbe function");
int codePtr = pmInfoBlock.getEntryPoint();
println("codePtr=" + NumberUtils.hex(codePtr));
+ // FIXME ... if the javadoc for 'Unsafe.callVbeFunction' is
credible, this is a
+ // bad thing to do.
int result =
Unsafe.callVbeFunction(Address.fromInt(codePtr), 0,
Address.fromInt(address));
println("codePtr=" + result);
Modified: trunk/gui/src/driver/org/jnode/driver/video/vga/StandardVGAIO.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vga/StandardVGAIO.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/vga/StandardVGAIO.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -172,8 +172,8 @@
private IOResource claimPorts(final ResourceManager rm, final
ResourceOwner owner,
final int low, final int length) throws ResourceNotFreeException,
DriverException {
try {
- return (IOResource) AccessControllerUtils.doPrivileged(new
PrivilegedExceptionAction() {
- public Object run() throws ResourceNotFreeException {
+ return AccessControllerUtils.doPrivileged(new
PrivilegedExceptionAction<IOResource>() {
+ public IOResource run() throws ResourceNotFreeException {
return rm.claimIOResource(owner, low, length);
}
});
Modified: trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java
===================================================================
--- trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/driver/org/jnode/driver/video/vmware/VMWareCore.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -932,8 +932,8 @@
private IOResource claimPorts(final ResourceManager rm, final
ResourceOwner owner,
final int low, final int length) throws ResourceNotFreeException,
DriverException {
try {
- return (IOResource) AccessControllerUtils.doPrivileged(new
PrivilegedExceptionAction() {
- public Object run() throws ResourceNotFreeException {
+ return AccessControllerUtils.doPrivileged(new
PrivilegedExceptionAction<IOResource>() {
+ public IOResource run() throws ResourceNotFreeException {
return rm.claimIOResource(owner, low, length);
}
});
Modified: trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java 2009-05-24 02:05:31 UTC
(rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/AWTDemo.java 2009-05-24 05:17:23 UTC
(rev 5516)
@@ -75,6 +75,7 @@
public void init();
}
+ @SuppressWarnings("serial")
static class PrettyPanel extends Panel {
Insets myInsets;
@@ -87,6 +88,7 @@
}
}
+ @SuppressWarnings("serial")
abstract static class PrettyFrame extends Frame {
public PrettyFrame() {
((BorderLayout) getLayout()).setHgap(5);
@@ -100,6 +102,7 @@
}
}
+ @SuppressWarnings("serial")
abstract static class SubFrame extends PrettyFrame implements SubWindow {
boolean initted = false;
@@ -110,6 +113,7 @@
}
}
+ @SuppressWarnings("serial")
static class MainWindow extends PrettyFrame implements ActionListener {
Button closeButton;
@@ -208,6 +212,7 @@
}
}
+ @SuppressWarnings("serial")
static class ButtonsWindow extends SubFrame implements ActionListener {
Button b[] = new Button[9];
@@ -259,6 +264,7 @@
}
}
+ @SuppressWarnings("serial")
static class DialogWindow extends Dialog implements SubWindow {
Label text;
@@ -336,6 +342,7 @@
}
}
+ @SuppressWarnings("serial")
static class CursorsWindow extends SubFrame implements ItemListener {
Choice cursorChoice;
@@ -397,6 +404,7 @@
}
}
+ @SuppressWarnings("serial")
static class TextFieldWindow extends SubFrame implements ItemListener {
Checkbox editable, visible, sensitive;
@@ -456,6 +464,7 @@
}
}
+ @SuppressWarnings("serial")
static class FileWindow extends FileDialog implements SubWindow {
boolean initted = false;
@@ -474,6 +483,7 @@
}
}
+ @SuppressWarnings("serial")
static class LabelWindow extends SubFrame {
public void init() {
initted = true;
@@ -502,6 +512,7 @@
}
}
+ @SuppressWarnings("serial")
static class ListWindow extends SubFrame {
public void init() {
initted = true;
@@ -530,6 +541,7 @@
}
}
+ @SuppressWarnings("serial")
static class RadioWindow extends SubFrame {
public void init() {
initted = true;
@@ -579,6 +591,7 @@
}
}
+ @SuppressWarnings("serial")
static class TestWindow extends SubFrame {
static int xs = 5, ys = 5;
@@ -702,6 +715,7 @@
}
}
+ @SuppressWarnings("serial")
static class RoundRectWindow extends SubFrame {
public void init() {
initted = true;
Modified: trunk/gui/src/test/org/jnode/test/gui/AWTMenuTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/AWTMenuTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/AWTMenuTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -26,6 +26,7 @@
/**
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
+...@suppresswarnings("serial")
public class AWTMenuTest extends AWTTest {
/**
Modified: trunk/gui/src/test/org/jnode/test/gui/AWTTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/AWTTest.java 2009-05-24 02:05:31 UTC
(rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/AWTTest.java 2009-05-24 05:17:23 UTC
(rev 5516)
@@ -46,6 +46,7 @@
/**
* @author epr
*/
+...@suppresswarnings("serial")
public class AWTTest extends Frame {
static class TestComponent extends Component {
@@ -263,6 +264,7 @@
}
public static void main(String[] args) throws InterruptedException {
+ @SuppressWarnings("unused")
boolean useDoubleBuffer = (args.length > 0) &&
args[0].equals("buffer");
try {
Modified: trunk/gui/src/test/org/jnode/test/gui/ConsoleTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/ConsoleTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/ConsoleTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -40,6 +40,7 @@
*/
public class ConsoleTest {
+ @SuppressWarnings("serial")
static class ConsoleFrame extends JFrame {
private PrintStream savedOut;
private JTextArea textArea;
Modified: trunk/gui/src/test/org/jnode/test/gui/CurvesTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/CurvesTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/CurvesTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -186,7 +186,7 @@
Curves.calculateCubicCurveOpt2(x0, y0, x1, y1, x2, y2, x3, y3,
temp);
}
-
+ @SuppressWarnings("serial")
private class MyPanel extends JPanel {
GeneralPath gp1 = new GeneralPath();
Modified: trunk/gui/src/test/org/jnode/test/gui/DialogTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/DialogTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/DialogTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -28,6 +28,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+...@suppresswarnings("serial")
public class DialogTest extends Dialog {
Modified: trunk/gui/src/test/org/jnode/test/gui/Editor.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/Editor.java 2009-05-24 02:05:31 UTC
(rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/Editor.java 2009-05-24 05:17:23 UTC
(rev 5516)
@@ -48,6 +48,7 @@
/**
* @author Levente S\u00e1ntha
*/
+...@suppresswarnings("serial")
public class Editor extends JFrame {
private static Logger logger = Logger.getLogger(Editor.class);
private JTextArea textArea;
Modified: trunk/gui/src/test/org/jnode/test/gui/GlyphTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/GlyphTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/GlyphTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -114,6 +114,7 @@
}
}
+ @SuppressWarnings("unused")
private static Kernel createKernel(int width) {
final float[] mtx = new float[width * width];
final int center = width - 1 / 2;
@@ -136,6 +137,7 @@
return new Kernel(width, width, mtx);
}
+ @SuppressWarnings("unused")
private static void printSum(Kernel kernel) {
float v = 0.0f;
float[] mtx = kernel.getKernelData(null);
@@ -145,6 +147,7 @@
System.out.println("mtx " + v);
}
+ @SuppressWarnings("unused")
private static void fill(Shape shape, BufferedImage img) {
final Graphics2D g = (Graphics2D) img.getGraphics();
// g.draw(shape);
@@ -161,6 +164,7 @@
}
}
+ @SuppressWarnings("serial")
public static class ImageViewer extends Component {
private final BufferedImage[] images;
@@ -203,6 +207,7 @@
}
}
+ @SuppressWarnings("serial")
public static class RasterViewer extends ImageViewer {
/**
@@ -260,6 +265,7 @@
}
+ @SuppressWarnings("serial")
public static class MasterViewer extends ImageViewer {
/**
@@ -283,6 +289,7 @@
}
}
+ @SuppressWarnings("serial")
public static class ShapeViewer extends Component {
private final Shape shape;
Modified: trunk/gui/src/test/org/jnode/test/gui/Graphics2DSurface.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/Graphics2DSurface.java
2009-05-24 02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/Graphics2DSurface.java
2009-05-24 05:17:23 UTC (rev 5516)
@@ -34,6 +34,7 @@
import javax.swing.JFrame;
import org.jnode.awt.font.FontProvider;
import org.jnode.awt.font.TextRenderer;
+import org.jnode.awt.font.bdf.BDFFont;
import org.jnode.awt.font.bdf.BDFFontProvider;
import org.jnode.driver.video.Surface;
@@ -99,13 +100,14 @@
}
public static void main(String[] argv) {
- FontProvider fp = new BDFFontProvider();
- Set<Font> obj = fp.getAllFonts();
+ FontProvider<BDFFont> fp = new BDFFontProvider();
+ Set<? extends Font> obj = fp.getAllFonts();
System.out.println(obj);
final TextRenderer tr = fp.getTextRenderer(obj.iterator().next());
final AffineTransform tf = AffineTransform.getTranslateInstance(0, 0);
JFrame f = new JFrame("BDF Test");
f.add(new JComponent() {
+ private static final long serialVersionUID = 1L;
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
Modified: trunk/gui/src/test/org/jnode/test/gui/GraphicsTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/GraphicsTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/GraphicsTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -45,6 +45,7 @@
}
}
+ @SuppressWarnings("serial")
static class TestComponent extends Component {
public void paint(Graphics g) {
Modified: trunk/gui/src/test/org/jnode/test/gui/ImageIOTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/ImageIOTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/ImageIOTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -30,6 +30,7 @@
* @author Levente S\u00e1ntha
*/
public class ImageIOTest {
+ @SuppressWarnings("serial")
public static void main(String[] argv) throws Exception {
if (argv.length == 0) {
System.out.println("org.jnode.test.gui.ImageIOTest <image file>");
Modified: trunk/gui/src/test/org/jnode/test/gui/ImageTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/ImageTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/ImageTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -36,6 +36,7 @@
static final String IMAGE_PATH = "/org/zaval/lw/rs/img/tree.gif";
+ @SuppressWarnings("serial")
static class TestComponent extends Component implements ImageObserver {
private final Image img;
Modified: trunk/gui/src/test/org/jnode/test/gui/PolyLineTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/PolyLineTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/PolyLineTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -55,6 +55,7 @@
}
}
+ @SuppressWarnings("serial")
static class TestComponent extends Component {
private final double[] linePoints;
Modified: trunk/gui/src/test/org/jnode/test/gui/QuadCurveTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/QuadCurveTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/QuadCurveTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -50,6 +50,7 @@
}
}
+ @SuppressWarnings("serial")
static class TestComponent extends Component {
public void paint(Graphics g) {
Modified: trunk/gui/src/test/org/jnode/test/gui/RobotTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/RobotTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/RobotTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -46,6 +46,7 @@
/**
* @author Levente S\u00e1ntha
*/
+...@suppresswarnings("serial")
public class RobotTest extends JPanel {
private static BufferedImage image;
private static Color crtColor = Color.BLACK;
Modified: trunk/gui/src/test/org/jnode/test/gui/SwingMenuTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/SwingMenuTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/SwingMenuTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -27,6 +27,7 @@
/**
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
+...@suppresswarnings("serial")
public class SwingMenuTest extends SwingTest {
/**
Modified: trunk/gui/src/test/org/jnode/test/gui/SwingTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/SwingTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/SwingTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -30,6 +30,7 @@
/**
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
+...@suppresswarnings("serial")
public class SwingTest extends JFrame {
private final JButton north;
Modified: trunk/gui/src/test/org/jnode/test/gui/TTFFileTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/TTFFileTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/TTFFileTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -48,6 +48,7 @@
static TTFFontData ttf;
+ @SuppressWarnings("serial")
public static void main(String[] args) throws Exception {
String fontName = "luxisr.ttf";
Modified: trunk/gui/src/test/org/jnode/test/gui/TextFieldTest.java
===================================================================
--- trunk/gui/src/test/org/jnode/test/gui/TextFieldTest.java 2009-05-24
02:05:31 UTC (rev 5515)
+++ trunk/gui/src/test/org/jnode/test/gui/TextFieldTest.java 2009-05-24
05:17:23 UTC (rev 5516)
@@ -30,6 +30,7 @@
/**
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
+...@suppresswarnings("serial")
public class TextFieldTest extends Frame {
public TextFieldTest() {
Modified: trunk/gui/src/thinlet/thinlet/ThinTest.java
===================================================================
--- trunk/gui/src/thinlet/thinlet/ThinTest.java 2009-05-24 02:05:31 UTC (rev
5515)
+++ trunk/gui/src/thinlet/thinlet/ThinTest.java 2009-05-24 05:17:23 UTC (rev
5516)
@@ -9,6 +9,7 @@
*
* @author Levente S\u00e1ntha
*/
+...@suppresswarnings("serial")
public class ThinTest extends Thinlet {
private static final String MARKUP =
"<panel gap=\"4\" top=\"4\" left=\"4\">" + "<button text=\"Button
Test\"/>"
Modified: trunk/gui/src/thinlet/thinlet/Thinlet.java
===================================================================
--- trunk/gui/src/thinlet/thinlet/Thinlet.java 2009-05-24 02:05:31 UTC (rev
5515)
+++ trunk/gui/src/thinlet/thinlet/Thinlet.java 2009-05-24 05:17:23 UTC (rev
5516)
@@ -56,6 +56,7 @@
/**
*
*/
+...@suppresswarnings("serial")
public class Thinlet extends Container
implements Runnable, Serializable {
@@ -2688,9 +2689,9 @@
Rectangle bounds = getRectangle(mouseinside,
"bounds");
try { // mouse wheel is supported since 1.4
thus it use reflection
if (wheelrotation == null) {
- wheelrotation =
e.getClass().getMethod("getWheelRotation", null);
+ wheelrotation =
e.getClass().getMethod("getWheelRotation");
}
- int rotation = ((Integer)
wheelrotation.invoke(e, null)).intValue();
+ int rotation = ((Integer)
wheelrotation.invoke(e)).intValue();
if (port.x + port.width < bounds.width)
{ // has vertical scrollbar
processScroll(mouseinside,
(rotation > 0) ? "down" : "up"); //TODO scroll panels too
@@ -2725,11 +2726,13 @@
ke.consume();
} else if (MOUSE_WHEEL != 0) { // 1.4
if (!ke.isShiftDown()) {
- transferFocus();
+ transferFocus();
}
- else { try {
-
getClass().getMethod("transferFocusBackward", null). invoke(this, null);
- } catch (Exception exc) { /*
never */ } }
+ else {
+ try {
+
getClass().getMethod("transferFocusBackward"). invoke(this);
+ } catch (Exception exc) {
/* never */ }
+ }
}
repaint(focusowner);
closeup();
@@ -5260,16 +5263,17 @@
* @param key the client property key
* @param value the new client property value
*/
- public void putProperty(Object component, Object key, Object value) {
- Object table = get(component, ":bind");
+ @SuppressWarnings("unchecked")
+ public void putProperty(Object component, Object key, Object value) {
+ Hashtable<Object, Object> table = (Hashtable<Object, Object>)
get(component, ":bind");
if (value != null) {
if (table == null) {
- set(component, ":bind", table = new
Hashtable());
+ set(component, ":bind", table = new
Hashtable<Object, Object>());
}
- ((Hashtable) table).put(key, value);
+ table.put(key, value);
}
else if (table != null) {
- ((Hashtable) table).remove(key);
+ table.remove(key);
}
}
@@ -5282,7 +5286,7 @@
*/
public Object getProperty(Object component, Object key) {
Object table = get(component, ":bind");
- return (table != null) ? ((Hashtable) table).get(key) : null;
+ return (table != null) ? ((Hashtable<?, ?>) table).get(key) :
null;
}
// ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- -----
-----
@@ -5363,7 +5367,7 @@
* @param name of the tag
* @param attributelist a list of attributes including keys and value
pairs
*/
- protected void startElement(String name, Hashtable attributelist) {}
+ protected void startElement(String name, Hashtable<?,?> attributelist)
{}
/**
* The SAX-like parser calls this method, you have to overwrite it
@@ -5462,8 +5466,8 @@
try {
Object[] parentlist = null;
Object current = null;
- Hashtable attributelist = null;
- Vector methods = (validate && !dom) ? new Vector() :
null;
+ Hashtable<String, String> attributelist = null;
+ Vector<Object> methods = (validate && !dom) ? new
Vector<Object>() : null;
StringBuffer text = new StringBuffer();
for (int c = reader.read(); c != -1;) {
if (c == '<') {
@@ -5613,7 +5617,7 @@
if
(dom) {
set(current, key.intern(), text.toString());
} else {
-
if (attributelist == null) { attributelist = new Hashtable(); }
+
if (attributelist == null) { attributelist = new Hashtable<String, String>(); }
attributelist.put(key, text.toString());
}
}
@@ -5621,7 +5625,9 @@
text.setLength(0);
c =
reader.read();
}
- else throw new
IllegalArgumentException();
+ else {
+ throw new
IllegalArgumentException();
+ }
}
}
}
@@ -5647,7 +5653,7 @@
/**
*
*/
- private void finishParse(Vector methods, Object root, Object handler) {
+ private void finishParse(Vector<Object> methods, Object root, Object
handler) {
if (methods != null) {
for (int i = 0; i < methods.size(); i += 3) {
Object component = methods.elementAt(i);
@@ -5734,7 +5740,7 @@
*
* @throws java.lang.IllegalArgumentException
*/
- private void addAttribute(Object component, String key, String value,
Vector lasts) {
+ private void addAttribute(Object component, String key, String value,
Vector<Object> lasts) {
// replace value found in the bundle
if ((resourcebundle != null) && value.startsWith("i18n.")) {
value = resourcebundle.getString(value.substring(5));
@@ -6106,7 +6112,7 @@
String methodname = st.nextToken();
int n = st.countTokens();
Object[] data = new Object[2 + 3 * n];
- Class[] parametertypes = (n > 0) ? new Class[n] : null;
+ Class<?>[] parametertypes = (n > 0) ? new Class[n] : null;
for (int i = 0; i < n; i++) {
String arg = st.nextToken();
if ("thinlet".equals(arg)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Jnode-svn-commits mailing list
Jnode-svn-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits
