jython-checkins Mailing List for Jython (Page 38)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6344
          http://jython.svn.sourceforge.net/jython/?rev=6344&view=rev
Author:   pjenvey
Date:     2009-05-12 01:51:08 +0000 (Tue, 12 May 2009)

Log Message:
-----------
quiet some warnings and small cleanup

Modified Paths:
--------------
    trunk/jython/src/org/python/modules/itertools.java
    trunk/jython/src/org/python/util/JLineConsole.java
    trunk/jython/tests/java/javatests/Dict2JavaTest.java

Modified: trunk/jython/src/org/python/modules/itertools.java
===================================================================

--- trunk/jython/src/org/python/modules/itertools.java	2009-05-12 01:35:11 UTC (rev 6343)
+++ trunk/jython/src/org/python/modules/itertools.java	2009-05-12 01:51:08 UTC (rev 6344)
@@ -1,3 +1,4 @@
+/* Copyright (c) Jython Developers */
 package org.python.modules;
 
 import java.util.ArrayList;
@@ -134,7 +135,7 @@
                     // start over again
                     counter = 0;
                 }
-                return (PyObject)saved.get(counter++);
+                return saved.get(counter++);
             }
 
         };

Modified: trunk/jython/src/org/python/util/JLineConsole.java
===================================================================
--- trunk/jython/src/org/python/util/JLineConsole.java	2009-05-12 01:35:11 UTC (rev 6343)
+++ trunk/jython/src/org/python/util/JLineConsole.java	2009-05-12 01:51:08 UTC (rev 6344)
@@ -1,3 +1,4 @@
+/* Copyright (c) Jython Developers */
 package org.python.util;
 
 import java.io.File;
@@ -87,6 +88,7 @@
         return getClass().getResourceAsStream("jline-keybindings.properties");
     }
 
+    @Override
     public String raw_input(PyObject prompt) {
         String line = null;
         try {

Modified: trunk/jython/tests/java/javatests/Dict2JavaTest.java
===================================================================
--- trunk/jython/tests/java/javatests/Dict2JavaTest.java	2009-05-12 01:35:11 UTC (rev 6343)
+++ trunk/jython/tests/java/javatests/Dict2JavaTest.java	2009-05-12 01:51:08 UTC (rev 6344)
@@ -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 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,21 +71,21 @@
 
     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;
     }
@@ -92,7 +93,7 @@
     // 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;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2000	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (107)	Dec (67)
2001	Jan (76)	Feb (125)	Mar (72)	Apr (13)	May (18)	Jun (12)	Jul (129)	Aug (47)	Sep (1)	Oct (36)	Nov (128)	Dec (124)
2002	Jan (59)	Feb	Mar (14)	Apr (14)	May (72)	Jun (9)	Jul (3)	Aug (5)	Sep (18)	Oct (65)	Nov (28)	Dec (12)
2003	Jan (10)	Feb (2)	Mar (4)	Apr (33)	May (21)	Jun (9)	Jul (29)	Aug (34)	Sep (4)	Oct (8)	Nov (15)	Dec (4)
2004	Jan (26)	Feb (12)	Mar (11)	Apr (9)	May (7)	Jun	Jul (5)	Aug	Sep (3)	Oct (7)	Nov (1)	Dec (10)
2005	Jan (2)	Feb (72)	Mar (16)	Apr (39)	May (48)	Jun (97)	Jul (57)	Aug (13)	Sep (16)	Oct (24)	Nov (100)	Dec (24)
2006	Jan (15)	Feb (34)	Mar (33)	Apr (31)	May (79)	Jun (64)	Jul (41)	Aug (64)	Sep (31)	Oct (46)	Nov (55)	Dec (37)
2007	Jan (32)	Feb (61)	Mar (11)	Apr (58)	May (46)	Jun (30)	Jul (94)	Aug (93)	Sep (86)	Oct (69)	Nov (125)	Dec (177)
2008	Jan (169)	Feb (97)	Mar (74)	Apr (113)	May (120)	Jun (334)	Jul (215)	Aug (237)	Sep (72)	Oct (189)	Nov (126)	Dec (160)
2009	Jan (180)	Feb (45)	Mar (98)	Apr (140)	May (151)	Jun (71)	Jul (107)	Aug (119)	Sep (73)	Oct (121)	Nov (14)	Dec (6)
2010	Jan (13)	Feb (9)	Mar (10)	Apr (64)	May (3)	Jun (16)	Jul (7)	Aug (23)	Sep (17)	Oct (37)	Nov (5)	Dec (8)
2011	Jan (10)	Feb (11)	Mar (77)	Apr (11)	May (2)	Jun	Jul	Aug	Sep	Oct	Nov	Dec

jython-checkins Mailing List for Jython (Page 38)

jython-checkins — For Jython checkin messages