[jbosstools-commits] JBoss Tools SVN: r22832 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Wed Jun 16 08:23:14 EDT 2010
Author: mareshkau
Date: 2010-06-16 08:23:13 -0400 (Wed, 16 Jun 2010)
New Revision: 22832
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java
Log:
https://jira.jboss.org/browse/JBIDE-6429, OSX not supported has been commented
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java 2010-06-16 11:40:05 UTC (rev 22831)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XPCOM.java 2010-06-16 12:23:13 UTC (rev 22832)
@@ -315,29 +315,29 @@
interfacesList.add(org.mozilla.interfaces.mozITXTToHTMLConv.class);
interfacesList.add(org.mozilla.interfaces.nsIAboutModule.class);
interfacesList.add(org.mozilla.interfaces.nsIAbstractWorker.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessible.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleCaretMoveEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleCoordinateType.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleDocument.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleEditableText.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperLink.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperText.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleImage.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleProvider.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleRelation.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleRetrieval.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleRole.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleScrollType.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleSelectable.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleStateChangeEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleStates.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleTable.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleTableChangeEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleText.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleTextChangeEvent.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessibleValue.class);
- interfacesList.add(org.mozilla.interfaces.nsIAccessNode.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessible.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleCaretMoveEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleCoordinateType.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleDocument.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleEditableText.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperLink.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperText.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleImage.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleProvider.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleRelation.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleRetrieval.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleRole.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleScrollType.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleSelectable.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleStateChangeEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleStates.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleTable.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleTableChangeEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleText.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleTextChangeEvent.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessibleValue.class);
+// interfacesList.add(org.mozilla.interfaces.nsIAccessNode.class);
interfacesList.add(org.mozilla.interfaces.nsIAddonInstallListener.class);
interfacesList.add(org.mozilla.interfaces.nsIAddonRepository.class);
interfacesList.add(org.mozilla.interfaces.nsIAddonSearchResult.class);
@@ -994,7 +994,7 @@
interfacesList.add(org.mozilla.interfaces.nsIFilePicker.class);
interfacesList.add(org.mozilla.interfaces.nsIFileProtocolHandler.class);
interfacesList.add(org.mozilla.interfaces.nsIFileURL.class);
- interfacesList.add(org.mozilla.interfaces.nsIFileView.class);
+// interfacesList.add(org.mozilla.interfaces.nsIFileView.class);
interfacesList.add(org.mozilla.interfaces.nsIFind.class);
interfacesList.add(org.mozilla.interfaces.nsIFindService.class);
interfacesList.add(org.mozilla.interfaces.nsIFlavorDataProvider.class);
@@ -1246,7 +1246,7 @@
interfacesList.add(org.mozilla.interfaces.nsIRecyclingAllocator.class);
interfacesList.add(org.mozilla.interfaces.nsIRefreshURI.class);
interfacesList.add(org.mozilla.interfaces.nsIRelativeFilePref.class);
- interfacesList.add(org.mozilla.interfaces.nsIRemoteService.class);
+// interfacesList.add(org.mozilla.interfaces.nsIRemoteService.class);
interfacesList.add(org.mozilla.interfaces.nsIRequest.class);
interfacesList.add(org.mozilla.interfaces.nsIRequestObserver.class);
interfacesList.add(org.mozilla.interfaces.nsIRequestObserverProxy.class);
@@ -1492,7 +1492,7 @@
interfacesList.add(org.mozilla.interfaces.nsIX509CertDB2.class);
interfacesList.add(org.mozilla.interfaces.nsIX509CertList.class);
interfacesList.add(org.mozilla.interfaces.nsIX509CertValidity.class);
- interfacesList.add(org.mozilla.interfaces.nsIXBLAccessible.class);
+// interfacesList.add(org.mozilla.interfaces.nsIXBLAccessible.class);
interfacesList.add(org.mozilla.interfaces.nsIXMLContentBuilder.class);
interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequest.class);
interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequestEventTarget.class);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java 2010-06-16 11:40:05 UTC (rev 22831)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/util/XulRunnerVpeUtils.java 2010-06-16 12:23:13 UTC (rev 22832)
@@ -15,11 +15,11 @@
import org.eclipse.swt.graphics.Rectangle;
import org.jboss.tools.vpe.xulrunner.BrowserPlugin;
-import org.mozilla.interfaces.nsIAccessNode;
-import org.mozilla.interfaces.nsIAccessible;
-import org.mozilla.interfaces.nsIAccessibleCoordinateType;
-import org.mozilla.interfaces.nsIAccessibleRetrieval;
-import org.mozilla.interfaces.nsIAccessibleText;
+//import org.mozilla.interfaces.nsIAccessNode;
+//import org.mozilla.interfaces.nsIAccessible;
+//import org.mozilla.interfaces.nsIAccessibleCoordinateType;
+//import org.mozilla.interfaces.nsIAccessibleRetrieval;
+//import org.mozilla.interfaces.nsIAccessibleText;
import org.mozilla.interfaces.nsIDOMNSElement;
import org.mozilla.interfaces.nsIDOMNSHTMLElement;
import org.mozilla.interfaces.nsIDOMNode;
@@ -105,71 +105,70 @@
* {@code selectionContainer}.
*/
public static Rectangle getTextSelectionBounds(nsIDOMText selectionContainer) {
- nsIAccessibleText accessibleTextAncestor = getAccessibleTextAncestor(selectionContainer);
- if (accessibleTextAncestor == null) {
- // cannot get selection bounds
- return null;
- }
- if (accessibleTextAncestor.getSelectionCount() == 0) {
- // no text selected
- return null;
- }
-
- int[] startOffset = new int[1];
- int[] endOffset = new int[1];
- accessibleTextAncestor.getSelectionBounds(0, startOffset, endOffset);
-
- int[] x = new int[1];
- int[] y = new int[1];
- int[] width = new int[1];
- int[] height = new int[1];
- accessibleTextAncestor.getRangeExtents(startOffset[0], endOffset[0],
- x, y, width, height, nsIAccessibleCoordinateType.COORDTYPE_PARENT_RELATIVE);
-
- nsIAccessible ancestorAccessibleParent
- = queryInterface(accessibleTextAncestor, nsIAccessible.class).getParent();
- nsIDOMNode ancestorParent
- = queryInterface(ancestorAccessibleParent, nsIAccessNode.class).getDOMNode();
-
- Rectangle ancestorParentBounds;
- if (ancestorParent != null) {
- ancestorParentBounds = getElementBounds(ancestorParent);
- } else {
- ancestorParentBounds = new Rectangle(0, 0, 0, 0);
- }
-
- return new Rectangle(ancestorParentBounds.x + x[0], ancestorParentBounds.y + y[0],
- width[0], height[0]);
+// nsIAccessibleText accessibleTextAncestor = getAccessibleTextAncestor(selectionContainer);
+// if (accessibleTextAncestor == null) {
+// // cannot get selection bounds
+// return null;
+// }
+// if (accessibleTextAncestor.getSelectionCount() == 0) {
+// // no text selected
+// return null;
+// }
+//
+// int[] startOffset = new int[1];
+// int[] endOffset = new int[1];
+// accessibleTextAncestor.getSelectionBounds(0, startOffset, endOffset);
+//
+// int[] x = new int[1];
+// int[] y = new int[1];
+// int[] width = new int[1];
+// int[] height = new int[1];
+// accessibleTextAncestor.getRangeExtents(startOffset[0], endOffset[0],
+// x, y, width, height, nsIAccessibleCoordinateType.COORDTYPE_PARENT_RELATIVE);
+//
+// nsIAccessible ancestorAccessibleParent
+// = queryInterface(accessibleTextAncestor, nsIAccessible.class).getParent();
+// nsIDOMNode ancestorParent
+// = queryInterface(ancestorAccessibleParent, nsIAccessNode.class).getDOMNode();
+//
+// Rectangle ancestorParentBounds;
+// if (ancestorParent != null) {
+// ancestorParentBounds = getElementBounds(ancestorParent);
+// } else {
+// ancestorParentBounds = new Rectangle(0, 0, 0, 0);
+// }
+//
+ return new Rectangle(0,0,0,0);
}
- /**
- * Returns the nearest ancestor of given {@code node} which supports
- * {@link nsIAccessibleText}.
- */
- private static nsIAccessibleText getAccessibleTextAncestor(nsIDOMNode node) {
- nsIAccessibleText accessibleTextAncestor = null;
- nsIDOMNode ancestor = node;
- while (accessibleTextAncestor == null && ancestor != null) {
- ancestor = ancestor.getParentNode();
- try {
- nsIAccessible accessibleAncestor = getAccessible(ancestor);
- accessibleTextAncestor = queryInterface(accessibleAncestor, nsIAccessibleText.class);
- } catch (XPCOMException e) {
- // it's OK, accessibleTextAncestor still = null
- }
- }
-
- return accessibleTextAncestor;
- }
-
- /**
- * Returns {@link nsIAccessible} interface for given {@code node}.
- */
- private static nsIAccessible getAccessible(nsIDOMNode node) {
- return ((nsIAccessibleRetrieval)
- Mozilla.getInstance().getServiceManager().getServiceByContractID(
- XPCOM.NS_ACCESSIBILITYSERVICE_CONTRACTID,
- nsIAccessibleRetrieval.NS_IACCESSIBLERETRIEVAL_IID))
- .getAccessibleFor(node);
- }
+// /**
+// * Returns the nearest ancestor of given {@code node} which supports
+// * {@link nsIAccessibleText}.
+// */
+// private static nsIAccessibleText getAccessibleTextAncestor(nsIDOMNode node) {
+// nsIAccessibleText accessibleTextAncestor = null;
+// nsIDOMNode ancestor = node;
+// while (accessibleTextAncestor == null && ancestor != null) {
+// ancestor = ancestor.getParentNode();
+// try {
+// nsIAccessible accessibleAncestor = getAccessible(ancestor);
+// accessibleTextAncestor = queryInterface(accessibleAncestor, nsIAccessibleText.class);
+// } catch (XPCOMException e) {
+// // it's OK, accessibleTextAncestor still = null
+// }
+// }
+//
+// return accessibleTextAncestor;
+// }
+//
+// /**
+// * Returns {@link nsIAccessible} interface for given {@code node}.
+// */
+// private static nsIAccessible getAccessible(nsIDOMNode node) {
+// return ((nsIAccessibleRetrieval)
+// Mozilla.getInstance().getServiceManager().getServiceByContractID(
+// XPCOM.NS_ACCESSIBILITYSERVICE_CONTRACTID,
+// nsIAccessibleRetrieval.NS_IACCESSIBLERETRIEVAL_IID))
+// .getAccessibleFor(node);
+// }
}
More information about the jbosstools-commits
mailing list