quiet some warnings and small cleanup

pjenvey · pjenvey · commit c3cd280e7c71 · 2009-05-12T01:51:08.000Z
diff --git a/src/org/python/modules/itertools.java b/src/org/python/modules/itertools.java
@@ -1,3 +1,4 @@
+/* Copyright (c) Jython Developers */
 package org.python.modules;
 
 import java.util.ArrayList;
@@ -134,7 +135,7 @@ public PyObject __iternext__() {
                     // start over again
                     counter = 0;
                 }
-                return (PyObject)saved.get(counter++);
+                return saved.get(counter++);
             }
 
         };
diff --git a/src/org/python/util/JLineConsole.java b/src/org/python/util/JLineConsole.java
@@ -1,3 +1,4 @@
+/* Copyright (c) Jython Developers */
 package org.python.util;
 
 import java.io.File;
@@ -87,6 +88,7 @@ protected InputStream getBindings() {
         return getClass().getResourceAsStream("jline-keybindings.properties");
     }
 
+    @Override
     public String raw_input(PyObject prompt) {
         String line = null;
         try {
diff --git a/tests/java/javatests/Dict2JavaTest.java b/tests/java/javatests/Dict2JavaTest.java
@@ -1,9 +1,10 @@
+/* Copyright (c) Jython Developers */
 package javatests;
+
 import java.util.Map;
 import java.util.Set;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Iterator;
 
 /**
  * This class is used by the test_dict2java.py test script for testing
@@ -13,21 +14,21 @@
  */
 public class Dict2JavaTest {
     
-    private Map map = null;
+    private Map<Object, Object> map;
 
-    public Dict2JavaTest(Map map) {
+    public Dict2JavaTest(Map<Object, Object> map) {
         this.map = map;
     }
-    
-    public Set entrySet() {
+
+    public Set<Map.Entry<Object, Object>> entrySet() {
         return map.entrySet();
     }
 
-    public Set keySet() {
+    public Set<Object> keySet() {
         return map.keySet();
     }
     
-    public Collection values() {
+    public Collection<Object> values() {
         return map.values();
     }
     
@@ -41,7 +42,7 @@ public boolean containsKey(Object key) {
     }
 
     public boolean test_putAll_efg() {
-        HashMap hmap = new HashMap();
+        HashMap<String, String> hmap = new HashMap<String, String>();
         hmap.put("e", "1");
         hmap.put("f", null);
         hmap.put("g", "2");
@@ -70,29 +71,29 @@ public boolean test_put_hig() {
 
     public boolean test_java_mapentry() {
         // created outside of Jython with non PyOjects
-        HashMap hmap = new HashMap();
+        HashMap<String, Object> hmap = new HashMap<String, Object>();
         hmap.put("b", "y");
-        Map.Entry entry = (Map.Entry)hmap.entrySet().iterator().next();
+        Map.Entry<String, Object> entry = hmap.entrySet().iterator().next();
         if (!map.entrySet().contains(entry)) return false;
 
         // Test a number
-        hmap = new HashMap();
+        hmap = new HashMap<String, Object>();
         hmap.put("i", new Integer(3));
-        entry = (Map.Entry)hmap.entrySet().iterator().next();
+        entry = hmap.entrySet().iterator().next();
         if (!map.entrySet().contains(entry)) return false;
 
         // test Null
-        hmap = new HashMap();
+        hmap = new HashMap<String, Object>();
         hmap.put("f", null);
-        entry = (Map.Entry)hmap.entrySet().iterator().next();
+        entry = hmap.entrySet().iterator().next();
         if (!map.entrySet().contains(entry)) return false;
         return true;
     }
 
     // make sure nulls are handled and other object types, nulls
     // should never match anything in the entry set.
     public boolean test_entry_set_nulls() {
-        Set set = map.entrySet();
+        Set<Map.Entry<Object, Object>> set = map.entrySet();
         return set.contains(null) == false  && set.remove(null) == false &&
           set.contains(new Boolean(true)) == false && set.remove(new String("")) == false;
     }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/* Copyright (c) Jython Developers */`
`1`	`2`	`package org.python.modules;`
`2`	`3`
`3`	`4`	`import java.util.ArrayList;`
`@@ -134,7 +135,7 @@ public PyObject __iternext__() {`
`134`	`135`	`// start over again`
`135`	`136`	`counter = 0;`
`136`	`137`	`}`
`137`		`- return (PyObject)saved.get(counter++);`
	`138`	`+ return saved.get(counter++);`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`};`