From: <pj...@us...> - 2008-10-25 21:53:54
|
Revision: 5507 http://jython.svn.sourceforge.net/jython/?rev=5507&view=rev Author: pjenvey Date: 2008-10-25 21:53:49 +0000 (Sat, 25 Oct 2008) Log Message: ----------- rename to _update to match the other _update method, we'll keep the underscore for incase we want to add update to go along with set_update Modified Paths: -------------- trunk/jython/src/org/python/core/BaseSet.java trunk/jython/src/org/python/core/PyFrozenSet.java trunk/jython/src/org/python/core/PySet.java Modified: trunk/jython/src/org/python/core/BaseSet.java =================================================================== --- trunk/jython/src/org/python/core/BaseSet.java 2008-10-25 21:47:49 UTC (rev 5506) +++ trunk/jython/src/org/python/core/BaseSet.java 2008-10-25 21:53:49 UTC (rev 5507) @@ -26,7 +26,7 @@ } protected void _update(PyObject data) throws PyIgnoreMethodTag { - update(_set, data); + _update(_set, data); } /** @@ -35,7 +35,7 @@ * @param data An iterable instance. * @throws PyIgnoreMethodTag Ignore. */ - protected static Set update(Set set, PyObject data) throws PyIgnoreMethodTag { + protected static Set _update(Set set, PyObject data) throws PyIgnoreMethodTag { if (data == null) { return set; } Modified: trunk/jython/src/org/python/core/PyFrozenSet.java =================================================================== --- trunk/jython/src/org/python/core/PyFrozenSet.java 2008-10-25 21:47:49 UTC (rev 5506) +++ trunk/jython/src/org/python/core/PyFrozenSet.java 2008-10-25 21:53:49 UTC (rev 5507) @@ -19,11 +19,11 @@ } public PyFrozenSet(PyObject data) { - super(update(new HashSet<PyObject>(), data)); + super(_update(new HashSet<PyObject>(), data)); } public PyFrozenSet(PyType type, PyObject data) { - super(type, update(new HashSet<PyObject>(), data)); + super(type, _update(new HashSet<PyObject>(), data)); } @ExposedNew Modified: trunk/jython/src/org/python/core/PySet.java =================================================================== --- trunk/jython/src/org/python/core/PySet.java 2008-10-25 21:47:49 UTC (rev 5506) +++ trunk/jython/src/org/python/core/PySet.java 2008-10-25 21:53:49 UTC (rev 5507) @@ -23,7 +23,7 @@ } public PySet(PyObject data) { - super(update(new ConcurrentHashSet<PyObject>(), data)); + super(_update(new ConcurrentHashSet<PyObject>(), data)); } @ExposedNew This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |