Menu
▾
▴
[Jython-checkins] SF.net SVN: jython:[6334] trunk/jython/src/org/python
|
From: <pj...@us...> - 2009-05-11 00:49:39
|
Revision: 6334
http://jython.svn.sourceforge.net/jython/?rev=6334&view=rev
Author: pjenvey
Date: 2009-05-11 00:49:23 +0000 (Mon, 11 May 2009)
Log Message:
-----------
quiet some warnings
Modified Paths:
--------------
trunk/jython/src/org/python/core/PyString.java
trunk/jython/src/org/python/core/exceptions.java
trunk/jython/src/org/python/modules/itertools.java
trunk/jython/src/org/python/modules/random/PyRandom.java
trunk/jython/src/org/python/modules/sre/PatternObject.java
trunk/jython/src/org/python/modules/sre/SRE_STATE.java
Modified: trunk/jython/src/org/python/core/PyString.java
===================================================================
--- trunk/jython/src/org/python/core/PyString.java 2009-05-11 00:48:39 UTC (rev 6333)
+++ trunk/jython/src/org/python/core/PyString.java 2009-05-11 00:49:23 UTC (rev 6334)
@@ -590,7 +590,7 @@
return StringUtil.toBytes(string);
}
- public Object __tojava__(Class c) {
+ public Object __tojava__(Class<?> c) {
if (c.isAssignableFrom(String.class)) {
return string;
}
Modified: trunk/jython/src/org/python/core/exceptions.java
===================================================================
--- trunk/jython/src/org/python/core/exceptions.java 2009-05-11 00:48:39 UTC (rev 6333)
+++ trunk/jython/src/org/python/core/exceptions.java 2009-05-11 00:49:23 UTC (rev 6334)
@@ -634,11 +634,12 @@
return bindStaticJavaMethod(name, exceptions.class, methodName);
}
- public static PyObject bindStaticJavaMethod(String name, Class cls, String methodName) {
+ public static PyObject bindStaticJavaMethod(String name, Class<?> cls, String methodName) {
Method javaMethod;
try {
- javaMethod = cls.getMethod(methodName, new Class[] {PyObject.class, PyObject[].class,
- String[].class});
+ javaMethod = cls.getMethod(methodName,
+ new Class<?>[] {PyObject.class, PyObject[].class,
+ String[].class});
} catch (Exception e) {
throw Py.JavaError(e);
}
Modified: trunk/jython/src/org/python/modules/itertools.java
===================================================================
--- trunk/jython/src/org/python/modules/itertools.java 2009-05-11 00:48:39 UTC (rev 6333)
+++ trunk/jython/src/org/python/modules/itertools.java 2009-05-11 00:49:23 UTC (rev 6334)
@@ -109,15 +109,14 @@
*/
public static PyIterator cycle(final PyObject sequence) {
return new ItertoolsIterator() {
- List saved = new ArrayList();
+ List<PyObject> saved = new ArrayList<PyObject>();
int counter = 0;
PyObject iter = sequence.__iter__();
boolean save = true;
public PyObject __iternext__() {
-
- if(save) {
+ if (save) {
PyObject obj = nextElement(iter);
if (obj != null) {
saved.add(obj);
@@ -126,16 +125,16 @@
save = false;
}
}
- if(saved.size() == 0) {
+ if (saved.size() == 0) {
return null;
}
// pick element from saved List
- if(counter >= saved.size()) {
+ if (counter >= saved.size()) {
// start over again
counter = 0;
}
- return (PyObject) saved.get(counter++);
+ return (PyObject)saved.get(counter++);
}
};
Modified: trunk/jython/src/org/python/modules/random/PyRandom.java
===================================================================
--- trunk/jython/src/org/python/modules/random/PyRandom.java 2009-05-11 00:48:39 UTC (rev 6333)
+++ trunk/jython/src/org/python/modules/random/PyRandom.java 2009-05-11 00:49:23 UTC (rev 6334)
@@ -48,7 +48,7 @@
if (seed instanceof PyLong) {
PyLong max = new PyLong(Long.MAX_VALUE);
PyLong seed_modulus = (PyLong)(seed.__mod__(max));
- this.javaRandom.setSeed(((PyLong)seed_modulus).asLong(0));
+ this.javaRandom.setSeed(seed_modulus.asLong(0));
} else if (seed instanceof PyInteger) {
this.javaRandom.setSeed(((PyInteger)seed).getValue());
} else {
Modified: trunk/jython/src/org/python/modules/sre/PatternObject.java
===================================================================
--- trunk/jython/src/org/python/modules/sre/PatternObject.java 2009-05-11 00:48:39 UTC (rev 6333)
+++ trunk/jython/src/org/python/modules/sre/PatternObject.java 2009-05-11 00:49:23 UTC (rev 6334)
@@ -246,7 +246,7 @@
SRE_STATE state = new SRE_STATE(string, start, end, flags);
- final List list = new ArrayList();
+ final List<PyObject> list = new ArrayList<PyObject>();
while (state.start <= state.end) {
state.state_reset();
Modified: trunk/jython/src/org/python/modules/sre/SRE_STATE.java
===================================================================
--- trunk/jython/src/org/python/modules/sre/SRE_STATE.java 2009-05-11 00:48:39 UTC (rev 6333)
+++ trunk/jython/src/org/python/modules/sre/SRE_STATE.java 2009-05-11 00:49:23 UTC (rev 6334)
@@ -365,14 +365,14 @@
boolean ok = true;
for (;;) {
- switch ((int)set[setidx++]) {
+ switch (set[setidx++]) {
case SRE_OP_FAILURE:
TRACE(setidx, ch, "CHARSET FAILURE");
return !ok;
case SRE_OP_LITERAL:
- TRACE(setidx, ch, "CHARSET LITERAL " + (int) set[setidx]);
+ TRACE(setidx, ch, "CHARSET LITERAL " + set[setidx]);
/* <LITERAL> <code> */
if (ch == set[setidx])
return ok;
@@ -381,8 +381,8 @@
case SRE_OP_CATEGORY:
/* <CATEGORY> <code> */
- TRACE(setidx, ch, "CHARSET CHARSET " + (int) set[setidx]);
- if (sre_category((int)set[setidx], ch))
+ TRACE(setidx, ch, "CHARSET CHARSET " + set[setidx]);
+ if (sre_category(set[setidx], ch))
return ok;
setidx++;
break;
@@ -403,7 +403,7 @@
case SRE_OP_RANGE:
/* <RANGE> <lower> <upper> */
- TRACE(setidx, ch, "CHARSET RANGE " + (int) set[setidx] + " " + (int) set[setidx+1]);
+ TRACE(setidx, ch, "CHARSET RANGE " + set[setidx] + " " + set[setidx+1]);
if (set[setidx] <= ch && ch <= set[setidx+1])
return ok;
setidx += 2;
@@ -494,7 +494,7 @@
case SRE_OP_LITERAL_IGNORE:
/* repeated literal */
chr = pattern[pidx+1];
- TRACE(pidx, ptr, "COUNT LITERAL_IGNORE " + (int) chr);
+ TRACE(pidx, ptr, "COUNT LITERAL_IGNORE " + chr);
while (ptr < end && lower(str[ptr]) == chr)
ptr++;
break;
@@ -502,7 +502,7 @@
case SRE_OP_NOT_LITERAL:
/* repeated non-literal */
chr = pattern[pidx+1];
- TRACE(pidx, ptr, "COUNT NOT_LITERAL " + (int) chr);
+ TRACE(pidx, ptr, "COUNT NOT_LITERAL " + chr);
while (ptr < end && str[ptr] != chr)
ptr++;
break;
@@ -510,7 +510,7 @@
case SRE_OP_NOT_LITERAL_IGNORE:
/* repeated non-literal */
chr = pattern[pidx+1];
- TRACE(pidx, ptr, "COUNT NOT_LITERAL_IGNORE " + (int) chr);
+ TRACE(pidx, ptr, "COUNT NOT_LITERAL_IGNORE " + chr);
while (ptr < end && lower(str[ptr]) != chr)
ptr++;
break;
@@ -564,8 +564,8 @@
case SRE_OP_MARK:
/* set mark */
/* <MARK> <gid> */
- TRACE(pidx, ptr, "MARK " + (int) pattern[pidx]);
- i = (int)pattern[pidx];
+ TRACE(pidx, ptr, "MARK " + pattern[pidx]);
+ i = pattern[pidx];
if ((i & 1) != 0)
this.lastindex = i / 2 + 1;
if (i > this.lastmark)
@@ -577,7 +577,7 @@
case SRE_OP_LITERAL:
/* match literal character */
/* <LITERAL> <code> */
- TRACE(pidx, ptr, "LITERAL " + (int) pattern[pidx]);
+ TRACE(pidx, ptr, "LITERAL " + pattern[pidx]);
if (ptr >= end || str[ptr] != pattern[pidx])
return 0;
@@ -588,7 +588,7 @@
case SRE_OP_NOT_LITERAL:
/* match anything that is not literal character */
/* args: <code> */
- TRACE(pidx, ptr, "NOT_LITERAL " + (int) pattern[pidx]);
+ TRACE(pidx, ptr, "NOT_LITERAL " + pattern[pidx]);
if (ptr >= end || str[ptr] == pattern[pidx])
return 0;
pidx++;
@@ -604,8 +604,8 @@
case SRE_OP_AT:
/* match at given position */
/* <AT> <code> */
- TRACE(pidx, ptr, "AT " + (int) pattern[pidx]);
- if (!SRE_AT(ptr, (int)pattern[pidx]))
+ TRACE(pidx, ptr, "AT " + pattern[pidx]);
+ if (!SRE_AT(ptr, pattern[pidx]))
return 0;
pidx++;
break;
@@ -613,9 +613,9 @@
case SRE_OP_CATEGORY:
/* match at given category */
/* <CATEGORY> <code> */
- TRACE(pidx, ptr, "CATEGORY " + (int)pattern[pidx]);
+ TRACE(pidx, ptr, "CATEGORY " + pattern[pidx]);
- if (ptr >= end || !sre_category((int)pattern[pidx], str[ptr]))
+ if (ptr >= end || !sre_category(pattern[pidx], str[ptr]))
return 0;
pidx++;
@@ -650,7 +650,7 @@
break;
case SRE_OP_LITERAL_IGNORE:
- TRACE(pidx, ptr, "LITERAL_IGNORE " + (int) pattern[pidx]);
+ TRACE(pidx, ptr, "LITERAL_IGNORE " + pattern[pidx]);
if (ptr >= end || lower(str[ptr]) != lower(pattern[pidx]))
return 0;
pidx++;
@@ -658,7 +658,7 @@
break;
case SRE_OP_NOT_LITERAL_IGNORE:
- TRACE(pidx, ptr, "NOT_LITERAL_IGNORE " + (int) pattern[pidx]);
+ TRACE(pidx, ptr, "NOT_LITERAL_IGNORE " + pattern[pidx]);
if (ptr >= end || lower(str[ptr]) == lower(pattern[pidx]))
return 0;
pidx++;
@@ -679,7 +679,7 @@
case SRE_OP_INFO:
/* jump forward */
/* <JUMP> <offset> */
- TRACE(pidx, ptr, "JUMP " + (int) pattern[pidx]);
+ TRACE(pidx, ptr, "JUMP " + pattern[pidx]);
pidx += pattern[pidx];
break;
@@ -724,7 +724,7 @@
int mincount = pattern[pidx+1];
- TRACE(pidx, ptr, "REPEAT_ONE " + mincount + " " + (int)pattern[pidx+2]);
+ TRACE(pidx, ptr, "REPEAT_ONE " + mincount + " " + pattern[pidx+2]);
if (ptr + mincount > end)
return 0; /* cannot match */
@@ -860,7 +860,7 @@
by the UNTIL operator (MAX_UNTIL, MIN_UNTIL) */
/* <REPEAT> <skip> <1=min> <2=max> item <UNTIL> tail */
- TRACE(pidx, ptr, "REPEAT " + (int)pattern[pidx+1] + " " + (int)pattern[pidx+2]);
+ TRACE(pidx, ptr, "REPEAT " + pattern[pidx+1] + " " + pattern[pidx+2]);
SRE_REPEAT rep = new SRE_REPEAT(repeat);
rep.count = -1;
@@ -1033,7 +1033,7 @@
case SRE_OP_ASSERT:
/* assert subpattern */
/* args: <skip> <back> <pattern> */
- TRACE(pidx, ptr, "ASSERT " + (int) pattern[pidx+1]);
+ TRACE(pidx, ptr, "ASSERT " + pattern[pidx+1]);
this.ptr = ptr - pattern[pidx + 1];
if (this.ptr < this.beginning)
@@ -1047,7 +1047,7 @@
case SRE_OP_ASSERT_NOT:
/* assert not subpattern */
/* args: <skip> <pattern> */
- TRACE(pidx, ptr, "ASSERT_NOT " + (int) pattern[pidx]);
+ TRACE(pidx, ptr, "ASSERT_NOT " + pattern[pidx]);
this.ptr = ptr - pattern[pidx + 1];
if (this.ptr >= this.beginning) {
i = SRE_MATCH(pattern, pidx + 2, level + 1);
@@ -1065,7 +1065,7 @@
return 0;
default:
- TRACE(pidx, ptr, "UNKNOWN " + (int) pattern[pidx-1]);
+ TRACE(pidx, ptr, "UNKNOWN " + pattern[pidx-1]);
return SRE_ERROR_ILLEGAL;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
