[orca/570658] Port J2SE Access Bridge to new braille generator

[William Walker <wwalker src gnome org>]

commit 9be4a8cc2e2384ffb8b211a367b9a7638473131b
Author: Willie Walker <william walker sun com>
Date:   Mon Jun 29 17:20:58 2009 -0400

    Port J2SE Access Bridge to new braille generator
    
    Something is still a little odd about arrowing up and down tables.
    We braille the line correctly, but then immediately braille "Tree".
    I think it may be a timing issue with selection events.

 po/POTFILES.in                                     |    1 -
 .../toolkits/J2SE-access-bridge/Makefile.am        |    1 -
 .../toolkits/J2SE-access-bridge/__init__.py        |    1 -
 .../J2SE-access-bridge/braillegenerator.py         |   89 --------------------
 .../toolkits/J2SE-access-bridge/formatting.py      |    5 +
 .../scripts/toolkits/J2SE-access-bridge/script.py  |    8 +--
 6 files changed, 6 insertions(+), 99 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4ddb51a..895c432 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -61,7 +61,6 @@ src/orca/scripts/toolkits/Gecko/bookmarks.py
 src/orca/scripts/toolkits/Gecko/script.py
 src/orca/scripts/toolkits/Gecko/speech_generator.py
 src/orca/scripts/toolkits/Gecko/structural_navigation.py
-src/orca/scripts/toolkits/J2SE-access-bridge/braillegenerator.py
 src/orca/scripts/toolkits/J2SE-access-bridge/speech_generator.py
 src/orca/settings.py
 src/orca/speechdispatcherfactory.py
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am b/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
index c2025fa..61cfcc3 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/Makefile.am
@@ -2,7 +2,6 @@ orca_pathdir=$(pyexecdir)
 
 orca_python_PYTHON = \
 	__init__.py \
-	braillegenerator.py \
 	formatting.py \
 	script.py \
 	speech_generator.py
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py b/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
index c9714a9..5707f93 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/__init__.py
@@ -1,3 +1,2 @@
 from script import Script
 from speech_generator import SpeechGenerator
-from braillegenerator import BrailleGenerator
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/formatting.py b/src/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
index f8c2095..419cc51 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/formatting.py
@@ -42,6 +42,11 @@ formatting = {
             'unfocused': '(displayedText or roleName) + expandableState',
             'focused': 'expandableState'
             },
+    },
+    'braille': {
+        pyatspi.ROLE_LABEL: {
+            'unfocused': '[Component(obj, asString(displayedText + expandableState))]'
+            },
     }
 }
 
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
index dac1e30..fd627b6 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/script.py
@@ -31,7 +31,6 @@ import orca.orca as orca
 import orca.orca_state as orca_state
 import orca.keybindings as keybindings
 
-from braillegenerator import BrailleGenerator
 from speech_generator import SpeechGenerator
 from formatting import Formatting
 
@@ -51,13 +50,8 @@ class Script(default.Script):
         """
         default.Script.__init__(self, app)
 
-    def getBrailleGenerator(self):
-        """Returns the braille generator for this script.
-        """
-        return BrailleGenerator(self)
-
     def getSpeechGenerator(self):
-        """Returns the braille generator for this script.
+        """Returns the speech generator for this script.
         """
         return SpeechGenerator(self)