[Jython-checkins] SF.net SVN: jython:[6423] trunk/jython/src/org/python/core/PyUnicode.java

[<pj...@us...>]

Revision: 6423
          http://jython.svn.sourceforge.net/jython/?rev=6423&view=rev
Author:   pjenvey
Date:     2009-05-30 00:46:58 +0000 (Sat, 30 May 2009)

Log Message:
-----------
quiet some warnings

Modified Paths:
--------------
    trunk/jython/src/org/python/core/PyUnicode.java

Modified: trunk/jython/src/org/python/core/PyUnicode.java
===================================================================
--- trunk/jython/src/org/python/core/PyUnicode.java	2009-05-29 09:44:21 UTC (rev 6422)
+++ trunk/jython/src/org/python/core/PyUnicode.java	2009-05-30 00:46:58 UTC (rev 6423)
@@ -213,6 +213,7 @@
         return fmt.format(other);
     }
 
+    @Override
     public PyUnicode __unicode__() {
         return this;
     }
@@ -411,13 +412,17 @@
         }
     }
 
-    public Iterator newSubsequenceIterator() {
+    // XXX: Parameterize SubsequenceIteratorImpl and friends (and make them Iterable)
+    public Iterator<Integer> newSubsequenceIterator() {
         return new SubsequenceIteratorImpl();
     }
 
-    public Iterator newSubsequenceIterator(int start, int stop, int step) {
+    public Iterator<Integer> newSubsequenceIterator(int start, int stop, int step) {
         if (step < 0) {
-            return new SteppedIterator(step * -1, new ReversedIterator(new SubsequenceIteratorImpl(stop + 1, start + 1, 1)));
+            return new SteppedIterator(step * -1,
+                                       new ReversedIterator(new SubsequenceIteratorImpl(stop + 1,
+                                                                                        start + 1,
+                                                                                        1)));
         } else {
             return new SubsequenceIteratorImpl(start, stop, step);
         }
@@ -454,6 +459,7 @@
         return str___rmul__(o);
     }
 
+    @Override
     public PyObject __add__(PyObject other) {
         return unicode___add__(other);
     }
@@ -632,6 +638,7 @@
                 new ReversedIterator(newSubsequenceIterator()))));
     }
 
+    @Override
     public PyTuple partition(PyObject sep) {
         return unicode_partition(sep);
     }
@@ -872,6 +879,7 @@
         }
     }
 
+    @Override
     public PyTuple rpartition(PyObject sep) {
         return unicode_rpartition(sep);
     }
@@ -1117,6 +1125,7 @@
     }
 
     // end utf-16 aware
+    @Override
     public PyString join(PyObject seq) {
         return unicode_join(seq);
     }


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