[orca] Use text.characterCount directly instead of a script method to return that value



commit 80b15e138a1664c4915a96b8758ce206afcc4af7
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Jun 9 12:39:11 2014 -0400

    Use text.characterCount directly instead of a script method to return that value

 src/orca/script_utilities.py                   |   16 ++++++++--------
 src/orca/scripts/apps/gnome-terminal/script.py |   12 ------------
 src/orca/scripts/default.py                    |   13 -------------
 3 files changed, 8 insertions(+), 33 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index b905436..79fd890 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -580,7 +580,7 @@ class Utilities:
         except NotImplementedError:
             pass
         else:
-            displayedText = text.getText(0, self._script.getTextEndOffset(text))
+            displayedText = text.getText(0, text.characterCount)
 
             # [[[WDW - HACK to account for things such as Gecko that want
             # to use the EMBEDDED_OBJECT_CHARACTER on a label to hold the
@@ -1248,7 +1248,7 @@ class Utilities:
                     except NotImplementedError:
                         continue
                     else:
-                        if text.getText(0, self._script.getTextEndOffset(text)):
+                        if text.getText(0, text.characterCount):
                             activeDescendant = child
 
         self._script.generatorCache[self.REAL_ACTIVE_DESCENDANT][obj] = \
@@ -1609,7 +1609,7 @@ class Utilities:
                         morePossibleSelections = True
                     else:
                         displayedText = prevObjText.getText(0,
-                            self._script.getTextEndOffset(prevObjText))
+                            prevObjText.characterCount)
                         if len(displayedText) == 0:
                             current = prevObj
                             morePossibleSelections = True
@@ -1631,7 +1631,7 @@ class Utilities:
                         morePossibleSelections = True
                     else:
                         displayedText = nextObjText.getText(0,
-                            self._script.getTextEndOffset(nextObjText))
+                            nextObjText.characterCount)
                         if len(displayedText) == 0:
                             current = nextObj
                             morePossibleSelections = True
@@ -1779,7 +1779,7 @@ class Utilities:
         else:
             otherSelected = False
             text = obj.queryText()
-            displayedText = text.getText(0, self._script.getTextEndOffset(text))
+            displayedText = text.getText(0, text.characterCount)
             if (text.caretOffset == 0) or len(displayedText) == 0:
                 current = obj
                 morePossibleSelections = True
@@ -1794,7 +1794,7 @@ class Utilities:
                                 otherSelected = True
                             else:
                                 displayedText = prevObjText.getText(0,
-                                    self._script.getTextEndOffset(prevObjText))
+                                    prevObjText.characterCount)
                                 if len(displayedText) == 0:
                                     current = prevObj
                                     morePossibleSelections = True
@@ -1813,7 +1813,7 @@ class Utilities:
                                 otherSelected = True
                             else:
                                 displayedText = nextObjText.getText(0,
-                                    self._script.getTextEndOffset(nextObjText))
+                                    nextObjText.characterCount)
                                 if len(displayedText) == 0:
                                     current = nextObj
                                     morePossibleSelections = True
@@ -2005,7 +2005,7 @@ class Utilities:
         except NotImplementedError:
             return '', 0, 0
 
-        text_contents = ti.getText(0, self._script.getTextEndOffset(ti))
+        text_contents = ti.getText(0, ti.characterCount)
         line_offsets = []
         start_offset = 0
         while True:
diff --git a/src/orca/scripts/apps/gnome-terminal/script.py b/src/orca/scripts/apps/gnome-terminal/script.py
index 47571b9..1eeca09 100644
--- a/src/orca/scripts/apps/gnome-terminal/script.py
+++ b/src/orca/scripts/apps/gnome-terminal/script.py
@@ -112,16 +112,4 @@ class Script(gtk.Script):
                                           pyatspi.TEXT_BOUNDARY_LINE_START)
 
         return string, caretOffset, lineOffset
-        
-    def getTextEndOffset(self, textInterface):
-        """Returns the offset which should be used as the end offset.
-        By default, this is -1. However, this value triggers an assertion
-        in certain apps. See bug 598797.
 
-        Argument:
-        - textInterface: the accessible text interface for which the end
-          offset is desired.
-
-        """
-
-        return textInterface.characterCount
diff --git a/src/orca/scripts/default.py b/src/orca/scripts/default.py
index e1ce333..b47146a 100644
--- a/src/orca/scripts/default.py
+++ b/src/orca/scripts/default.py
@@ -3899,19 +3899,6 @@ class Script(script.Script):
             if not moreLines:
                 done = True
 
-    def getTextEndOffset(self, textInterface):
-        """Returns the offset which should be used as the end offset.
-        By default, this is -1. However, this value triggers an assertion
-        in certain apps. See bug 598797.
-
-        Argument:
-        - textInterface: the accessible text interface for which the end
-          offset is desired.
-
-        """
-
-        return -1
-
     def getTextLineAtCaret(self, obj, offset=None):
         """Gets the line of text where the caret is.
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]