[Jython-checkins] jython: Fixed terminology in doc of finalizer-stuff.

[stefan.richthofer]

https://hg.python.org/jython/rev/adae7d83b71e
changeset:   7986:adae7d83b71e
user:        Stefan Richthofer <stefan.richthofer at gmx.de>
date:        Sat Jan 07 20:15:31 2017 +0100
summary:
  Fixed terminology in doc of finalizer-stuff.

files:
  src/org/python/core/TraverseprocDerived.java                     |   2 +-
  src/org/python/core/finalization/FinalizableBuiltin.java         |   2 +-
  src/org/python/core/finalization/FinalizablePyObject.java        |  10 +++++-----
  src/org/python/core/finalization/FinalizablePyObjectDerived.java |   2 +-
  4 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/src/org/python/core/TraverseprocDerived.java b/src/org/python/core/TraverseprocDerived.java
--- a/src/org/python/core/TraverseprocDerived.java
+++ b/src/org/python/core/TraverseprocDerived.java
@@ -5,7 +5,7 @@
  * but traverses only the {@code slots[]}-array of
  * {@code fooDerived}-classes. This way we avoid that the traverse
  * method of a traversable {@link org.python.core.PyObject} is
- * overwritten by the derived version.
+ * overridden by the derived version.
  * {@link org.python.modules.gc#traverse(PyObject, Visitproc, Object)} takes care of
  * exploiting both traverse methods.
  */
diff --git a/src/org/python/core/finalization/FinalizableBuiltin.java b/src/org/python/core/finalization/FinalizableBuiltin.java
--- a/src/org/python/core/finalization/FinalizableBuiltin.java
+++ b/src/org/python/core/finalization/FinalizableBuiltin.java
@@ -12,7 +12,7 @@
      * A FinalizeTrigger calls {@link FinalizablePyObjectDerived#__del_derived__()}
      * first and - if existent - {@link #__del_builtin__()} after that. A plain
      * {@link FinalizablePyObject#__del__()}
-     * would behave as overwritten by
+     * would behave as overridden by
      * {@link FinalizablePyObjectDerived#__del_derived__()}, i.e. won't be called
      * if the type implements {@link FinalizablePyObjectDerived}, while
      * {@link #__del_builtin__()} is called in any case.
diff --git a/src/org/python/core/finalization/FinalizablePyObject.java b/src/org/python/core/finalization/FinalizablePyObject.java
--- a/src/org/python/core/finalization/FinalizablePyObject.java
+++ b/src/org/python/core/finalization/FinalizablePyObject.java
@@ -7,7 +7,7 @@
  * {@link org.python.core.finalization.FinalizableBuiltin}.
  * </p>
  * <p>
- * The difference is that {@link #__del__()} can be overwritten by a
+ * The difference is that {@link #__del__()} can be overridden by a
  * new-style subclass's {@code __del__}-method on Python-side, while
  * {@link FinalizableBuiltin#__del_builtin__()} is always called.
  * If a Python-side finalizer exists,
@@ -20,7 +20,7 @@
  * call {@link #__del__()} first and then
  * {@link FinalizableBuiltin#__del_builtin__()}. If a
  * new-style subclass has an own, Python-side {@code __del__}-method, this
- * overwrites the Java-implemented {@link #__del__()}, but not
+ * overrides the Java-implemented {@link #__del__()}, but not
  * {@link FinalizableBuiltin#__del_builtin__()}, which will be called after
  * the Python-side finalizer.
  * </p>
@@ -76,9 +76,9 @@
  * implementations.
  * </p>
  * <p>
- * Note that it is not possible to overwrite {@code __ensure_finalizer__} on Python side.
- * If one overwrites {@code __ensure_finalizer__} on Python side, Jython will ignore the
- * overwrite-implementation and still call the original one.
+ * Note that it is not possible to override {@code __ensure_finalizer__} on Python side.
+ * If one overrides {@code __ensure_finalizer__} on Python side, Jython will ignore the
+ * override-implementation and still call the original one.
  * </p>
  * <p>
  * It is possible to switch finalization on and off at any desired time for a certain object.
diff --git a/src/org/python/core/finalization/FinalizablePyObjectDerived.java b/src/org/python/core/finalization/FinalizablePyObjectDerived.java
--- a/src/org/python/core/finalization/FinalizablePyObjectDerived.java
+++ b/src/org/python/core/finalization/FinalizablePyObjectDerived.java
@@ -16,7 +16,7 @@
      * {@code __del_derived__} refers to an instance's in-dict {@code __del__}.
      * A FinalizeTrigger calls {@code __del_derived__} first and
      * - if existent - {@code __del_builtin__} after that. A plain {@code __del__}
-     * would behave as overwritten by {@code __del_derived__}, i.e. won't be called
+     * would behave as overridden by {@code __del_derived__}, i.e. won't be called
      * if the type implements {@code FinalizablePyObjectDerived} while
      * {@code __del_builtin__} is called in any case.
      */

-- 
Repository URL: https://hg.python.org/jython