[orca/570658] Remove the old default braillegenerator.py altogether

[William Walker <wwalker src gnome org>]

commit d7c4e26e6ae622b7674719aa198ae2fe27b0e99a
Author: Willie Walker <william walker sun com>
Date:   Mon Jun 29 16:44:49 2009 -0400

    Remove the old default braillegenerator.py altogether

 po/POTFILES.in               |    1 -
 src/orca/Makefile.am         |    1 -
 src/orca/braillegenerator.py | 1878 ------------------------------------------
 src/orca/default.py          |   10 +-
 src/orca/script.py           |    4 +-
 5 files changed, 3 insertions(+), 1891 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f0907a8..4ddb51a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,6 @@ orca.desktop.in
 src/orca/app_gui_prefs.py
 src/orca/bookmarks.py
 src/orca/braille_generator.py
-src/orca/braillegenerator.py
 src/orca/braille.py
 src/orca/chnames.py
 src/orca/default.py
diff --git a/src/orca/Makefile.am b/src/orca/Makefile.am
index cfd89ae..e1266af 100644
--- a/src/orca/Makefile.am
+++ b/src/orca/Makefile.am
@@ -13,7 +13,6 @@ orca_python_PYTHON = \
 	app_prefs.py \
 	bookmarks.py \
 	braille.py \
-	braillegenerator.py \
 	braille_generator.py \
 	brlmon.py \
 	chnames.py \
diff --git a/src/orca/default.py b/src/orca/default.py
index 5380bfd..0be44cd 100644
--- a/src/orca/default.py
+++ b/src/orca/default.py
@@ -3138,16 +3138,8 @@ class Script(script.Script):
             text = obj.queryText()
         except NotImplementedError:
             text = None
-        if text and self.isTextArea(obj):
-            [lineString, startOffset, endOffset] = text.getTextAtOffset(
-                text.caretOffset,
-                pyatspi.TEXT_BOUNDARY_LINE_START)
-            if startOffset == 0:
-                line.addRegions(self.brailleGenerator.getBrailleContext(obj))
-        else:
-            line.addRegions(self.brailleGenerator.getBrailleContext(obj))
 
-        result = self.brailleGenerator.getBrailleRegions(obj)
+        result = self.brailleGenerator.generateBraille(obj)
         line.addRegions(result[0])
 
         if extraRegion:
diff --git a/src/orca/script.py b/src/orca/script.py
index 458e869..5bbca01 100644
--- a/src/orca/script.py
+++ b/src/orca/script.py
@@ -39,7 +39,7 @@ __date__      = "$Date$"
 __copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
 __license__   = "LGPL"
 
-import braillegenerator
+import braille_generator
 import debug
 import flat_review
 import formatting
@@ -188,7 +188,7 @@ class Script:
     def getBrailleGenerator(self):
         """Returns the braille generator for this script.
         """
-        return braillegenerator.BrailleGenerator(self)
+        return braille_generator.BrailleGenerator(self)
 
     def getSpeechGenerator(self):
         """Returns the speech generator for this script.