[orca] Remove the go{Next,Previous}ObjectInOrder methods

[Joanmarie Diggs <joanied src gnome org>]

commit a65589959a9363a22787106bf9a2c76ed62143cf
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Aug 8 16:54:40 2014 -0400

    Remove the go{Next,Previous}ObjectInOrder methods
    
    Aside from being largely broken, these methods were implemented as a
    work-around for getting out of form fields. Now that Orca has browse
    mode and focus mode and the user can toggle between the two, this work-
    around is no longer needed.

 src/orca/scripts/toolkits/Gecko/keymaps.py |    6 -
 src/orca/scripts/toolkits/Gecko/script.py  |  153 ----------------------------
 2 files changed, 0 insertions(+), 159 deletions(-)
---
diff --git a/src/orca/scripts/toolkits/Gecko/keymaps.py b/src/orca/scripts/toolkits/Gecko/keymaps.py
index 4ee860f..d4516a5 100644
--- a/src/orca/scripts/toolkits/Gecko/keymaps.py
+++ b/src/orca/scripts/toolkits/Gecko/keymaps.py
@@ -86,12 +86,6 @@ commonKeymap = (
     "toggleCaretNavigationHandler"),
 
     ("a", defaultModifierMask, ORCA_MODIFIER_MASK, "togglePresentationModeHandler"),
-
-    ("Right", defaultModifierMask, ORCA_MODIFIER_MASK,
-    "goNextObjectInOrderHandler"),
-
-    ("Left", defaultModifierMask, ORCA_MODIFIER_MASK, 
-    "goPreviousObjectInOrderHandler"),
 )
 
 desktopKeymap = (
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 1af428d..f43b38a 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -393,16 +393,6 @@ class Script(default.Script):
                 Script.reviewLiveAnnouncement,
                 cmdnames.LIVE_REGIONS_REVIEW)
 
-        self.inputEventHandlers["goPreviousObjectInOrderHandler"] = \
-            input_event.InputEventHandler(
-                Script.goPreviousObjectInOrder,
-                cmdnames.CARET_NAVIGATION_PREV_OBJECT)
-
-        self.inputEventHandlers["goNextObjectInOrderHandler"] = \
-            input_event.InputEventHandler(
-                Script.goNextObjectInOrder,
-                cmdnames.CARET_NAVIGATION_NEXT_OBJECT)
-
         self.inputEventHandlers["toggleCaretNavigationHandler"] = \
             input_event.InputEventHandler(
                 Script.toggleCaretNavigation,
@@ -3934,149 +3924,6 @@ class Script(default.Script):
                 if name in ["open", _("open")]:
                     action.doAction(i)
                     break
-    def goPreviousObjectInOrder(self, inputEvent):
-        """Go to the previous object in order, regardless of type or size."""
-
-        [obj, characterOffset] = self.getCaretContext()
-
-        # Work our way out of form lists and combo boxes.
-        #
-        if obj and obj.getState().contains(pyatspi.STATE_SELECTABLE):
-            obj = obj.parent.parent
-            characterOffset = self.utilities.characterOffsetInParent(obj)
-            self.currentLineContents = None
-
-        characterOffset = max(0, characterOffset)
-        [prevObj, prevOffset] = [obj, characterOffset]
-        found = False
-        mayHaveGoneTooFar = False
-
-        line = self.currentLineContents \
-               or self.getLineContentsAtOffset(obj, characterOffset)
-        startingPoint = line
-        useful = self.getMeaningfulObjectsFromLine(line)
-
-        while line and not found:
-            index = self.findObjectOnLine(prevObj, prevOffset, useful)
-            if not self.utilities.isSameObject(obj, prevObj):
-                # The question is, have we found the beginning of this
-                # object?  If the offset is 0 or there's more than one
-                # object on this line and we started on a later line,
-                # it's safe to assume we've found the beginning.
-                #
-                found = (prevOffset == 0) \
-                        or (len(useful) > 1 and line != startingPoint)
-
-                # Otherwise, we won't know for certain until we've gone
-                # to the line(s) before this one and found a different
-                # object, at which point we may have gone too far.
-                #
-                if not found:
-                    mayHaveGoneTooFar = True
-                    obj = prevObj
-                    characterOffset = prevOffset
-
-            elif 0 < index < len(useful):
-                prevObj = useful[index - 1][0]
-                prevOffset = useful[index - 1][1]
-                found = (prevOffset == 0) or (index > 1)
-                if not found:
-                    mayHaveGoneTooFar = True
-
-            elif self.utilities.isSameObject(obj, prevObj) \
-                 and 0 == prevOffset < characterOffset:
-                found = True
-
-            if not found:
-                self._nextLineContents = line
-                prevLine = self.findPreviousLine(line[0][0], line[0][1])
-                line = self.currentLineContents
-                useful = self.getMeaningfulObjectsFromLine(line)
-                prevObj = useful[-1][0]
-                prevOffset = useful[-1][1]
-                if self.currentLineContents == self._nextLineContents:
-                    break
-
-        if not found:
-            self.presentMessage(messages.WRAPPING_TO_BOTTOM)
-            [prevObj, prevOffset] = self.getBottomOfFile()
-            line = self.getLineContentsAtOffset(prevObj, prevOffset)
-            useful = self.getMeaningfulObjectsFromLine(line)
-            if useful:
-                prevObj = useful[-1][0]
-                prevOffset = useful[-1][1]
-            found = not (prevObj is None)
-
-        elif mayHaveGoneTooFar and self._nextLineContents:
-            if not self.utilities.isSameObject(obj, prevObj):
-                prevObj = useful[index][0]
-                prevOffset = useful[index][1]
-
-        if found:
-            self.currentLineContents = line
-            self.setCaretPosition(prevObj, prevOffset)
-            self.updateBraille(prevObj)
-            objectContents = self.getObjectContentsAtOffset(prevObj,
-                                                            prevOffset)
-            objectContents = [objectContents[0]]
-            self.speakContents(objectContents)
-
-    def goNextObjectInOrder(self, inputEvent):
-        """Go to the next object in order, regardless of type or size."""
-
-        [obj, characterOffset] = self.getCaretContext()
-
-        # Work our way out of form lists and combo boxes.
-        #
-        if obj and obj.getState().contains(pyatspi.STATE_SELECTABLE):
-            obj = obj.parent.parent
-            characterOffset = self.utilities.characterOffsetInParent(obj)
-            self.currentLineContents = None
-
-        characterOffset = max(0, characterOffset)
-        [nextObj, nextOffset] = [obj, characterOffset]
-        found = False
-
-        line = self.currentLineContents \
-               or self.getLineContentsAtOffset(obj, characterOffset)
-
-        while line and not found:
-            useful = self.getMeaningfulObjectsFromLine(line)
-            index = self.findObjectOnLine(nextObj, nextOffset, useful)
-            if not self.utilities.isSameObject(obj, nextObj):
-                nextObj = useful[0][0]
-                nextOffset = useful[0][1]
-                found = True
-            elif 0 <= index < len(useful) - 1:
-                nextObj = useful[index + 1][0]
-                nextOffset = useful[index + 1][1]
-                found = True
-            else:
-                self._previousLineContents = line
-                [nextObj, nextOffset] = self.findNextLine(line[-1][0],
-                                                          line[-1][2])
-                line = self.currentLineContents
-                if self.currentLineContents == self._previousLineContents:
-                    break
-
-        if not found:
-            self.presentMessage(messages.WRAPPING_TO_TOP)
-            [nextObj, nextOffset] = self.getTopOfFile()
-            line = self.getLineContentsAtOffset(nextObj, nextOffset)
-            useful = self.getMeaningfulObjectsFromLine(line)
-            if useful:
-                nextObj = useful[0][0]
-                nextOffset = useful[0][1]
-            found = not (nextObj is None)
-
-        if found:
-            self.currentLineContents = line
-            self.setCaretPosition(nextObj, nextOffset)
-            self.updateBraille(nextObj)
-            objectContents = self.getObjectContentsAtOffset(nextObj,
-                                                            nextOffset)
-            objectContents = [objectContents[0]]
-            self.speakContents(objectContents)
 
     def advanceLivePoliteness(self, inputEvent):
         """Advances live region politeness level."""