Remove Java 5.0 Syntax warnings

zhourenjian · zhourenjian · commit ab2e0f741723 · 2009-07-17T15:10:07.000Z
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/AClass.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/AClass.java
@@ -65,7 +65,7 @@ public static void load(final String clazzName, final Runnable afterLoaded) {
 		(new Thread() {
 			public void run() {
 				try {
-					Class clz = Class.forName(clazzName);
+					Class<?> clz = Class.forName(clazzName);
 					if (afterLoaded != null && afterLoaded instanceof ARunnable) {
 						ARunnable runnable = (ARunnable) afterLoaded;
 						runnable.setClazz(clz);
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/ARunnable.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/ARunnable.java
@@ -21,21 +21,21 @@
  * 2006-8-4
  */
 public abstract class ARunnable implements Runnable {
-	private Class clazz;
+	private Class<?> clazz;
 
 	/**
 	 * Return the loaded class.
 	 * @return Class loaded class.
 	 */
-	public Class getClazz() {
+	public Class<?> getClazz() {
 		return clazz;
 	}
 
 	/**
 	 * Set the loaded class
 	 * @param clazz Class class that is already loaded.
 	 */
-	public void setClazz(Class clazz) {
+	public void setClazz(Class<?> clazz) {
 		this.clazz = clazz;
 	}
 }
diff --git a/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java b/sources/net.sf.j2s.ajax/ajaxcore/net/sf/j2s/ajax/HttpRequest.java
@@ -151,7 +151,7 @@ protected static interface IXHRReceiving {
 	private String user;
 	private String password;
 	
-	private Map headers = new HashMap();
+	private Map<String, String> headers = new HashMap<String, String>();
 	private String content;
 	
 	private boolean toAbort = false;
@@ -410,7 +410,7 @@ private void request() {
 			connection.setDoInput(true);
 			connection.setRequestMethod(method);
 			connection.setRequestProperty("User-Agent",
-					"Mozilla/5.0 (compatible; Java2Script-Pacemaker/1.0; +http://j2s.sourceforge.net)");
+					"Mozilla/5.0 (compatible; Java2Script/2.0.0)");
 			if ("post".equalsIgnoreCase(method)) {
 				connection.setDoOutput(true);
 				connection.setRequestProperty("Content-Type",
@@ -421,7 +421,7 @@ private void request() {
 				String base64Auth = HttpRequest.Base64.byteArrayToBase64(auth.getBytes());
 				connection.setRequestProperty("Authorization", "Basic " + base64Auth);
 			}
-			for (Iterator iter = headers.keySet().iterator(); iter.hasNext();) {
+			for (Iterator<String> iter = headers.keySet().iterator(); iter.hasNext();) {
 				String key = (String) iter.next();
 				connection.setRequestProperty(key, (String) headers.get(key));
 			}
