Index: src/orca/flat_review.py
===================================================================
--- src/orca/flat_review.py	(revision 2377)
+++ src/orca/flat_review.py	(working copy)
@@ -821,6 +821,7 @@
         #
         if (accessible.role != rolenames.ROLE_COMBO_BOX) \
             and (accessible.role != rolenames.ROLE_EMBEDDED) \
+            and (accessible.role != rolenames.ROLE_LABEL) \
             and (accessible.role != rolenames.ROLE_MENU) \
             and accessible.childCount > 0:
             pass
@@ -956,12 +957,26 @@
 
         if not root:
             return []
+        
+        zones = []
 
         # If we're at a leaf node, then we've got a good one on our hands.
         #
         if root.childCount <= 0:
             return self.getZonesFromAccessible(root, root.extents)
 
+        # Handle non-leaf Java JTree nodes. If the node is collapsed,
+        # treat it as a leaf node. If it's expanded, add it to the
+        # Zones list.
+        #
+        if root.state.count(atspi.Accessibility.STATE_EXPANDABLE):
+            if root.state.count(atspi.Accessibility.STATE_COLLAPSED):
+                return self.getZonesFromAccessible(root, root.extents)
+            elif root.state.count(atspi.Accessibility.STATE_EXPANDED):
+                treenode = self.getZonesFromAccessible(root, root.extents)
+                if treenode:
+                    zones.extend(treenode)
+
         # We'll stop at various objects because, while they do have
         # children, we logically think of them as one region on the
         # screen.  [[[TODO: WDW - HACK stopping at menu bars for now
@@ -982,7 +997,6 @@
         # parents, especially those that implement accessible text.  Logged
         # as bugzilla bug 319773.]]]
         #
-        zones = []
         if root.role == rolenames.ROLE_PAGE_TAB:
             zones.extend(self.getZonesFromAccessible(root, root.extents))
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2377)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+2007-05-11  Lynn MonSanto <lynn.monsanto@sun.com>
+
+        * src/orca/flat-review.py: Fix for Bug 436674 flat-review 
+	only visits right-most tree nodes in SwingSet2 JTree demo
+
 2007-05-11  Rich Burridge <rich.burridge@sun.com>
 
         * src/orca/scripts/gaim.py:
