Author: j16sdiz
Date: 2008-09-04 15:31:40 +0000 (Thu, 04 Sep 2008)
New Revision: 22413
Modified:
trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
trunk/freenet/src/freenet/crypt/CryptoKey.java
trunk/freenet/src/freenet/crypt/DiffieHellman.java
trunk/freenet/src/freenet/crypt/SSL.java
trunk/freenet/src/freenet/crypt/Util.java
trunk/freenet/src/freenet/io/comm/Message.java
trunk/freenet/src/freenet/io/comm/MessageType.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
trunk/freenet/src/freenet/support/JarClassLoader.java
trunk/freenet/src/freenet/support/Loader.java
trunk/freenet/src/freenet/support/LoggerHookChain.java
trunk/freenet/src/freenet/support/Serializer.java
trunk/freenet/src/freenet/support/VoidLogger.java
Log:
trival: use Class<?> instead of Class, catch ClassNotFoundException
Modified: trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
2008-09-04 14:47:50 UTC (rev 22412)
+++ trunk/freenet/src/freenet/clients/http/FirstTimeWizardToadlet.java
2008-09-04 15:31:40 UTC (rev 22413)
@@ -11,8 +11,6 @@
import freenet.client.HighLevelSimpleClient;
import freenet.config.Config;
import freenet.config.ConfigException;
-import freenet.config.InvalidConfigValueException;
-import freenet.config.NodeNeedRestartException;
import freenet.config.WrapperConfig;
import freenet.l10n.L10n;
import freenet.node.Node;
@@ -514,8 +512,8 @@
long freeSpace = -1;
File dir = FileUtil.getCanonicalFile(core.node.getNodeDir());
try {
- Class c = dir.getClass();
- Method m = c.getDeclaredMethod("getFreeSpace", new
Class[0]);
+ Class<? extends File> c = dir.getClass();
+ Method m = c.getDeclaredMethod("getFreeSpace", new
Class<?>[0]);
if(m != null) {
Long lFreeSpace = (Long) m.invoke(dir, new
Object[0]);
if(lFreeSpace != null) {
Modified: trunk/freenet/src/freenet/crypt/CryptoKey.java
===================================================================
--- trunk/freenet/src/freenet/crypt/CryptoKey.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/crypt/CryptoKey.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -13,6 +13,7 @@
import freenet.support.HexUtil;
import freenet.support.Logger;
+ at SuppressWarnings("serial")
public abstract class CryptoKey implements CryptoElement, Serializable {
protected static final Digest shactx = SHA1.getInstance();
@@ -24,7 +25,7 @@
DataInputStream dis = new DataInputStream(i);
String type = dis.readUTF();
try {
- Class keyClass = Class.forName(type);
+ Class<?> keyClass = Class.forName(type);
Method m =
keyClass.getMethod("read", new Class[] {
InputStream.class });
return (CryptoKey) m.invoke(null, new Object[] { dis });
Modified: trunk/freenet/src/freenet/crypt/DiffieHellman.java
===================================================================
--- trunk/freenet/src/freenet/crypt/DiffieHellman.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/crypt/DiffieHellman.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -6,14 +6,14 @@
package freenet.crypt;
-import freenet.node.FNPPacketMangler;
import java.math.BigInteger;
import java.util.Random;
import java.util.Stack;
+import net.i2p.util.NativeBigInteger;
+import freenet.node.FNPPacketMangler;
import freenet.support.Logger;
import freenet.support.io.NativeThread;
-import net.i2p.util.NativeBigInteger;
public class DiffieHellman {
@@ -145,7 +145,7 @@
* @see http://securitytracker.com/alerts/2005/Aug/1014739.html
* @see http://www.it.iitb.ac.in/~praj/acads/netsec/FinalReport.pdf
*/
- public static boolean checkDHExponentialValidity(Class caller,
BigInteger exponential) {
+ public static boolean checkDHExponentialValidity(Class<?> caller,
BigInteger exponential) {
int onesCount=0, zerosCount=0;
// Ensure that we have at least 16 bits of each gender
Modified: trunk/freenet/src/freenet/crypt/SSL.java
===================================================================
--- trunk/freenet/src/freenet/crypt/SSL.java 2008-09-04 14:47:50 UTC (rev
22412)
+++ trunk/freenet/src/freenet/crypt/SSL.java 2008-09-04 15:31:40 UTC (rev
22413)
@@ -221,13 +221,13 @@
// If keystore not exist, create keystore and
server certificate
keystore.load(null, keyStorePass.toCharArray());
try {
- Class certAndKeyGenClazz =
Class.forName("sun.security.x509.CertAndKeyGen");
- Constructor certAndKeyGenCtor =
certAndKeyGenClazz.getConstructor(String.class, String.class);
+ Class<?> certAndKeyGenClazz =
Class.forName("sun.security.x509.CertAndKeyGen");
+ Constructor<?> certAndKeyGenCtor =
certAndKeyGenClazz.getConstructor(String.class, String.class);
Object keypair =
certAndKeyGenCtor.newInstance("DSA", "SHA1WithDSA");
- Class x500NameClazz =
Class.forName("sun.security.x509.X500Name");
- Constructor x500NameCtor =
x500NameClazz.getConstructor(String.class, String.class, String.class,
- String.class, String.class,
String.class);
+ Class<?> x500NameClazz =
Class.forName("sun.security.x509.X500Name");
+ Constructor<?> x500NameCtor =
x500NameClazz.getConstructor(String.class, String.class,
+ String.class, String.class,
String.class, String.class);
Object x500Name =
x500NameCtor.newInstance("Freenet", "Freenet", "Freenet", "", "", "");
Method certAndKeyGenGenerate =
certAndKeyGenClazz.getMethod("generate", int.class);
@@ -245,6 +245,8 @@
keystore.setKeyEntry("freenet",
privKey, keyPass.toCharArray(), chain);
storeKeyStore();
createSSLContext();
+ } catch (ClassNotFoundException cnfe) {
+ throw new
UnsupportedOperationException("The JVM you are using is not supported!", cnfe);
} catch (NoSuchMethodException nsme) {
throw new
UnsupportedOperationException("The JVM you are using is not supported!", nsme);
}
Modified: trunk/freenet/src/freenet/crypt/Util.java
===================================================================
--- trunk/freenet/src/freenet/crypt/Util.java 2008-09-04 14:47:50 UTC (rev
22412)
+++ trunk/freenet/src/freenet/crypt/Util.java 2008-09-04 15:31:40 UTC (rev
22413)
@@ -8,14 +8,14 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigInteger;
+import java.security.MessageDigest;
import java.util.Arrays;
import java.util.Random;
+import net.i2p.util.NativeBigInteger;
import freenet.crypt.ciphers.Rijndael;
import freenet.support.HexUtil;
import freenet.support.Loader;
-import java.security.MessageDigest;
-import net.i2p.util.NativeBigInteger;
public class Util {
@@ -230,7 +230,7 @@
try {
return (BlockCipher) Loader.getInstance(
"freenet.crypt.ciphers." + name,
- new Class[] { Integer.class },
+ new Class<?>[] { Integer.class },
new Object[] { new Integer(keySize)});
} catch (Exception e) {
//throw new UnsupportedCipherException(""+e);
Modified: trunk/freenet/src/freenet/io/comm/Message.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/Message.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/io/comm/Message.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -24,7 +24,6 @@
import java.io.EOFException;
import java.io.IOException;
import java.lang.ref.WeakReference;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -78,10 +77,11 @@
try {
for (Iterator i = mspec.getOrderedFields().iterator();
i.hasNext();) {
String name = (String) i.next();
- Class type = (Class) mspec.getFields().get(name);
+ Class<?> type = (Class<?>) mspec.getFields().get(name);
if (type.equals(LinkedList.class)) { // Special
handling for LinkedList to deal with element type
m.set(name, Serializer
-
.readListFromDataInputStream((Class) mspec.getLinkedListTypes().get(name), bb));
+
.readListFromDataInputStream((Class<?>) mspec.getLinkedListTypes().get(name),
+ bb));
} else {
m.set(name,
Serializer.readFromDataInputStream(type, bb));
}
Modified: trunk/freenet/src/freenet/io/comm/MessageType.java
===================================================================
--- trunk/freenet/src/freenet/io/comm/MessageType.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/io/comm/MessageType.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -19,7 +19,9 @@
package freenet.io.comm;
-import java.util.*;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map;
import freenet.support.Logger;
import freenet.support.ShortBuffer;
@@ -60,12 +62,12 @@
_specs.remove(new Integer(_name.hashCode()));
}
- public void addLinkedListField(String name, Class parameter) {
+ public void addLinkedListField(String name, Class<?> parameter) {
_linkedListTypes.put(name, parameter);
addField(name, LinkedList.class);
}
- public void addField(String name, Class type) {
+ public void addField(String name, Class<?> type) {
_fields.put(name, type);
_orderedFields.addLast(name);
}
@@ -81,15 +83,15 @@
if (fieldValue == null) {
return false;
}
- Class defClass = (Class)(_fields.get(fieldName));
- Class valueClass = fieldValue.getClass();
+ Class<?> defClass = (Class<?>) (_fields.get(fieldName));
+ Class<?> valueClass = fieldValue.getClass();
if(defClass == valueClass) return true;
if(defClass.isAssignableFrom(valueClass)) return true;
return false;
}
- public Class typeOf(String field) {
- return (Class) _fields.get(new Integer(field.hashCode()));
+ public Class<?> typeOf(String field) {
+ return (Class<?>) _fields.get(new Integer(field.hashCode()));
}
public boolean equals(Object o) {
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2008-09-04
14:47:50 UTC (rev 22412)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2008-09-04
15:31:40 UTC (rev 22413)
@@ -704,7 +704,7 @@
try {
JarClassLoader jarClassLoader = new
JarClassLoader(pluginFile);
- Class pluginMainClass =
jarClassLoader.loadClass(pluginMainClassName);
+ Class<?> pluginMainClass =
jarClassLoader.loadClass(pluginMainClassName);
Object object = pluginMainClass.newInstance();
if(!(object instanceof FredPlugin)) {
Logger.error(this, "plugin main class is not a
plugin");
Modified: trunk/freenet/src/freenet/support/JarClassLoader.java
===================================================================
--- trunk/freenet/src/freenet/support/JarClassLoader.java 2008-09-04
14:47:50 UTC (rev 22412)
+++ trunk/freenet/src/freenet/support/JarClassLoader.java 2008-09-04
15:31:40 UTC (rev 22413)
@@ -114,7 +114,7 @@
*
* @see java.lang.ClassLoader#findClass(java.lang.String)
*/
- protected Class findClass(String name) throws ClassNotFoundException {
+ protected Class<?> findClass(String name) throws ClassNotFoundException
{
try {
String pathName = transformName(name);
JarEntry jarEntry = tempJarFile.getJarEntry(pathName);
@@ -126,7 +126,7 @@
classBytesOutputStream.close();
jarEntryInputStream.close();
byte[] classBytes =
classBytesOutputStream.toByteArray();
- Class clazz = defineClass(name, classBytes, 0,
classBytes.length);
+ Class<?> clazz = defineClass(name, classBytes,
0, classBytes.length);
return clazz;
}
throw new ClassNotFoundException("could not find jar
entry for class " + name);
Modified: trunk/freenet/src/freenet/support/Loader.java
===================================================================
--- trunk/freenet/src/freenet/support/Loader.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/support/Loader.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -17,8 +17,8 @@
* This is a caching Class loader.
* @param name The name of the class to load.
**/
- static public Class load(String name) throws ClassNotFoundException {
- Class c=(Class)classes.get(name);
+ static public Class<?> load(String name) throws ClassNotFoundException {
+ Class<?> c = (Class<?>) classes.get(name);
if(c==null) {
c=Class.forName(name);
classes.put(name, c);
@@ -45,7 +45,7 @@
* @param args The arguments. Since this uses the reflect methods
* it's ok to wrap primitives.
**/
- public static Object getInstance(String classname, Class[] argtypes,
+ public static Object getInstance(String classname, Class<?>[] argtypes,
Object[] args)
throws InvocationTargetException, NoSuchMethodException,
InstantiationException, IllegalAccessException,
@@ -60,11 +60,11 @@
* @param args The arguments. Since this uses the reflect methods
* it's ok to wrap primitives.
**/
- public static Object getInstance(Class c, Class[] argtypes,
+ public static Object getInstance(Class<?> c, Class<?>[] argtypes,
Object[] args)
throws InvocationTargetException, NoSuchMethodException,
InstantiationException, IllegalAccessException {
- Constructor con = c.getConstructor(argtypes);
+ Constructor<?> con = c.getConstructor(argtypes);
return con.newInstance(args);
}
}
Modified: trunk/freenet/src/freenet/support/LoggerHookChain.java
===================================================================
--- trunk/freenet/src/freenet/support/LoggerHookChain.java 2008-09-04
14:47:50 UTC (rev 22412)
+++ trunk/freenet/src/freenet/support/LoggerHookChain.java 2008-09-04
15:31:40 UTC (rev 22413)
@@ -38,7 +38,7 @@
* one logger receive events from another.
* @implements LoggerHook.log()
*/
- public synchronized void log(Object o, Class c, String msg, Throwable e,
int priority){
+ public synchronized void log(Object o, Class<?> c, String msg, Throwable
e, int priority) {
LoggerHook[] myHooks = hooks;
for(int i=0;i<myHooks.length;i++) {
myHooks[i].log(o,c,msg,e,priority);
Modified: trunk/freenet/src/freenet/support/Serializer.java
===================================================================
--- trunk/freenet/src/freenet/support/Serializer.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/support/Serializer.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -44,7 +44,7 @@
public static final String VERSION = "$Id: Serializer.java,v 1.5
2005/09/15 18:16:04 amphibian Exp $";
public static final int MAX_BITARRAY_SIZE = 2048*8;
- public static List readListFromDataInputStream(Class elementType,
DataInput dis) throws IOException {
+ public static List readListFromDataInputStream(Class<?> elementType,
DataInput dis) throws IOException {
LinkedList ret = new LinkedList();
int length = dis.readInt();
for (int x = 0; x < length; x++) {
@@ -53,7 +53,7 @@
return ret;
}
- public static Object readFromDataInputStream(Class type, DataInput dis)
throws IOException {
+ public static Object readFromDataInputStream(Class<?> type, DataInput
dis) throws IOException {
if (type.equals(Boolean.class)) {
int bool = dis.readByte();
if (bool==1)
@@ -103,7 +103,7 @@
}
public static void writeToDataOutputStream(Object object,
DataOutputStream dos, PeerContext ctx) throws IOException {
- Class type = object.getClass();
+ Class<?> type = object.getClass();
if (type.equals(Long.class)) {
dos.writeLong(((Long) object).longValue());
} else if (type.equals(Boolean.class)) {
Modified: trunk/freenet/src/freenet/support/VoidLogger.java
===================================================================
--- trunk/freenet/src/freenet/support/VoidLogger.java 2008-09-04 14:47:50 UTC
(rev 22412)
+++ trunk/freenet/src/freenet/support/VoidLogger.java 2008-09-04 15:31:40 UTC
(rev 22413)
@@ -10,7 +10,7 @@
public class VoidLogger extends Logger
{
- public void log(Object o, Class source, String message, Throwable e,
int priority) {
+ public void log(Object o, Class<?> source, String message, Throwable e,
int priority) {
}
public void log(Object source, String message, int priority) {
@@ -19,10 +19,10 @@
public void log(Object o, String message, Throwable e, int priority) {
}
- public void log(Class c, String message, int priority) {
+ public void log(Class<?> c, String message, int priority) {
}
- public void log(Class c, String message, Throwable e, int priority) {
+ public void log(Class<?> c, String message, Throwable e, int priority) {
}
public long minFlags() {
@@ -37,7 +37,7 @@
return 0;
}
- public boolean instanceShouldLog(int priority, Class c) {
+ public boolean instanceShouldLog(int priority, Class<?> c) {
return false;
}
