[orca/570658-whereami] Minor changes from Will's feedback.

[Joanmarie Diggs <joanied src gnome org>]

commit 22d92c44302add7c7105dd433d44700fa72b7943
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Mon Jun 8 20:45:46 2009 -0400

    Minor changes from Will's feedback.
---
 src/orca/scripts/apps/soffice/speech_generator.py  |    4 ---
 src/orca/scripts/toolkits/Gecko/script.py          |    2 +-
 .../scripts/toolkits/Gecko/speech_generator.py     |   23 ++++++++++---------
 src/orca/speech_generator.py                       |    2 +-
 test/keystrokes/firefox/moz_slider.py              |    5 +--
 test/keystrokes/firefox/uiuc_slider.py             |    2 +-
 6 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/orca/scripts/apps/soffice/speech_generator.py b/src/orca/scripts/apps/soffice/speech_generator.py
index 5cd47ab..3aa63d6 100644
--- a/src/orca/scripts/apps/soffice/speech_generator.py
+++ b/src/orca/scripts/apps/soffice/speech_generator.py
@@ -424,10 +424,6 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
 
     def generateSpeech(self, obj, **args):
         result = []
-        # Basic WhereAmI for spreadsheet cells has a different formatting
-        # string than the one typically used for other table cells, even
-        # in OOo. [[[JD to WDW: What's the "right" way to do this?]]]
-        #
         if args.get('formatType', 'unfocused') == 'basicWhereAmI' \
            and self._script.isSpreadSheetCell(obj):
             oldRole = self._overrideRole('ROLE_SPREADSHEET_CELL', args)
diff --git a/src/orca/scripts/toolkits/Gecko/script.py b/src/orca/scripts/toolkits/Gecko/script.py
index 570958d..abcc96f 100644
--- a/src/orca/scripts/toolkits/Gecko/script.py
+++ b/src/orca/scripts/toolkits/Gecko/script.py
@@ -3936,7 +3936,7 @@ class Script(default.Script):
 
         return lineContents
 
-    def getPageSummary(self, obj, **args):
+    def getPageSummary(self, obj):
         """Returns the quantity of headings, forms, tables, visited links,
         and unvisited links on the page containing obj.
         """
diff --git a/src/orca/scripts/toolkits/Gecko/speech_generator.py b/src/orca/scripts/toolkits/Gecko/speech_generator.py
index 4857632..6c0dd66 100644
--- a/src/orca/scripts/toolkits/Gecko/speech_generator.py
+++ b/src/orca/scripts/toolkits/Gecko/speech_generator.py
@@ -452,7 +452,7 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
         """
         result = []
         headings, forms, tables, vlinks, uvlinks, percent = \
-            self._script.getPageSummary(obj, **args)
+            self._script.getPageSummary(obj)
         if headings:
             # Translators: Announces the number of headings in the
             # web page that is currently being displayed.
@@ -493,19 +493,20 @@ class SpeechGenerator(speech_generator.SpeechGenerator):
 
     def generateSpeech(self, obj, **args):
         result = []
-        # Detailed WhereAmI always overrides role-based output and produces
-        # a page summary when in document content. [[[JD to WDW: What's the
-        # "right" way to do this?]]]
+        # Detailed WhereAmI should always be a page summary if we
+        # are in document content.
         #
-        args['oldRole'] = args.get('role')
         if args.get('formatType', 'unfocused') == 'detailedWhereAmI' \
            and self._script.inDocumentContent(obj):
-            args['role'] = 'default'
+            oldRole = self._overrideRole('default', args)
+            result.extend(speech_generator.SpeechGenerator.\
+                                           generateSpeech(self, obj, **args))
+            self._restoreRole(oldRole, args)
         # ARIA widgets get treated like regular default widgets.
         #
-        args['isAria'] = self._script.isAriaWidget(obj)
-        result = speech_generator.SpeechGenerator.generateSpeech(
-                     self, obj, **args)
-        del args['isAria']
-        args['role'] = args['oldRole']
+        else:
+            args['isAria'] = self._script.isAriaWidget(obj)
+            result.extend(speech_generator.SpeechGenerator.\
+                                           generateSpeech(self, obj, **args))
+            del args['isAria']
         return result
diff --git a/src/orca/speech_generator.py b/src/orca/speech_generator.py
index 42ffe08..b920384 100644
--- a/src/orca/speech_generator.py
+++ b/src/orca/speech_generator.py
@@ -1515,7 +1515,7 @@ class SpeechGenerator:
                 * 100.0
             # Translators: this is the percentage value of a progress bar.
             #
-            percentage = _("%d percent.") % percentValue + " "
+            percentage = _("%d percent.") % percentValue
             result.append(percentage)
         return result
 
diff --git a/test/keystrokes/firefox/moz_slider.py b/test/keystrokes/firefox/moz_slider.py
index ff09fcd..622ffec 100644
--- a/test/keystrokes/firefox/moz_slider.py
+++ b/test/keystrokes/firefox/moz_slider.py
@@ -44,10 +44,9 @@ sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI",
-    ["BUG? - We used to present '10.0 10 percent '. But there is not any text displayed for the current value. What is the desired output?",
-     "BRAILLE LINE:  '10% Slider'",
+    ["BRAILLE LINE:  '10% Slider'",
      "     VISIBLE:  '10% Slider', cursor=1",
-     "SPEECH OUTPUT: 'slider 10% 10 percent. '"]))
+     "SPEECH OUTPUT: 'slider 10% 10 percent.'"]))
 
 ########################################################################
 # Move the slider several times.  The following will be presented for each.
diff --git a/test/keystrokes/firefox/uiuc_slider.py b/test/keystrokes/firefox/uiuc_slider.py
index 0b67f7d..14f4f00 100644
--- a/test/keystrokes/firefox/uiuc_slider.py
+++ b/test/keystrokes/firefox/uiuc_slider.py
@@ -46,7 +46,7 @@ sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
     ["BRAILLE LINE:  'Slider Control 1 50 Slider'",
      "     VISIBLE:  'Slider Control 1 50 Slider', cursor=1",
-     "SPEECH OUTPUT: 'Slider Control 1 slider 50 50 percent. '"]))
+     "SPEECH OUTPUT: 'Slider Control 1 slider 50 50 percent.'"]))
     
 ########################################################################
 # Increment slider several times