Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5503] trunk/fs/src
|
From: <cr...@us...> - 2009-05-23 04:54:58
|
Revision: 5503
http://jnode.svn.sourceforge.net/jnode/?rev=5503&view=rev
Author: crawley
Date: 2009-05-23 04:54:30 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Fixing compiler warnings, etc
Modified Paths:
--------------
trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java
trunk/fs/src/driver/org/jnode/driver/block/Geometry.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/DefaultFDC.java
trunk/fs/src/driver/org/jnode/driver/block/floppy/FloppyException.java
trunk/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskDriver.java
trunk/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEIO.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEException.java
trunk/fs/src/driver/org/jnode/driver/bus/ide/command/IDEReadSectorsCommand.java
trunk/fs/src/driver/org/jnode/driver/bus/scsi/SCSIException.java
trunk/fs/src/fs/org/jnode/fs/fat/BootSector.java
trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java
trunk/fs/src/test/org/jnode/test/fs/GeometryTest.java
trunk/fs/src/test/org/jnode/test/fs/IDETest.java
trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java
trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestSuite.java
trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockFloppyDeviceFactory.java
trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockIDEDeviceFactory.java
trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubNameSpace.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FileParam.java
trunk/fs/src/test/org/jnode/test/fs/filesystem/config/RamDiskParam.java
trunk/fs/src/test/org/jnode/test/fs/ntfs/NTFSUnitTest.java
trunk/fs/src/test/org/jnode/test/support/AbstractTest.java
trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java
trunk/fs/src/test/org/jnode/test/support/CGLibCoreMockExt.java
trunk/fs/src/test/org/jnode/test/support/ConfigManager.java
trunk/fs/src/test/org/jnode/test/support/ContextManager.java
trunk/fs/src/test/org/jnode/test/support/MockObjectFactory.java
trunk/fs/src/test/org/jnode/test/support/MockUtils.java
trunk/fs/src/test/org/jnode/test/support/TestConfig.java
Added Paths:
-----------
trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java
Modified: trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/block/BlockAlignmentSupport.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -22,7 +22,6 @@
import java.io.IOException;
import java.nio.ByteBuffer;
-import org.apache.log4j.Logger;
import org.jnode.util.ByteBufferUtils;
/**
@@ -234,10 +233,6 @@
* gvt
*/
public class BlockAlignmentSupport implements BlockDeviceAPI {
- /**
- * My logger
- */
- private static final Logger log = Logger.getLogger(BlockAlignmentSupport.class);
private static final int EMPTY = 0;
private static final int CONTAINED = 1;
@@ -246,7 +241,6 @@
private final BlockDeviceAPI parentApi;
private int alignment;
- private boolean dolog = false;
/**
@@ -264,11 +258,6 @@
}
- private void mylog(String msg) {
- log.debug(msg);
- }
-
-
/**
* @return The length
* @throws IOException
Modified: trunk/fs/src/driver/org/jnode/driver/block/Geometry.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/Geometry.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/block/Geometry.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -20,7 +20,6 @@
package org.jnode.driver.block;
-import java.io.IOException;
/**
* @author epr
@@ -143,16 +142,4 @@
}
return new CHS(c, h, s);
}
-
- public static class GeometryException extends IOException {
-
- public GeometryException(String message) {
- super(message);
- }
-
- public GeometryException(String message, Throwable t) {
- super(message);
- initCause(t);
- }
- }
}
Added: trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java (rev 0)
+++ trunk/fs/src/driver/org/jnode/driver/block/GeometryException.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -0,0 +1,40 @@
+/*
+ * $Id: Geometry.java 4975 2009-02-02 08:30:52Z lsantha $
+ *
+ * Copyright (C) 2003-2009 JNode.org
+ *
+ * This library is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; If not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+package org.jnode.driver.block;
+
+import java.io.IOException;
+
+/**
+ *
+ * @author epr
+ */
+public class GeometryException extends IOException {
+
+ private static final long serialVersionUID = 1L;
+
+ public GeometryException(String message) {
+ super(message);
+ }
+
+ public GeometryException(String message, Throwable t) {
+ super(message);
+ initCause(t);
+ }
+}
\ No newline at end of file
Modified: trunk/fs/src/driver/org/jnode/driver/block/floppy/DefaultFDC.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/floppy/DefaultFDC.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/block/floppy/DefaultFDC.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -579,8 +579,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/fs/src/driver/org/jnode/driver/block/floppy/FloppyException.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/floppy/FloppyException.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/block/floppy/FloppyException.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -25,6 +25,8 @@
*/
public class FloppyException extends Exception {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskDriver.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskDriver.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/block/ide/disk/IDEDiskDriver.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -89,6 +89,7 @@
final IDEDevice dev = (IDEDevice) getDevice();
diskBus = new IDEDiskBus(dev);
/* Register the IDEDevice API */
+ // FIXME - something is wrong with the typing here I think.
dev.registerAPI(PartitionableBlockDeviceAPI.class, new PartitionableBlockAlignmentSupport(this, SECTOR_SIZE));
/* Get basic configuration */
final IDEDriveDescriptor descr = dev.getDescriptor();
Modified: trunk/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/block/usb/storage/scsi/USBStorageSCSIDriver.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.io.InterruptedIOException;
import java.nio.ByteBuffer;
-import org.apache.log4j.Logger;
import org.jnode.driver.Device;
import org.jnode.driver.DeviceAlreadyRegisteredException;
import org.jnode.driver.DeviceManager;
@@ -48,11 +47,6 @@
public class USBStorageSCSIDriver extends Driver
implements FSBlockDeviceAPI, RemovableDeviceAPI, SCSIHostControllerAPI, USBPipeListener, USBStorageConstants {
- /**
- * My logger
- */
- private static final Logger log = Logger.getLogger(USBStorageSCSIDriver.class);
-
/** */
private final FSBlockAlignmentSupport blockAlignment;
Modified: trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEIO.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEIO.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/bus/ide/DefaultIDEIO.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -388,10 +388,8 @@
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/fs/src/driver/org/jnode/driver/bus/ide/IDEException.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEException.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEException.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -25,6 +25,8 @@
*/
public class IDEException extends Exception {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/fs/src/driver/org/jnode/driver/bus/ide/command/IDEReadSectorsCommand.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/bus/ide/command/IDEReadSectorsCommand.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/bus/ide/command/IDEReadSectorsCommand.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -33,7 +33,6 @@
private final ByteBuffer buf;
private int readSectors;
- private static long total = 0;
public IDEReadSectorsCommand(boolean primary, boolean master, long lbaStart, int sectors, ByteBuffer dest) {
super(primary, master, lbaStart, sectors);
@@ -57,7 +56,7 @@
setError(io.getErrorReg());
} else {
if ((state & (ST_BUSY | ST_DEVICE_READY)) == ST_DEVICE_READY) {
- final int offset = readSectors * SECTOR_SIZE;
+ // final int offset = readSectors * SECTOR_SIZE;
for (int i = 0; i < 256; i++) {
final int v = io.getDataReg();
buf.put((byte) (v & 0xFF));
Modified: trunk/fs/src/driver/org/jnode/driver/bus/scsi/SCSIException.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/bus/scsi/SCSIException.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/driver/org/jnode/driver/bus/scsi/SCSIException.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -28,6 +28,8 @@
*/
public class SCSIException extends IOException {
+ private static final long serialVersionUID = 1L;
+
/**
*
*/
Modified: trunk/fs/src/fs/org/jnode/fs/fat/BootSector.java
===================================================================
--- trunk/fs/src/fs/org/jnode/fs/fat/BootSector.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/fs/org/jnode/fs/fat/BootSector.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -25,7 +25,7 @@
import org.jnode.driver.block.BlockDeviceAPI;
import org.jnode.driver.block.Geometry;
-import org.jnode.driver.block.Geometry.GeometryException;
+import org.jnode.driver.block.GeometryException;
import org.jnode.partitions.ibm.IBMPartitionTable;
import org.jnode.partitions.ibm.IBMPartitionTableEntry;
import org.jnode.partitions.ibm.IBMPartitionTypes;
Modified: trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/fs/hfsplus/HfsPlusFileSystemTest.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -62,9 +62,9 @@
HfsPlusFileSystem fs = new HfsPlusFileSystem(device, false, type);
HFSPlusParams params = new HFSPlusParams();
params.setVolumeName("testdrive");
- params.setBlockSize(params.OPTIMAL_BLOCK_SIZE);
+ params.setBlockSize(HFSPlusParams.OPTIMAL_BLOCK_SIZE);
params.setJournaled(false);
- params.setJournalSize(params.DEFAULT_JOURNAL_SIZE);
+ params.setJournalSize(HFSPlusParams.DEFAULT_JOURNAL_SIZE);
fs.create(params);
} catch (Exception e) {
e.printStackTrace();
@@ -79,6 +79,7 @@
false);
fs.read();
fs.createRootEntry();
+ @SuppressWarnings("unused")
FSDirectory root = fs.getRootEntry().getDirectory();
} catch (FileNotFoundException e) {
e.printStackTrace();
Modified: trunk/fs/src/test/org/jnode/test/fs/GeometryTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/GeometryTest.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/GeometryTest.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.jnode.driver.block.CHS;
import org.jnode.driver.block.Geometry;
-import org.jnode.driver.block.Geometry.GeometryException;
+import org.jnode.driver.block.GeometryException;
/**
* @author epr
Modified: trunk/fs/src/test/org/jnode/test/fs/IDETest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/IDETest.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/IDETest.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -44,7 +44,7 @@
final String name = (args.length > 0) ? args[0] : "hda";
IDEDevice dev = (IDEDevice) dm.getDevice(name);
- IDEDeviceAPI api = dev.getAPI(IDEDeviceAPI.class);
+ IDEDeviceAPI<?> api = dev.getAPI(IDEDeviceAPI.class);
IDEDriveDescriptor descr = dev.getDescriptor();
System.out.println("LBA support : " + descr.supportsLBA());
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestConfig.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -41,7 +41,7 @@
private final List<Partition> partitions = new ArrayList<Partition>();
- public BlockDeviceAPITestConfig(Class contextClass) {
+ public BlockDeviceAPITestConfig(Class<?> contextClass) {
this.contextClass = contextClass;
}
@@ -50,8 +50,7 @@
}
public Partition[] getPartitions() {
- return partitions
- .toArray(new Partition[partitions.size()]);
+ return partitions.toArray(new Partition[partitions.size()]);
}
/**
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestSuite.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestSuite.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/BlockDeviceAPITestSuite.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -22,6 +22,9 @@
import java.util.ArrayList;
import java.util.List;
+
+import junit.framework.TestCase;
+
import org.jnode.test.fs.driver.context.ByteArrayDeviceContext;
import org.jnode.test.fs.driver.context.FileDeviceContext;
import org.jnode.test.fs.driver.context.FloppyDriverContext;
@@ -79,13 +82,14 @@
return configs;
}
- protected BlockDeviceAPITestConfig addConfig(List<TestConfig> configs, Class contextClass) {
+ protected BlockDeviceAPITestConfig addConfig(List<TestConfig> configs, Class<?> contextClass) {
BlockDeviceAPITestConfig cfg = new BlockDeviceAPITestConfig(contextClass);
configs.add(cfg);
return cfg;
}
- public Class[] getTestSuites() {
+ @SuppressWarnings("unchecked")
+ public Class<? extends TestCase>[] getTestSuites() {
return new Class[]{BlockDeviceAPITest.class};
}
}
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockFloppyDeviceFactory.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockFloppyDeviceFactory.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockFloppyDeviceFactory.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -67,6 +67,7 @@
////////////////////////////////////////////////////
public FloppyDevice createDevice(FloppyControllerBus bus, int drive, FloppyDriveParameters dp) {
+ @SuppressWarnings("unused")
MockInitializer initializer = new MockInitializer() {
public void init(Mock mockFloppyDevice) {
// mockFloppyDevice.expects(testCase.atLeastOnce()).method("setDriver").withAnyArguments().will(
@@ -84,9 +85,9 @@
};
- Class[] argCls = new Class[]{FloppyControllerBus.class, int.class, FloppyDriveParameters.class};
- Object[] args = new Object[]{bus, new Integer(drive), dp};
- //return (FloppyDevice) MockUtils.createMockObject(FloppyDevice.class, initializer, argCls, args);
+// Class<?>[] argCls = new Class[]{FloppyControllerBus.class, int.class, FloppyDriveParameters.class};
+// Object[] args = new Object[]{bus, new Integer(drive), dp};
+// return (FloppyDevice) MockUtils.createMockObject(FloppyDevice.class, initializer, argCls, args);
return new FloppyDevice(bus, drive, dp);
}
@@ -131,7 +132,7 @@
public FloppyDriveParametersCommand createFloppyDriveParametersCommand(int drive, FloppyDriveParameters dp,
FloppyParameters fp) {
- Class[] argCls = new Class[]{int.class, FloppyDriveParameters.class, FloppyParameters.class};
+ Class<?>[] argCls = new Class[]{int.class, FloppyDriveParameters.class, FloppyParameters.class};
Object[] args = new Object[]{new Integer(drive), dp, fp};
MockInitializer initializer = new MockInitializer() {
public void init(Mock mockCmd) {
@@ -146,7 +147,7 @@
}
public FloppySeekCommand createFloppySeekCommand(int drive, int cylinder) {
- Class[] argCls = new Class[]{int.class, int.class};
+ Class<?>[] argCls = new Class[]{int.class, int.class};
Object[] args = new Object[]{new Integer(drive), new Integer(cylinder)};
MockInitializer initializer = new MockInitializer() {
public void init(Mock mockFloppyDevice) {
@@ -164,7 +165,7 @@
public FloppyReadSectorCommand createFloppyReadSectorCommand(int drive, Geometry geometry, CHS chs,
int currentSectorSize, boolean b, int gap1Size,
byte[] dest, int destOffset) {
- Class[] argCls = new Class[]{int.class, Geometry.class, CHS.class, int.class, boolean.class, int.class,
+ Class<?>[] argCls = new Class[]{int.class, Geometry.class, CHS.class, int.class, boolean.class, int.class,
byte[].class, int.class};
Object[] args = new Object[]{new Integer(drive), geometry, chs, new Integer(currentSectorSize),
Boolean.valueOf(b), new Integer(gap1Size), dest, new Integer(destOffset)};
@@ -183,7 +184,7 @@
public FloppyWriteSectorCommand createFloppyWriteSectorCommand(int drive, Geometry geometry, CHS chs,
int currentSectorSize, boolean b, int gap1Size,
byte[] src, int srcOffset) {
- Class[] argCls = new Class[]{int.class, Geometry.class, CHS.class, int.class, boolean.class, int.class,
+ Class<?>[] argCls = new Class[]{int.class, Geometry.class, CHS.class, int.class, boolean.class, int.class,
byte[].class, int.class};
Object[] args = new Object[]{new Integer(drive), geometry, chs, new Integer(currentSectorSize),
Boolean.valueOf(b), new Integer(gap1Size), src, new Integer(srcOffset)};
@@ -200,7 +201,7 @@
}
public FloppyIdCommand createFloppyIdCommand(int drive) {
- Class[] argCls = new Class[]{int.class};
+ Class<?>[] argCls = new Class[]{int.class};
Object[] args = new Object[]{new Integer(drive)};
MockInitializer initializer = new MockInitializer() {
public void init(Mock mockCmd) {
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockIDEDeviceFactory.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockIDEDeviceFactory.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/factories/MockIDEDeviceFactory.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -65,7 +65,7 @@
}
};
- Class[] argCls = new Class[]{Device.class, boolean.class};
+ Class<?>[] argCls = new Class[]{Device.class, boolean.class};
Object[] args = new Object[]{parent, Boolean.valueOf(primary)};
return (IDEBus) MockUtils.createMockObject(IDEBus.class, initializer,
@@ -118,7 +118,7 @@
}
};
- Class[] argCls = new Class[]{byte[].class, int.class};
+ Class<?>[] argCls = new Class[]{byte[].class, int.class};
Object[] args = new Object[]{new byte[IDEConstants.SECTOR_SIZE],
new Integer(partNum)};
@@ -137,7 +137,6 @@
return buffer.append("get partition entry");
}
- @SuppressWarnings("unchecked")
public Object invoke(Invocation invocation) throws Throwable {
int index = ((Integer) invocation.parameterValues.get(0))
.intValue();
@@ -165,7 +164,7 @@
}
};
- Class[] argCls = new Class[]{byte[].class, Device.class};
+ Class<?>[] argCls = new Class[]{byte[].class, Device.class};
Object[] args = new Object[]{bs, dev};
return (IBMPartitionTable) MockUtils.createMockObject(
Modified: trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubNameSpace.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubNameSpace.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/driver/stubs/StubNameSpace.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -47,7 +47,6 @@
return super.lookup(name);
}
- @SuppressWarnings("unchecked")
protected <T> void createAndBindMockService(Class<T> name) {
try {
bind(name, MockUtils.createMockObject(name));
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/AbstractFSTest.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -67,7 +67,7 @@
//public static final int FILE_SIZE_IN_WORDS = 256 * 1024; // 512 Ko = 256 K Words
public static final int FILE_SIZE_IN_WORDS = 128; // 512 Ko = 128 K Words
- private FileSystem fs;
+ private FileSystem<?> fs;
protected FSTestConfig config;
private Device device;
@@ -148,7 +148,7 @@
/**
* @return Returns the fs.
*/
- protected final FileSystem getFs() {
+ protected final FileSystem<?> getFs() {
return fs;
}
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FSTestConfig.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -54,7 +54,7 @@
/**
* @return
*/
- public Class<? extends FileSystem> getFsClass() {
+ public Class<? extends FileSystem<?>> getFsClass() {
return fs.getType().getFsClass();
}
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FileParam.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FileParam.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/FileParam.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -31,18 +31,15 @@
* @author Fabien DUMINY
*/
public class FileParam extends DeviceParam {
- /**
- *
- *
- */
+
+ private File file;
+ private long fileSize;
+
public FileParam(String fileName, String fileSize) {
setFile(new File(fileName));
setSize(fileSize);
}
- /**
- *
- */
public Device createDevice() throws IOException {
String mode = isInput() ? "r" : "rw";
if (!isInput() && (fileSize > 0L) && (!file.exists() || (file.length() != fileSize)))
@@ -51,9 +48,6 @@
return new FileDevice(file, mode);
}
- /**
- *
- */
public long getDeviceSize() {
return fileSize;
}
@@ -72,21 +66,13 @@
this.fileSize = NumberUtils.getSize(size);
}
- /**
- *
- */
public void tearDown(Device device) {
if (!isInput())
file.delete();
}
- /**
- *
- */
public String toString() {
- return "File[" + file.getName() + ' ' + NumberUtils.size(fileSize) + "]";
+ return "File[" + file.getName() + ' ' + NumberUtils.toBinaryByte(fileSize) + "]";
}
- private File file;
- private long fileSize;
}
Modified: trunk/fs/src/test/org/jnode/test/fs/filesystem/config/RamDiskParam.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/filesystem/config/RamDiskParam.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/filesystem/config/RamDiskParam.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -27,10 +27,7 @@
* @author Fabien DUMINY
*/
public class RamDiskParam extends JNodeDeviceParam {
- /**
- *
- *
- */
+
public RamDiskParam() {
}
@@ -41,18 +38,12 @@
ramdiskSize = NumberUtils.getSize(size);
}
- /**
- *
- */
public long getSize() {
return ramdiskSize;
}
- /**
- *
- */
public String toString() {
- return "Ramdisk[" + getDeviceName() + ' ' + NumberUtils.size(ramdiskSize) + "]";
+ return "Ramdisk[" + getDeviceName() + ' ' + NumberUtils.toDecimalByte(ramdiskSize) + "]";
}
private long ramdiskSize;
Modified: trunk/fs/src/test/org/jnode/test/fs/ntfs/NTFSUnitTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/fs/ntfs/NTFSUnitTest.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/fs/ntfs/NTFSUnitTest.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -68,7 +68,7 @@
try {
File file = new File(TEST_IMAGE_FILENAME_1);
Device device = new FileDevice(file, "r");
- FileSystem fileSystem = new NTFSFileSystemType().create(device, true);
+ FileSystem<?> fileSystem = new NTFSFileSystemType().create(device, true);
FSDirectory root = fileSystem.getRootEntry().getDirectory();
// Check the big file. Every byte should be readable as zero, hopefully.
@@ -109,7 +109,7 @@
try {
File file = new File(TEST_IMAGE_FILENAME_2);
Device device = new FileDevice(file, "r");
- FileSystem fileSystem = new NTFSFileSystemType().create(device, true);
+ FileSystem<?> fileSystem = new NTFSFileSystemType().create(device, true);
FSDirectory root = fileSystem.getRootEntry().getDirectory();
// The first file has 256 bytes of real data at the front, and the rest is sparse.
Modified: trunk/fs/src/test/org/jnode/test/support/AbstractTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/AbstractTest.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/AbstractTest.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -28,11 +28,11 @@
*/
public abstract class AbstractTest extends /*TestCase*/ MockObjectTestCase {
private TestConfig testConfig;
- private Class configClazz;
+ private Class<?> configClazz;
protected final Logger log;
- public AbstractTest(Class configClazz) {
+ public AbstractTest(Class<?> configClazz) {
super();
init(configClazz, null);
log = Logger.getLogger(getTestName());
@@ -41,13 +41,13 @@
/**
*
*/
- protected AbstractTest(Class configClazz, String name) {
+ protected AbstractTest(Class<?> configClazz, String name) {
super();
init(configClazz, name);
log = Logger.getLogger(getTestName());
}
- protected void init(Class configClazz, String name) {
+ protected void init(Class<?> configClazz, String name) {
setName(name);
ContextManager.getInstance().init();
this.configClazz = configClazz;
@@ -64,7 +64,7 @@
log.warn("NO CONFIGURATION");
ContextManager.getInstance().clearContext();
} else {
- Class contextClass = tc.getContextClass();
+ Class<?> contextClass = tc.getContextClass();
if (!Context.class.isAssignableFrom(contextClass))
throw new IllegalArgumentException(
"contextClass(" + contextClass.getName() + ") must implements Context");
Modified: trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/AbstractTestSuite.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -21,6 +21,8 @@
package org.jnode.test.support;
import java.util.List;
+
+import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.log4j.Logger;
@@ -36,7 +38,7 @@
*/
public final void init() {
List<TestConfig> configs = getConfigs();
- Class[] testSuites = getTestSuites();
+ Class<? extends TestCase>[] testSuites = getTestSuites();
log.info(configs.size() + " configs, " +
testSuites.length + " TestSuites");
@@ -45,7 +47,7 @@
for (TestConfig cfg : configs) {
cfgManager.addConfig(cfg);
- for (Class cls : testSuites) {
+ for (Class<? extends TestCase> cls : testSuites) {
addTestSuite(cls);
}
}
@@ -59,7 +61,7 @@
/**
* @return an array of TestSuite classes
*/
- public abstract Class[] getTestSuites();
+ public abstract Class<? extends TestCase>[] getTestSuites();
protected final Logger log = Logger.getLogger(getClass().getName());
}
Modified: trunk/fs/src/test/org/jnode/test/support/CGLibCoreMockExt.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/CGLibCoreMockExt.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/CGLibCoreMockExt.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -36,11 +36,11 @@
private Object proxy = null;
- public CGLibCoreMockExt(Class mockedClass, String name) {
+ public CGLibCoreMockExt(Class<?> mockedClass, String name) {
super(mockedClass, name);
}
- public CGLibCoreMockExt(Class mockedClass, String name,
+ public CGLibCoreMockExt(Class<?> mockedClass, String name,
InvocationDispatcher invocationDispatcher) {
super(mockedClass, name, invocationDispatcher);
}
@@ -49,7 +49,7 @@
return getMockedType().getClassLoader();
}
- protected Enhancer createEnhancer(Class mockedClass) {
+ protected Enhancer createEnhancer(Class<?> mockedClass) {
Enhancer enhancer = new Enhancer();
enhancer.setClassLoader(getClassLoader());
enhancer.setSuperclass(mockedClass);
@@ -65,7 +65,7 @@
return createProxy(new Class[0], new Object[0]);
}
- public Object createProxy(Class[] argumentTypes, Object[] arguments) {
+ public Object createProxy(Class<?>[] argumentTypes, Object[] arguments) {
checkProxyCreationIsSupported();
proxy = createEnhancer(getMockedType())
.create(argumentTypes, arguments);
Modified: trunk/fs/src/test/org/jnode/test/support/ConfigManager.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/ConfigManager.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/ConfigManager.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -32,9 +32,8 @@
private static final Logger log = Logger.getLogger(ConfigManager.class);
private static ConfigManager instance;
- private static boolean log4jInitialized = false;
- private Map<Class, List<TestConfig>> configs;
+ private Map<Class<?>, List<TestConfig>> configs;
private Map<TestKey, Iterator<TestConfig>> iterators;
public static ConfigManager getInstance() {
@@ -55,7 +54,7 @@
cfgs.add(config);
}
- public TestConfig getConfig(Class configClazz, Class clazz, String testName) {
+ public TestConfig getConfig(Class<?> configClazz, Class<?> clazz, String testName) {
TestKey key = new TestKey(clazz, testName);
synchronized (iterators) {
@@ -72,16 +71,16 @@
}
private ConfigManager() {
- configs = new HashMap<Class, List<TestConfig>>();
+ configs = new HashMap<Class<?>, List<TestConfig>>();
iterators = new HashMap<TestKey, Iterator<TestConfig>>();
ContextManager.getInstance().init();
}
private static class TestKey {
- private Class clazz;
+ private Class<?> clazz;
private String testName;
- public TestKey(Class clazz, String testName) {
+ public TestKey(Class<?> clazz, String testName) {
this.clazz = clazz;
this.testName = testName;
}
Modified: trunk/fs/src/test/org/jnode/test/support/ContextManager.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/ContextManager.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/ContextManager.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -131,7 +131,7 @@
return context;
}
- public void setContext(Class contextClass, TestConfig config, MockObjectTestCase testCase) throws Exception {
+ public void setContext(Class<?> contextClass, TestConfig config, MockObjectTestCase testCase) throws Exception {
// first remove previous context
clearContext();
Modified: trunk/fs/src/test/org/jnode/test/support/MockObjectFactory.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/MockObjectFactory.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/MockObjectFactory.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -84,7 +84,7 @@
}
};
- Class[] clsArgs = {int[].class, boolean.class};
+ Class<?>[] clsArgs = {int[].class, boolean.class};
Object[] args = {data, atapi};
IDEDriveDescriptor desc = (IDEDriveDescriptor)
MockUtils.createMockObject(IDEDriveDescriptor.class,
@@ -110,7 +110,7 @@
}
public static Device createParentDevice() {
- Class[] clsArgs = new Class[]{Bus.class, String.class};
+ Class<?>[] clsArgs = new Class[]{Bus.class, String.class};
Object[] args = new Object[]{StubDeviceManager.INSTANCE.getSystemBus(), "MockDevice"};
return (Device) MockUtils.createMockObject(Device.class, clsArgs, args);
}
Modified: trunk/fs/src/test/org/jnode/test/support/MockUtils.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/MockUtils.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/MockUtils.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -42,11 +42,11 @@
return name.cast(mock.proxy());
}
- public static Object createMockObject(Class name, Class[] clsArgs, Object[] args) {
+ public static Object createMockObject(Class<?> name, Class<?>[] clsArgs, Object[] args) {
return createMockObject(name, null, clsArgs, args);
}
- public static Object createMockObject(Class name, MockInitializer initializer, Class[] clsArgs, Object[] args) {
+ public static Object createMockObject(Class<?> name, MockInitializer initializer, Class<?>[] clsArgs, Object[] args) {
String shortName = getShortName(name);
CGLibCoreMockExt cglibMock = new CGLibCoreMockExt(name, shortName);
Mock mock = new Mock(cglibMock);
Modified: trunk/fs/src/test/org/jnode/test/support/TestConfig.java
===================================================================
--- trunk/fs/src/test/org/jnode/test/support/TestConfig.java 2009-05-23 03:54:04 UTC (rev 5502)
+++ trunk/fs/src/test/org/jnode/test/support/TestConfig.java 2009-05-23 04:54:30 UTC (rev 5503)
@@ -24,7 +24,7 @@
* @author Fabien DUMINY
*/
public interface TestConfig {
- public Class getContextClass();
+ public Class<?> getContextClass();
/**
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
