Revision: 5504
http://jnode.svn.sourceforge.net/jnode/?rev=5504&view=rev
Author: crawley
Date: 2009-05-23 06:56:53 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Fixing compiler warnings
Modified Paths:
--------------
trunk/builder/src/builder/org/jnode/ant/taskdefs/Hotswap.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/PackageDirectory.java
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/SourceFile.java
trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
trunk/builder/src/builder/org/jnode/build/AddressFinder.java
trunk/builder/src/builder/org/jnode/build/BuildException.java
trunk/builder/src/builder/org/jnode/build/FieldInfo.java
trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java
trunk/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java
trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java
trunk/builder/src/builder/org/jnode/build/PluginList.java
Modified: trunk/builder/src/builder/org/jnode/ant/taskdefs/Hotswap.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/Hotswap.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/Hotswap.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -26,6 +26,8 @@
import com.sun.jdi.VirtualMachineManager;
import com.sun.jdi.connect.AttachingConnector;
import com.sun.jdi.connect.Connector;
+import com.sun.jdi.connect.Connector.Argument;
+
import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -96,7 +98,7 @@
protected String host;
protected String port;
protected String name;
- protected Vector filesets = new Vector();
+ protected Vector<FileSet> filesets = new Vector<FileSet>();
private boolean useSocket = true;
@@ -215,7 +217,7 @@
// load classes and replace them on target VM
for (int i = 0; i < filesets.size(); i++) {
- FileSet fs = (FileSet) filesets.elementAt(i);
+ FileSet fs = filesets.elementAt(i);
try {
DirectoryScanner ds = fs.getDirectoryScanner(getProject());
String[] files = ds.getIncludedFiles();
@@ -348,11 +350,11 @@
boolean useSocket = (port != null);
VirtualMachineManager manager = Bootstrap.virtualMachineManager();
- List connectors = manager.attachingConnectors();
+ List<AttachingConnector> connectors = manager.attachingConnectors();
AttachingConnector connector = null;
// System.err.println("Connectors available");
for (int i = 0; i < connectors.size(); i++) {
- AttachingConnector tmp = (AttachingConnector) connectors.get(i);
+ AttachingConnector tmp = connectors.get(i);
// System.err.println("conn "+i+" name="+tmp.name()+"
transport="+tmp.transport().name()+
// " description="+tmp.description());
if (!useSocket && tmp.transport().name().equals("dt_shmem")) {
@@ -368,7 +370,7 @@
throw new IllegalStateException("Cannot find shared memory
connector");
}
- Map args = connector.defaultArguments();
+ Map<String, Argument> args = connector.defaultArguments();
// Iterator iter = args.keySet().iterator();
// while (iter.hasNext()) {
// Object key = iter.next();
@@ -405,15 +407,15 @@
// load class(es)
byte[] classBytes = loadClassFile(classFile);
// redefine in JVM
- List classes = vm.classesByName(className);
+ List<ReferenceType> classes = vm.classesByName(className);
// if the class isn't loaded on the VM, can't do the replace.
if (classes == null || classes.size() == 0)
return;
// for now, just grab the first ref.
- ReferenceType refType = (ReferenceType) classes.get(0);
- HashMap map = new HashMap();
+ ReferenceType refType = classes.get(0);
+ HashMap<ReferenceType, byte[]> map = new HashMap<ReferenceType,
byte[]>();
map.put(refType, classBytes);
vm.redefineClasses(map);
// System.err.println("class replaced!");
Modified:
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/PackageDirectory.java
===================================================================
---
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/PackageDirectory.java
2009-05-23 04:54:30 UTC (rev 5503)
+++
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/PackageDirectory.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -26,7 +26,7 @@
/**
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
-public class PackageDirectory implements Comparable {
+public class PackageDirectory implements Comparable<Object> {
private final File baseDir;
private final String packageFileName;
Modified:
trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/SourceFile.java
===================================================================
--- trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/SourceFile.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/ant/taskdefs/classpath/SourceFile.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -26,7 +26,7 @@
/**
* @author Ewout Prangsma (e...@users.sourceforge.net)
*/
-final class SourceFile implements Comparable {
+final class SourceFile implements Comparable<Object> {
private final File baseDir;
private final String fileName;
Modified: trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/AbstractAsmConstBuilder.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -120,7 +120,7 @@
} else {
out.println("; VmClass: " + cn.getClassName());
- VmType vmClass = cl.loadClass(cn.getClassName(), true);
+ VmType<?> vmClass = cl.loadClass(cn.getClassName(), true);
vmClass.link();
String cname = vmClass.getName().replace('/', '.');
int idx = cname.lastIndexOf('.');
@@ -142,7 +142,7 @@
}
// The size
if (vmClass instanceof VmNormalClass) {
- final VmNormalClass cls = (VmNormalClass) vmClass;
+ final VmNormalClass<?> cls = (VmNormalClass<?>) vmClass;
out.println(cname + "_SIZE equ " + cls.getObjectSize());
}
//
Modified:
trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/AbstractBootImageBuilder.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -561,7 +561,7 @@
/* Set the bootclasses */
log("prepare bootClassArray", Project.MSG_VERBOSE);
- final VmType bootClasses[] = clsMgr.prepareAfterBootstrap();
+ final VmType<?> bootClasses[] = clsMgr.prepareAfterBootstrap();
os.getObjectRef(bootClasses);
emitObjects(os, arch, blockedObjects, false);
// Twice, this is intended!
@@ -704,7 +704,7 @@
if (!(obj instanceof Label)) {
unresolvedFound++;
if (obj instanceof VmType) {
- final VmType<?> vmtObj = (VmType) obj;
+ final VmType<?> vmtObj = (VmType<?>) obj;
vmtObj.link();
if (!vmtObj.isCompiled()) {
compileClasses(os, arch);
@@ -787,7 +787,7 @@
}
protected abstract void emitStaticInitializerCalls(NativeStream os,
- VmType[] bootClasses,
Object clInitCaller)
+ VmType<?>[]
bootClasses, Object clInitCaller)
throws ClassNotFoundException;
public final void execute() throws BuildException {
@@ -959,7 +959,7 @@
*/
public final VmType<?> loadClass(Class<?> c) throws ClassNotFoundException
{
String name = c.getName();
- VmType cls = clsMgr.findLoadedClass(name);
+ VmType<?> cls = clsMgr.findLoadedClass(name);
if (cls != null) {
return cls;
} else if (c.isPrimitive()) {
@@ -997,7 +997,7 @@
* @return The loaded class
* @throws ClassNotFoundException
*/
- public final VmType loadClass(String name)
+ public final VmType<?> loadClass(String name)
throws ClassNotFoundException {
return loadClass(name, true);
}
@@ -1010,7 +1010,7 @@
* @return The loaded class
* @throws ClassNotFoundException
*/
- public final VmType loadClass(String name, boolean resolve)
+ public final VmType<?> loadClass(String name, boolean resolve)
throws ClassNotFoundException {
/*
* if (clsMgr == null) { clsMgr = new VmClassLoader(classesURL);
@@ -1089,7 +1089,7 @@
* @throws BuildException
* @throws UnresolvedObjectRefException
*/
- protected final void printLabels(NativeStream os, VmType[] bootClasses,
+ protected final void printLabels(NativeStream os, VmType<?>[] bootClasses,
VmSharedStatics statics) throws
BuildException,
UnresolvedObjectRefException {
if (System.getProperty("bootimage.log") == null) {
@@ -1223,7 +1223,7 @@
* @throws BuildException
* @throws UnresolvedObjectRefException
*/
- protected final void logLargeClasses(VmType[] bootClasses) {
+ protected final void logLargeClasses(VmType<?>[] bootClasses) {
final Comparator<Long> reverseComp = Collections.reverseOrder();
final TreeMap<Long, VmType<?>> sortedTypes = new TreeMap<Long,
VmType<?>>(reverseComp);
for (VmType<?> vmType : bootClasses) {
@@ -1244,7 +1244,7 @@
int cnt = 1;
log("Large classes:");
for (Map.Entry<Long, VmType<?>> entry : sortedTypes.entrySet()) {
- log(" " + entry.getValue().getName() + " " +
NumberUtils.size(entry.getKey()));
+ log(" " + entry.getValue().getName() + " " +
NumberUtils.toBinaryByte(entry.getKey()));
if (++cnt > 10) {
return;
}
@@ -1539,7 +1539,7 @@
final String name = type.getName();
final int cnt = type.getNoDeclaredFields();
if ((cnt > 0) && !name.startsWith("java.")) {
- final Class javaType = Class.forName(type.getName());
+ final Class<?> javaType = Class.forName(type.getName());
try {
final FieldInfo fieldInfo = emitter.getFieldInfo(javaType);
final Field[] jdkFields = fieldInfo.getJdkStaticFields();
@@ -1606,7 +1606,7 @@
statics.setLong(idx, lval);
} else {
final int ival;
- final Class jfType = jf.getType();
+ final Class<?> jfType = jf.getType();
if (jfType == boolean.class) {
ival = ((Boolean) val).booleanValue() ? 1 : 0;
} else if (jfType == byte.class) {
Modified: trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/AbstractPluginTask.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -63,7 +63,7 @@
protected PluginDescriptor readDescriptor(File descriptor) {
final PluginDescriptor descr;
try {
- final XMLElement root = new XMLElement(new Hashtable(), true,
false);
+ final XMLElement root = new XMLElement(new Hashtable<Object,
Object>(), true, false);
try {
final FileReader r = new FileReader(descriptor);
try {
Modified: trunk/builder/src/builder/org/jnode/build/AddressFinder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/AddressFinder.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/AddressFinder.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -116,7 +116,6 @@
String line;
long lastAddress = -1;
String lastLabel = null;
- String lastLine = null;
while ((line = in.readLine()) != null) {
if (line.startsWith("$")) {
final int idx = line.indexOf('\t');
@@ -125,7 +124,6 @@
if (laddr <= address) {
lastAddress = laddr;
lastLabel = line.substring(idx + 1);
- lastLine = line;
} else {
break;
}
Modified: trunk/builder/src/builder/org/jnode/build/BuildException.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/BuildException.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/BuildException.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -20,8 +20,10 @@
package org.jnode.build;
-public class BuildException
- extends org.apache.tools.ant.BuildException {
+public class BuildException extends org.apache.tools.ant.BuildException {
+
+ private static final long serialVersionUID = 1L;
+
/**
* Constructor for BuildException.
*/
Modified: trunk/builder/src/builder/org/jnode/build/FieldInfo.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/FieldInfo.java 2009-05-23
04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/FieldInfo.java 2009-05-23
06:56:53 UTC (rev 5504)
@@ -35,6 +35,7 @@
/**
* All declared fields in the JDK type.
*/
+ @SuppressWarnings("unused")
private final Field[] jdkFields;
/**
@@ -65,7 +66,7 @@
* @param jdkType
* @param jnodeType
*/
- public FieldInfo(Class<?> jdkType, VmType jnodeType) {
+ public FieldInfo(Class<?> jdkType, VmType<?> jnodeType) {
this.jdkFields = jdkType.getDeclaredFields();
this.jnodeInstanceFields = getInstanceFields(jnodeType);
@@ -125,7 +126,7 @@
* @param jdkType
* @param jnodeFields
*/
- private final Field[] toJdkFields(Class jdkType, List<VmField>
jnodeFields) {
+ private final Field[] toJdkFields(Class<?> jdkType, List<VmField>
jnodeFields) {
final int cnt = jnodeFields.size();
final Field[] jdkFields = new Field[cnt];
for (int i = 0; i < cnt; i++) {
@@ -158,7 +159,7 @@
*
* @param jnodeType
*/
- private static List<VmField> getStaticFields(VmType jnodeType) {
+ private static List<VmField> getStaticFields(VmType<?> jnodeType) {
if (jnodeType != null) {
final int all = jnodeType.getNoDeclaredFields();
final ArrayList<VmField> list = new ArrayList<VmField>(all);
@@ -179,7 +180,7 @@
*
* @param jnodeType
*/
- private static List<VmField> getInstanceFields(VmType jnodeType) {
+ private static List<VmField> getInstanceFields(VmType<?> jnodeType) {
if (jnodeType != null) {
final int all = jnodeType.getNoDeclaredFields();
final ArrayList<VmField> list = new ArrayList<VmField>(all);
Modified: trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/InitJarBuilder.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -293,7 +293,7 @@
return this.pluginUrl;
}
- public boolean hasAllPrerequisitesInSet(Set ids) {
+ public boolean hasAllPrerequisitesInSet(Set<String> ids) {
final PluginDescriptor descr = getDescriptor();
final PluginPrerequisite[] prereqs = descr.getPrerequisites();
for (int j = 0; j < prereqs.length; j++) {
Modified:
trunk/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/JNodeClassNotFoundException.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -23,6 +23,8 @@
final class JNodeClassNotFoundException extends Exception {
+ private static final long serialVersionUID = 1L;
+
/**
* @param s
*/
Modified: trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java
2009-05-23 04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/ObjectEmitter.java
2009-05-23 06:56:53 UTC (rev 5504)
@@ -126,7 +126,7 @@
// If the object is a VmClass, force the loading of the
// correspondig java.lang.Class
if (cls.equals(VmType.class)) {
- final VmType<?> vmCls = (VmType) obj;
+ final VmType<?> vmCls = (VmType<?>) obj;
String name = vmCls.getName().replace('/', '.');
if (!name.startsWith("java.lang")) {
vmCls.asClassDuringBootstrap();
@@ -141,7 +141,7 @@
} else if (cls.equals(Long.class)) {
emitLong((Long) obj);
} else if (cls.equals(Class.class)) {
- emitClass((Class) obj);
+ emitClass((Class<?>) obj);
} else if (cls.isArray()) {
emitArray(cls, obj, (VmArrayClass<?>) vmClass);
} else {
@@ -280,8 +280,8 @@
os.write64(l.longValue()); // long value
}
- private void emitArray(Class<?> cls, Object obj, VmArrayClass vmClass) {
- final Class cmpType = cls.getComponentType();
+ private void emitArray(Class<?> cls, Object obj, VmArrayClass<?> vmClass) {
+ final Class<?> cmpType = cls.getComponentType();
final int len = Array.getLength(obj);
vmClass.incTotalLength(len);
os.writeWord(len);
@@ -486,7 +486,7 @@
final String cname = jdkType.getName();
FieldInfo info = fieldInfos.get(cname);
if (info == null) {
- VmType jnodeType = null;
+ VmType<?> jnodeType = null;
try {
jnodeType = loaderContext.loadClass(cname, true);
} catch (ClassNotFoundException ex) {
Modified: trunk/builder/src/builder/org/jnode/build/PluginList.java
===================================================================
--- trunk/builder/src/builder/org/jnode/build/PluginList.java 2009-05-23
04:54:30 UTC (rev 5503)
+++ trunk/builder/src/builder/org/jnode/build/PluginList.java 2009-05-23
06:56:53 UTC (rev 5504)
@@ -59,7 +59,7 @@
this.defaultDir = defaultDir;
descrList = new ArrayList<URL>();
pluginList = new ArrayList<URL>();
- final XMLElement root = new XMLElement(new Hashtable(), true, false);
+ final XMLElement root = new XMLElement(new Hashtable<Object,
Object>(), true, false);
try {
final FileReader r = new FileReader(file);
try {
@@ -129,7 +129,7 @@
private void addPlugin(List<URL> descrList, List<URL> pluginList, String
id, String version)
throws MalformedURLException, PluginException {
final File f = findPlugin(defaultDir, id, version);
- final URL pluginUrl = f.toURL();
+ final URL pluginUrl = f.toURI().toURL(); // ensure proper escaping ...
final URL descrUrl = new URL("jar:" + pluginUrl + "!/plugin.xml");
if (pluginList.contains(pluginUrl)) {
@@ -283,7 +283,9 @@
*/
public final URL createPluginURL(String id, String version) {
try {
- return findPlugin(defaultDir, id, version).toURL();
+ // The toURI().toURL() pattern is to ensure that funky characters
+ // in the plugin pathname are properly escaped in the URL
+ return findPlugin(defaultDir, id, version).toURI().toURL();
} catch (MalformedURLException e) {
throw new RuntimeException(e);
}
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
