[orca] Move a sad java-specific hack to Orca's java-specific script
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] Move a sad java-specific hack to Orca's java-specific script
- Date: Tue, 10 Sep 2013 21:48:24 +0000 (UTC)
commit fc0e1f6f9081271f92924ca604b346a40ed455ec
Author: Joanmarie Diggs <jdiggs igalia com>
Date: Tue Sep 10 16:05:00 2013 -0400
Move a sad java-specific hack to Orca's java-specific script
src/orca/script_utilities.py | 23 --------------------
.../J2SE-access-bridge/script_utilities.py | 18 +++++++++++++++
2 files changed, 18 insertions(+), 23 deletions(-)
---
diff --git a/src/orca/script_utilities.py b/src/orca/script_utilities.py
index 7559dfb..79123be 100644
--- a/src/orca/script_utilities.py
+++ b/src/orca/script_utilities.py
@@ -893,29 +893,6 @@ class Utilities:
except:
pass
- # [[[TODO - JD: Why is this here? If it is truly limited to the
- # Java toolkit, it should be dealt with in Orca's Java toolkit
- # script. If it applies more broadly we should update the comment
- # to reflect that.]]]
- #
- # In java applications, TRANSIENT state is missing for tree items
- # (fix for bug #352250)
- #
- try:
- parent1 = obj1
- parent2 = obj2
- while parent1 and parent2 and \
- parent1.getRole() == pyatspi.ROLE_LABEL and \
- parent2.getRole() == pyatspi.ROLE_LABEL:
- if parent1.getIndexInParent() != parent2.getIndexInParent():
- return False
- parent1 = parent1.parent
- parent2 = parent2.parent
- if parent1 and parent2 and parent1 == parent2:
- return True
- except:
- pass
-
return False
def isTextArea(self, obj):
diff --git a/src/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.py
b/src/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.py
index 29dba48..9538da0 100644
--- a/src/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.py
+++ b/src/orca/scripts/toolkits/J2SE-access-bridge/script_utilities.py
@@ -82,6 +82,24 @@ class Utilities(script_utilities.Utilities):
and ext1.width == ext2.width and ext1.height == ext2.height:
return True
+ # In java applications, TRANSIENT state is missing for tree items
+ # (fix for bug #352250)
+ #
+ try:
+ parent1 = obj1
+ parent2 = obj2
+ while parent1 and parent2 and \
+ parent1.getRole() == pyatspi.ROLE_LABEL and \
+ parent2.getRole() == pyatspi.ROLE_LABEL:
+ if parent1.getIndexInParent() != parent2.getIndexInParent():
+ return False
+ parent1 = parent1.parent
+ parent2 = parent2.parent
+ if parent1 and parent2 and parent1 == parent2:
+ return True
+ except:
+ pass
+
return script_utilities.Utilities.isSameObject(self, obj1, obj2)
def nodeLevel(self, obj):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]