[jbosstools-commits] JBoss Tools SVN: r22449 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor and 4 other directories.

Author: yradtsevich Date: 2010-06-01 00:45:47 -0400 (Tue, 01 Jun 2010) New Revision: 22449 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DraggablePattern.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DropableArea.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeChildrenInfo.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java Log: https://jira.jboss.org/browse/JBIDE-6393 Create generic queryInterface method - All calls of nsISupports.queryInterface have been replaced by XPCOM.queryInterface. - Utility classes of the plug-in org.jboss.tools.vpe.xulrunner have been moved to the package org.jboss.tools.vpe.xulrunner.util part#2 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -12,22 +12,22 @@ package org.jboss.tools.vpe.dnd; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.ArrayList; import java.util.List; import java.util.Stack; -import java.util.Map.Entry; import org.eclipse.swt.events.TypedEvent; import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; import org.jboss.tools.common.model.ui.editors.dnd.context.IDNDTextEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.util.HTML; -import org.jboss.tools.vpe.xulrunner.XPCOM; +import org.jboss.tools.vpe.xulrunner.util.XPCOM; import org.mozilla.interfaces.nsIComponentManager; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNSDocument; -import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDragService; import org.mozilla.interfaces.nsIDragSession; import org.mozilla.interfaces.nsIServiceManager; @@ -237,8 +237,7 @@ public static nsIDOMElement getElementFromPoint(nsIDOMDocument document, int clientX, int clientY) { - nsIDOMNSDocument nsDocument = (nsIDOMNSDocument) document - .queryInterface(nsIDOMNSDocument.NS_IDOMNSDOCUMENT_IID); + nsIDOMNSDocument nsDocument = queryInterface(document, nsIDOMNSDocument.class); nsIDOMElement element = nsDocument.elementFromPoint(clientX, clientY); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DraggablePattern.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DraggablePattern.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DraggablePattern.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.vpe.dnd; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import org.eclipse.swt.graphics.Rectangle; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils; +import org.jboss.tools.vpe.xulrunner.util.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMMouseEvent; @@ -114,8 +116,7 @@ } public boolean isDragIconClicked(nsIDOMMouseEvent mouseEvent) { - nsIDOMElement targetElement = (nsIDOMElement) mouseEvent.getTarget() - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement targetElement = queryInterface(mouseEvent.getTarget(), nsIDOMElement.class); if (targetElement != null) { return DRAG_ICON_ID.equals(targetElement.getAttribute(HTML.ATTR_ID)); } else { @@ -141,11 +142,9 @@ offsetX = nodeBounds.x - mouseStartX; offsetY = nodeBounds.y - mouseStartY; - nodeCopy = (nsIDOMElement) node.cloneNode(true) - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nodeCopy = queryInterface(node.cloneNode(true), nsIDOMElement.class); if (nodeCopy.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - nsIDOMElement elementCopy = (nsIDOMElement) nodeCopy.queryInterface( - nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement elementCopy = queryInterface(nodeCopy, nsIDOMElement.class); DndUtil.setTemporaryDndElement(elementCopy, true); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DropableArea.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DropableArea.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DropableArea.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -16,7 +16,7 @@ import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils; +import org.jboss.tools.vpe.xulrunner.util.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMCSSStyleDeclaration; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/ScrollingSupport.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.dnd; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import org.eclipse.swt.graphics.Rectangle; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIDOMMouseEvent; @@ -91,11 +93,9 @@ * @return bounds of the {@link #xulRunnerEditor} */ private Rectangle getWindowBounds() { - nsIEmbeddingSiteWindow window = (nsIEmbeddingSiteWindow) - xulRunnerEditor - .getWebBrowser() - .getContainerWindow() - .queryInterface(nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID); + nsIEmbeddingSiteWindow window = + queryInterface(xulRunnerEditor.getWebBrowser().getContainerWindow(), + nsIEmbeddingSiteWindow.class); int[] xArray = new int[1]; // Left hand corner of the outer area int[] yArray = new int[1]; // Top corner of the outer area Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -11,6 +11,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.dnd; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.EnumSet; import org.eclipse.core.resources.IFile; @@ -40,8 +42,8 @@ import org.jboss.tools.vpe.editor.mozilla.listener.MozillaDndListener; import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.jboss.tools.vpe.editor.util.VpeDndUtil; -import org.jboss.tools.vpe.xulrunner.XPCOM; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; +import org.jboss.tools.vpe.xulrunner.util.XPCOM; import org.mozilla.interfaces.nsIComponentManager; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -61,7 +63,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - /** * Class responsible for Drag&Drop functionality * @@ -121,8 +122,7 @@ * @param event */ public void dragOver(nsIDOMEvent event) { - final nsIDOMMouseEvent mouseEvent = - (nsIDOMMouseEvent) event.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + final nsIDOMMouseEvent mouseEvent = queryInterface(event, nsIDOMMouseEvent.class); final XulRunnerEditor editor = vpeController.getXulRunnerEditor(); new ScrollingSupport(editor).scroll(mouseEvent); @@ -150,26 +150,25 @@ if(isInnerDragSession()) { // in this case it's is an internal drag draggablePattern.closeSession(); - innerDrop((nsIDOMMouseEvent)domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID)); + innerDrop(queryInterface(domEvent, nsIDOMMouseEvent.class)); } else { //in this case it's is external drag - externalDrop((nsIDOMMouseEvent)domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID), VpeController.MODEL_FLAVOR, ""); //$NON-NLS-1$ + externalDrop(queryInterface(domEvent, nsIDOMMouseEvent.class), VpeController.MODEL_FLAVOR, ""); //$NON-NLS-1$ } disposeDropableArea(); vpeController.onRefresh(); } public void dragExit(nsIDOMEvent domEvent) { - nsIDOMNode eventTargetNode = (nsIDOMNode) domEvent.getTarget() - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + nsIDOMNode eventTargetNode = queryInterface(domEvent.getTarget(), nsIDOMNode.class); if (dropableArea != null) { nsIDOMNode dropTargetNode = dropableArea.getNode(); boolean targetNodeIsTemporary = false; if (eventTargetNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - nsIDOMElement eventTargetElement = (nsIDOMElement) - eventTargetNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement eventTargetElement + = queryInterface(eventTargetNode, nsIDOMElement.class); targetNodeIsTemporary = DndUtil.isTemporaryDndElement(eventTargetElement); } boolean eventTargetIsAscedantOfDropTarget = VisualDomUtil.isAscendant(eventTargetNode, dropTargetNode); @@ -325,7 +324,7 @@ private Point getClientCoords(nsIDOMEvent event) { final nsIDOMMouseEvent mouseEvent = - (nsIDOMMouseEvent) event.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + queryInterface(event, nsIDOMMouseEvent.class); return new Point(mouseEvent.getClientX(), mouseEvent.getClientY()); } @@ -381,7 +380,7 @@ private void refreshCanDrop(nsIDOMEvent event) { - nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) event.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + nsIDOMMouseEvent mouseEvent = queryInterface(event, nsIDOMMouseEvent.class); getDragService().getCurrentSession().setCanDrop(dropableArea != null && dropableArea.getHighlightedDropTarget() != null); mouseEvent.preventDefault(); @@ -426,8 +425,7 @@ } switch (dragNode.getNodeType()) { case nsIDOMNode.ELEMENT_NODE: { - canDrag = vpeController.getVisualBuilder().canInnerDrag((nsIDOMElement) dragNode - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + canDrag = vpeController.getVisualBuilder().canInnerDrag(queryInterface(dragNode, nsIDOMElement.class)); break; } case nsIDOMNode.TEXT_NODE: { @@ -523,8 +521,7 @@ String aFlavor = ""; //$NON-NLS-1$ if (VpeDndUtil.isNsIFileInstance(aValue)) { - nsIFile aFile = (nsIFile) aValue - .queryInterface(nsIFile.NS_IFILE_IID); + nsIFile aFile = queryInterface(aValue, nsIFile.class); // because it is external, convert the path to URL final String path = aFile.getPath(); @@ -532,13 +529,12 @@ aFlavor = DndUtil.kFileMime; } else if (VpeDndUtil.isNsICStringInstance(aValue)) { - nsISupportsCString aString = (nsISupportsCString) aValue - .queryInterface(nsISupportsCString.NS_ISUPPORTSCSTRING_IID); + nsISupportsCString aString = + queryInterface(aValue, nsISupportsCString.class); data = aString.getData(); aFlavor = DndUtil.kHTMLMime; } else if (VpeDndUtil.isNsIStringInstance(aValue)) { - nsISupportsString aString = (nsISupportsString) aValue - .queryInterface(nsISupportsString.NS_ISUPPORTSSTRING_IID); + nsISupportsString aString = queryInterface(aValue, nsISupportsString.class); data = aString.getData(); if (VpeController.MODEL_FLAVOR.equals(dragTransferData.getFlavor())) { aFlavor = dragTransferData.getFlavor(); @@ -601,8 +597,7 @@ } private Point getPageCoords(nsIDOMEvent domEvent) { - nsIDOMNSUIEvent nsuiEvent = (nsIDOMNSUIEvent) - domEvent.queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_IID); + nsIDOMNSUIEvent nsuiEvent = queryInterface(domEvent, nsIDOMNSUIEvent.class); return new Point(nsuiEvent.getPageX(), nsuiEvent.getPageY()); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpePreviewDomBuilder.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,9 +10,12 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.HashSet; import java.util.List; import java.util.Set; + import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -97,10 +100,9 @@ nsIDOMNode visualNewNode; visualNewNode = creationData.getNode(); - if(sourceNode instanceof Element && visualNewNode != null) { - - setTooltip((Element)sourceNode, (nsIDOMElement)visualNewNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); - correctVisualAttribute((nsIDOMElement)visualNewNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + if(sourceNode instanceof Element && visualNewNode != null) { + setTooltip((Element)sourceNode, queryInterface(visualNewNode, nsIDOMElement.class)); + correctVisualAttribute(queryInterface(visualNewNode, nsIDOMElement.class)); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,11 +10,12 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import org.eclipse.jface.text.BadLocationException; import org.eclipse.swt.graphics.Point; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.xml.core.internal.document.CommentImpl; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -28,9 +29,7 @@ import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMEvent; -import org.mozilla.interfaces.nsIDOMEventTarget; import org.mozilla.interfaces.nsIDOMMouseEvent; -import org.mozilla.interfaces.nsIDOMNSEvent; import org.mozilla.interfaces.nsIDOMNSUIEvent; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; @@ -41,7 +40,6 @@ import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * @@ -104,7 +102,7 @@ if (sourceNode != null) { switch (visualSelectedNode.getNodeType()) { case nsIDOMNode.TEXT_NODE: - nsIDOMElement visualParentElement = (nsIDOMElement)visualSelectedNode.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement visualParentElement = queryInterface(visualSelectedNode.getParentNode(), nsIDOMElement.class); visualBuilder.setSelectionRectangle(visualParentElement, false); // int pos = DataHelper.textPos(visualSelectedNode.getNodeValue(), selection.getFocusOffset()); int pos = selection.getFocusOffset(); @@ -119,12 +117,12 @@ sourceBuilder.setSelection(sourceNode, pos, 0); break; case nsIDOMNode.ELEMENT_NODE: - if (VpeVisualDomBuilder.isIncludeElement((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID))) { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + if (VpeVisualDomBuilder.isIncludeElement(queryInterface(visualSelectedNode, nsIDOMElement.class))) { + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedNode, nsIDOMElement.class), false); visualSelectionController.setCaretEnabled(false); sourceBuilder.setSelection(sourceNode, 0, 0); } else if (sourceNode.getNodeType() == Node.COMMENT_NODE) { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedNode, nsIDOMElement.class), false); // pos = DataHelper.textPos(visualNode.getNodeValue(), selection.getFocusOffset()); pos = selection.getFocusOffset(); try{ @@ -136,13 +134,13 @@ } sourceBuilder.setSelection(sourceNode, pos, 0); } else if (visualBuilder.isContentArea(visualSelectedNode) && visualBuilder.isEmptyDocument()) { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedNode, nsIDOMElement.class), false); sourceBuilder.setSelectionAtDocumentEnd(); } else { nsIDOMNode containerForPseudoContent = VpePseudoContentCreator.getContainerForPseudoContent(visualNode); if (containerForPseudoContent != null) { sourceNode = domMapping.getNearSourceNode(containerForPseudoContent); - visualBuilder.setSelectionRectangle((nsIDOMElement)containerForPseudoContent.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(containerForPseudoContent, nsIDOMElement.class), false); sourceBuilder.setSelection(sourceNode, 0, 0, true); visualSelectionController.setCaretEnabled(false); } else { @@ -156,16 +154,16 @@ } if (!border && visualNode.getNodeType() == Node.TEXT_NODE && node == null) { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedNode, nsIDOMElement.class), false); sourceBuilder.setAttributeSelection(visualNode, selection.getFocusOffset(), 0); if (!visualBuilder.isTextEditable(visualNode)) { visualSelectionController.setCaretEnabled(false); } } else { if (info.startFlag) { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedNode, nsIDOMElement.class), false); } else { - visualParentElement = (nsIDOMElement)visualSelectedNode.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + visualParentElement = queryInterface(visualSelectedNode.getParentNode(), nsIDOMElement.class); visualBuilder.setSelectionRectangle(visualParentElement, false); } int offset = info.startFlag ? 0 : ((IndexedRegion)sourceNode).getEndOffset() - @@ -206,7 +204,7 @@ if (sourceAncestor != null) { switch (visualSelectedAncestor.getNodeType()) { case Node.TEXT_NODE: - nsIDOMElement visualParentElement = (nsIDOMElement)visualSelectedAncestor.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement visualParentElement = queryInterface(visualSelectedAncestor.getParentNode(), nsIDOMElement.class); visualBuilder.setSelectionRectangle(visualParentElement, false); // int start = DataHelper.textPos(visualSelectedAncestor.getNodeValue(), selection.getAnchorOffset()); @@ -226,7 +224,7 @@ break; case Node.ELEMENT_NODE: if (sourceAncestor.getNodeType() == Node.COMMENT_NODE) { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedAncestor.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedAncestor, nsIDOMElement.class), false); // start = DataHelper.textPos(sourceAncestor.getNodeValue(), selection.getAnchorOffset()); // end = DataHelper.textPos(sourceAncestor.getNodeValue(), selection.getFocusOffset()); start = selection.getAnchorOffset(); @@ -250,14 +248,14 @@ VisualSelectionInfo info = getVisualSelectedInfo(visualAnchorNode, visualAnchorOffset); if (info != null) { nsIDOMNode visualNode = info.node; - visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualNode, nsIDOMElement.class), false); Node sourceNode = domMapping.getNearSourceNode(visualNode); int sourceStartOffset = ((IndexedRegion)sourceNode).getStartOffset(); int sourceEndOffset = ((IndexedRegion)sourceNode).getEndOffset(); sourceBuilder.setSelection(sourceNode, 0, sourceEndOffset - sourceStartOffset); } } else { - visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedAncestor.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), false); + visualBuilder.setSelectionRectangle(queryInterface(visualSelectedAncestor, nsIDOMElement.class), false); if (!border && visualAncestor.getNodeType() == Node.TEXT_NODE) { sourceBuilder.setAttributeSelection(visualAncestor, visualAnchorOffset, visualFocusOffset - visualAnchorOffset); @@ -401,7 +399,7 @@ offset = visualNode.getNodeValue().length(); } selection.collapse(visualNode, offset); - nsIDOMElement visualParentElement = (nsIDOMElement) visualNode.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement visualParentElement = queryInterface(visualNode.getParentNode(), nsIDOMElement.class); visualBuilder.setSelectionRectangle(visualParentElement); break; case nsIDOMNode.ELEMENT_NODE: @@ -416,7 +414,7 @@ offset = text.length(); } selection.collapse(visualText, offset); - visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + visualBuilder.setSelectionRectangle(queryInterface(visualNode, nsIDOMElement.class)); } } else { if (offset == 0) { @@ -424,7 +422,7 @@ nsIDOMNode visualParentNode = visualNode.getParentNode(); if (visualParentNode != null && visualParentNode.getNodeType() == Node.ELEMENT_NODE) { selection.collapse(visualParentNode, offset); - visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + visualBuilder.setSelectionRectangle(queryInterface(visualNode, nsIDOMElement.class)); } else { selection.removeAllRanges(); visualBuilder.setSelectionRectangle(null); @@ -435,23 +433,23 @@ if (appreciableVisualChild.getNodeType() == nsIDOMNode.TEXT_NODE) { offset = appreciableVisualChild.getNodeValue().length(); selection.collapse(appreciableVisualChild, offset); - visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + visualBuilder.setSelectionRectangle(queryInterface(visualNode, nsIDOMElement.class)); } else { offset = (int)VisualDomUtil.getOffset(appreciableVisualChild) + 1; selection.collapse((nsIDOMNode)visualNode, offset); - visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + visualBuilder.setSelectionRectangle(queryInterface(visualNode, nsIDOMElement.class)); } } else { offset = 0; selection.collapse(visualNode, offset); - visualBuilder.setSelectionRectangle((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + visualBuilder.setSelectionRectangle(queryInterface(visualNode, nsIDOMElement.class)); } } else { offset = (int)VisualDomUtil.getOffset(visualNode); nsIDOMNode visualParentNode = visualNode.getParentNode(); if (visualParentNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) { selection.collapse(visualParentNode, offset); - visualBuilder.setSelectionRectangle((nsIDOMElement)visualParentNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + visualBuilder.setSelectionRectangle(queryInterface(visualParentNode, nsIDOMElement.class)); } else { selection.removeAllRanges(); visualBuilder.setSelectionRectangle(null); @@ -797,7 +795,7 @@ nsIDOMNode parent = commonNode.getParentNode(); commonNode = parent; } - return (nsIDOMElement)commonNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + return queryInterface(commonNode, nsIDOMElement.class); } else { return null; } @@ -845,7 +843,7 @@ } public VpeVisualCaretInfo getVisualCaretInfo(nsIDOMEvent event) { - nsIDOMNSUIEvent nsuiEvent = (nsIDOMNSUIEvent) event.queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_IID); + nsIDOMNSUIEvent nsuiEvent = queryInterface(event, nsIDOMNSUIEvent.class); return new VpeVisualCaretInfo(this, nsuiEvent.getRangeParent(), nsuiEvent.getRangeOffset()); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.io.BufferedReader; import java.io.FileNotFoundException; import java.io.FileReader; @@ -35,7 +37,6 @@ import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; -import org.eclipse.wst.xml.core.internal.document.NodeImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.common.resref.core.ResourceReference; import org.jboss.tools.jst.jsp.JspEditorPlugin; @@ -44,7 +45,6 @@ import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.dnd.VpeDnDHelper; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeElementData; @@ -71,7 +71,6 @@ import org.jboss.tools.vpe.editor.util.XmlUtil; import org.jboss.tools.vpe.resref.core.CSSReferenceList; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -315,7 +314,7 @@ */ nsIDOMElement element = null; try { - element = (nsIDOMElement) visualNewNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + element = queryInterface(visualNewNode, nsIDOMElement.class); } catch (org.mozilla.xpcom.XPCOMException e) { /* * Cannot parse node to element, @@ -549,7 +548,7 @@ if (visualNewNode != null && visualNewNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - nsIDOMElement visualNewElement = (nsIDOMElement) visualNewNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement visualNewElement = queryInterface(visualNewNode, nsIDOMElement.class); if ((visualNewElement != null) && template.hasImaginaryBorder()) { @@ -584,8 +583,7 @@ if (sourceNode instanceof Element && visualNewNode != null && visualNewNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - setTooltip((Element) sourceNode, (nsIDOMElement) visualNewNode - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); + setTooltip((Element) sourceNode, queryInterface(visualNewNode, nsIDOMElement.class)); } if (registerFlag) { @@ -839,8 +837,7 @@ .equalsIgnoreCase(node.getNodeName())) || (isStyle = HTML.TAG_STYLE.equalsIgnoreCase(node .getNodeName()))) { - nsIDOMElement element = (nsIDOMElement) node - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement element = queryInterface(node, nsIDOMElement.class); if ((isLink || (isStyle && ATTR_VPE_INLINE_LINK_VALUE .equalsIgnoreCase(element.getAttribute(ATTR_VPE)))) && YES_STRING @@ -924,8 +921,7 @@ return false; } - if (YES_STRING.equalsIgnoreCase(((nsIDOMElement) visualNode - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)) + if (YES_STRING.equalsIgnoreCase((queryInterface(visualNode, nsIDOMElement.class)) .getAttribute(PSEUDO_ELEMENT_ATTR))) { return true; } @@ -1203,11 +1199,9 @@ } nsIDOMElement visualElement = null; try { - visualElement = (nsIDOMElement) visualNode - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + visualElement = queryInterface(visualNode, nsIDOMElement.class); } catch (XPCOMException exception) { - visualElement = (nsIDOMElement) visualNode.getParentNode() - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + visualElement = queryInterface(visualNode.getParentNode(), nsIDOMElement.class); } if (visualElement == null) { return false; @@ -1245,8 +1239,7 @@ if (elementMapping == null) { // may be toggle with facet while (!selectedElem.getNodeName().equals(HTML.TAG_TABLE)) { - selectedElem = (nsIDOMElement) selectedElem.getParentNode() - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + selectedElem = queryInterface(selectedElem.getParentNode(), nsIDOMElement.class); } // Fixes JBIDE-1823 author dmaliarevich nodeMapping = domMapping.getNodeMapping(selectedElem); @@ -1456,8 +1449,7 @@ private boolean isLinkReplacer(nsIDOMNode node) { return HTML.TAG_STYLE.equalsIgnoreCase(node.getNodeName()) && ATTR_VPE_INLINE_LINK_VALUE - .equalsIgnoreCase(((nsIDOMElement) node - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)) + .equalsIgnoreCase((queryInterface(node, nsIDOMElement.class)) .getAttribute(ATTR_VPE)); } @@ -1469,8 +1461,7 @@ if (node.getNodeType() == Node.ELEMENT_NODE) { if (HTML.TAG_LINK.equalsIgnoreCase(node.getNodeName()) || isLinkReplacer(node)) { - nsIDOMElement element = (nsIDOMElement) node - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement element = queryInterface(node, nsIDOMElement.class); if (ext_val.equalsIgnoreCase(element .getAttribute(VpeTemplateManager.ATTR_LINK_EXT)) && href_val @@ -1500,8 +1491,7 @@ * used for adding external styles to editor. If was added * external attribute, this property is true. */ - if (!YES_STRING.equalsIgnoreCase(((nsIDOMElement) node - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)) + if (!YES_STRING.equalsIgnoreCase((queryInterface(node, nsIDOMElement.class)) .getAttribute(VpeTemplateManager.ATTR_LINK_EXT))) { // int linkAddress = // MozillaSupports.queryInterface(node, @@ -1514,8 +1504,7 @@ } } else if (HTML.TAG_STYLE.equalsIgnoreCase(node.getNodeName()) && (!YES_STRING - .equalsIgnoreCase(((nsIDOMElement) node - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)) + .equalsIgnoreCase((queryInterface(node, nsIDOMElement.class)) .getAttribute(ATTR_VPE)))) { node = getHeadNode().removeChild(node); } @@ -1558,9 +1547,7 @@ pageContext, (Element) nodeMapping.getSourceNode(), getVisualDocument(), - (nsIDOMElement) nodeMapping.getVisualNode() - .queryInterface( - nsIDOMElement.NS_IDOMELEMENT_IID), + queryInterface(nodeMapping.getVisualNode(), nsIDOMElement.class), ((VpeElementMapping) nodeMapping).getData()) .getResizeConstrains(); } @@ -1582,8 +1569,7 @@ public static boolean isAnonElement(nsIDOMNode visualNode) { if (visualNode != null && visualNode.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - String attrValue = ((nsIDOMElement) visualNode - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)) + String attrValue = (queryInterface(visualNode, nsIDOMElement.class)) .getAttribute(MOZ_ANONCLASS_ATTR); return attrValue != null && attrValue.length() > 0; @@ -1673,8 +1659,7 @@ nsIDOMNode parent = visualNode.getParentNode(); if (parent != null && parent.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - nsIDOMElement element = (nsIDOMElement) parent - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + nsIDOMElement element = queryInterface(parent, nsIDOMElement.class); nsIDOMAttr style = element.getAttributeNode("style"); //$NON-NLS-1$ if (style != null) { String styleValue = style.getNodeValue(); @@ -1726,8 +1711,7 @@ for (long i = 0; i < len; i++) { nsIDOMNode child = children.item(i); if (child.getNodeType() == nsIDOMNode.ELEMENT_NODE) { - setTooltip(((nsIDOMElement) child - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)), + setTooltip((queryInterface(child, nsIDOMElement.class)), titleValue); } } @@ -1741,8 +1725,7 @@ nsIDOMNode child = children.item(i); if (child.getNodeType() == nsIDOMNode.ELEMENT_NODE) { if (domMapping.getNodeMapping(child) == null) { - resetTooltip((nsIDOMElement) child - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID), + resetTooltip(queryInterface(child, nsIDOMElement.class), titleValue); } } @@ -1819,9 +1802,8 @@ * Changes the mouse cursor icon in VPE to 'move'. */ private void showMoveCursor(boolean show) { - nsIDOMHTMLDocument document = (nsIDOMHTMLDocument) xulRunnerEditor - .getDOMDocument() - .queryInterface(nsIDOMHTMLDocument.NS_IDOMHTMLDOCUMENT_IID); + nsIDOMHTMLDocument document = queryInterface(xulRunnerEditor.getDOMDocument(), + nsIDOMHTMLDocument.class); nsIDOMElement moveStyle = document.getElementById(CURSOR_MOVE_STYLE_ID); // If moveStyle == null then the move cursor icon is shown @@ -1851,11 +1833,11 @@ if (HTML.TAG_INPUT.equalsIgnoreCase(targetNode.getNodeName())) { return targetNode; } - nsIDOMNSEvent nsEvent = (nsIDOMNSEvent) event.queryInterface(nsIDOMNSEvent.NS_IDOMNSEVENT_IID); + nsIDOMNSEvent nsEvent = queryInterface(event, nsIDOMNSEvent.class); // TODO Sergey Vasilyev figure out with TmpRealOriginalTarget // nsIDOMEventTarget target = nsEvent.getTmpRealOriginalTarget(); nsIDOMEventTarget target = nsEvent.getOriginalTarget(); - nsIDOMNode originalNode = (nsIDOMNode) target.queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + nsIDOMNode originalNode = queryInterface(target, nsIDOMNode.class); if (VpeVisualDomBuilder.isAnonElement(originalNode)) { originalNode = getLastSelectedElement(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.Collection; import java.util.List; @@ -33,7 +35,6 @@ import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException; import org.eclipse.wst.xml.core.internal.document.TextImpl; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; @@ -49,7 +50,7 @@ import org.jboss.tools.vpe.editor.util.FlatIterator; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.TextUtil; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils; +import org.jboss.tools.vpe.xulrunner.util.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMKeyEvent; import org.mozilla.interfaces.nsIDOMNode; @@ -1591,7 +1592,7 @@ currentLenght=Integer.MAX_VALUE; try{ - domElement = (nsIDOMElement) nsDOMNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + domElement = queryInterface(nsDOMNode, nsIDOMElement.class); if(nearestElement==null) { nearestElement=domElement; @@ -1636,7 +1637,7 @@ for(nsIDOMNode nsDOMNode : elements) { currentLenght=Integer.MAX_VALUE; try{ - domElement = (nsIDOMElement) nsDOMNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + domElement = queryInterface(nsDOMNode, nsIDOMElement.class); if(nearestElement==null) { @@ -1683,7 +1684,7 @@ for(nsIDOMNode nsDOMNode : elements) { currentLenght=Integer.MAX_VALUE; try{ - domElement = (nsIDOMElement) nsDOMNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + domElement = queryInterface(nsDOMNode, nsIDOMElement.class); if(nearestElement==null) { nearestElement=domElement; @@ -1728,7 +1729,7 @@ for(nsIDOMNode nsDOMNode : elements) { currentLenght=Integer.MAX_VALUE; try{ - domElement = (nsIDOMElement) nsDOMNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + domElement = queryInterface(nsDOMNode, nsIDOMElement.class); if(nearestElement==null) { nearestElement=domElement; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -57,7 +57,7 @@ import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; -import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; +import org.jboss.tools.vpe.xulrunner.util.DOMTreeDumper; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/VpeMenuCreator.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -34,7 +34,7 @@ import org.jboss.tools.vpe.editor.template.IZoomEventManager; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.messages.VpeUIMessages; -import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; +import org.jboss.tools.vpe.xulrunner.util.DOMTreeDumper; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.mozilla; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.io.File; import java.io.FileWriter; import java.io.IOException; @@ -81,8 +83,8 @@ import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.resref.core.VpeResourcesDialog; -import org.jboss.tools.vpe.xulrunner.XPCOM; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; +import org.jboss.tools.vpe.xulrunner.util.XPCOM; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMEventTarget; @@ -96,8 +98,6 @@ import org.mozilla.interfaces.nsIHTMLInlineTableEditor; import org.mozilla.interfaces.nsIHTMLObjectResizer; import org.mozilla.interfaces.nsIPlaintextEditor; -import org.w3c.dom.Attr; -import org.w3c.dom.Node; public class MozillaEditor extends EditorPart implements IReusableEditor { protected static final File INIT_FILE = new File(VpePlugin.getDefault().getResourcePath("ve"), "init.html"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -854,7 +854,7 @@ throw new RuntimeException("The content area node should by element node."); //$NON-NLS-1$ } - area = (nsIDOMElement) node.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + area = queryInterface(node, nsIDOMElement.class); break; } } @@ -924,7 +924,7 @@ if (contentArea != null) { // getContentAreaEventListener().setVisualEditor(xulRunnerEditor); nsIDOMWindow window = xulRunnerEditor.getWebBrowser().getContentDOMWindow(); - mozillaEventAdapter.attach(window, (nsIDOMEventTarget) contentArea.queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID)); + mozillaEventAdapter.attach(window, queryInterface(contentArea, nsIDOMEventTarget.class)); } } @@ -1055,15 +1055,15 @@ editor = iEditingSession.getEditorForWindow(getXulRunnerEditor().getWebBrowser().getContentDOMWindow()); editor.setFlags(nsIPlaintextEditor.eEditorReadonlyMask); //here we hide nsIHTMLObjectResizers - nsIHTMLObjectResizer htmlObjectResizer = (nsIHTMLObjectResizer) editor.queryInterface(nsIHTMLObjectResizer.NS_IHTMLOBJECTRESIZER_IID); + nsIHTMLObjectResizer htmlObjectResizer = queryInterface(editor, nsIHTMLObjectResizer.class); //we disable abject resizers htmlObjectResizer.hideResizers(); htmlObjectResizer.setObjectResizingEnabled(false); //here we getting position editor and disable it's too - nsIHTMLAbsPosEditor htmlAbsPosEditor = (nsIHTMLAbsPosEditor) editor.queryInterface(nsIHTMLAbsPosEditor.NS_IHTMLABSPOSEDITOR_IID); + nsIHTMLAbsPosEditor htmlAbsPosEditor = queryInterface(editor, nsIHTMLAbsPosEditor.class); htmlAbsPosEditor.setAbsolutePositioningEnabled(false); //here we getting inline table editor and disable it's too - nsIHTMLInlineTableEditor inlineTableEditor = (nsIHTMLInlineTableEditor) editor.queryInterface(nsIHTMLInlineTableEditor.NS_IHTMLINLINETABLEEDITOR_IID); + nsIHTMLInlineTableEditor inlineTableEditor = queryInterface(editor, nsIHTMLInlineTableEditor.class); inlineTableEditor.setInlineTableEditingEnabled(false); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEventAdapter.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -20,6 +20,7 @@ import org.jboss.tools.vpe.editor.mozilla.listener.MozillaScrollListener; import org.jboss.tools.vpe.editor.mozilla.listener.MozillaSelectionListener; import org.jboss.tools.vpe.xulrunner.browser.XulRunnerBrowser; +import org.jboss.tools.vpe.xulrunner.util.XPCOM; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMEvent; import org.mozilla.interfaces.nsIDOMEventListener; @@ -84,10 +85,8 @@ } attached = true; - this.window = (nsIDOMEventTarget) domWindow - .queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID); - this.document = (nsIDOMEventTarget) domWindow.getDocument() - .queryInterface(nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID); + this.window = XPCOM.queryInterface(domWindow, nsIDOMEventTarget.class); + this.document = XPCOM.queryInterface(domWindow.getDocument(), nsIDOMEventTarget.class); this.contentArea = contentArea; if (contentArea != null) { @@ -102,8 +101,7 @@ window.addEventListener(MozillaEventAdapter.MOZAFTERPAINT, this, false); nsISelection selection = domWindow.getSelection(); - selectionPrivate = (nsISelectionPrivate) selection - .queryInterface(nsISelectionPrivate.NS_ISELECTIONPRIVATE_IID); + selectionPrivate = XPCOM.queryInterface(selection, nsISelectionPrivate.class); selectionPrivate.addSelectionListener(this); } if (document != null) { @@ -241,51 +239,44 @@ public void handleEvent(nsIDOMEvent domEvent) { final String eventType = domEvent.getType(); if(MOUSEMOVEEVENTTYPE.equals(eventType)) { - nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) domEvent - .queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(domEvent, nsIDOMMouseEvent.class); for (MozillaMouseListener listener : listeners.getListeners( MozillaMouseListener.class)) { listener.mouseMove(mouseEvent); } } else if(MOUSEDOWNEVENTTYPE.equals(eventType)) { - nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) domEvent - .queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(domEvent, nsIDOMMouseEvent.class); for (MozillaMouseListener listener : listeners.getListeners( MozillaMouseListener.class)) { listener.mouseDown(mouseEvent); } } else if(MOUSEUPEVENTTYPE.equals(eventType)) { - nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) domEvent - .queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(domEvent, nsIDOMMouseEvent.class); for (MozillaMouseListener listener : listeners.getListeners( MozillaMouseListener.class)) { listener.mouseUp(mouseEvent); } } else if(CLICKEVENTTYPE.equals(eventType)) { - nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) domEvent - .queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(domEvent, nsIDOMMouseEvent.class); for (MozillaMouseListener listener : listeners.getListeners( MozillaMouseListener.class)) { listener.mouseClick(mouseEvent); } } else if(DBLCLICK.equals(eventType)) { - nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent) domEvent - .queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + nsIDOMMouseEvent mouseEvent = XPCOM.queryInterface(domEvent, nsIDOMMouseEvent.class); for (MozillaMouseListener listener : listeners.getListeners( MozillaMouseListener.class)) { listener.mouseDblClick(mouseEvent); } } else if(KEYPRESS.equals(eventType)) { - nsIDOMKeyEvent keyEvent = (nsIDOMKeyEvent) domEvent - .queryInterface(nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID); + nsIDOMKeyEvent keyEvent = XPCOM.queryInterface(domEvent, nsIDOMKeyEvent.class); for (MozillaKeyListener listener : listeners.getListeners( MozillaKeyListener.class)) { listener.keyPress(keyEvent); } } else if(CONTEXTMENUEVENTTYPE.equals(eventType)) { //first param are null 0, because this not used in event handler - nsIDOMNode node = (nsIDOMNode) domEvent.getTarget() - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + nsIDOMNode node = XPCOM.queryInterface(domEvent.getTarget(), nsIDOMNode.class); for (MozillaContextMenuListener listener : listeners.getListeners( MozillaContextMenuListener.class)) { listener.onShowContextMenu(0, domEvent, node); @@ -344,7 +335,7 @@ // this method is never used // boolean isXulElement(nsIDOMMouseEvent mouseEvent) { // // TODO Sergey Vasilyev figure out with getTmpRealOriginalTarget -//// nsIDOMNSEvent nsEvent = (nsIDOMNSEvent)mouseEvent.queryInterface(nsIDOMNSEvent.NS_IDOMNSEVENT_IID); +//// nsIDOMNSEvent nsEvent = queryInterface(mouseEvent, nsIDOMNSEvent.class); //// nsIDOMEventTarget target = nsEvent.getTmpRealOriginalTarget(); //// int aDragNode = target.queryInterface(nsIDOMNode.NS_IDOMNODE_IID); //// nsIDOMNode originalNode = nsIDOMNode.getNodeAtAddress(aDragNode); @@ -367,7 +358,7 @@ // * @see org.mozilla.interfaces.nsIClipboardDragDropHooks#onPasteOrDrop(org.mozilla.interfaces.nsIDOMEvent, org.mozilla.interfaces.nsITransferable) // */ // public boolean onPasteOrDrop(nsIDOMEvent event, nsITransferable transferable) { -// nsIDOMMouseEvent mouseEvent = (nsIDOMMouseEvent)event.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); +// nsIDOMMouseEvent mouseEvent = queryInterface(event, nsIDOMMouseEvent.class); // // if (editorDomEventListener != null && !isXulElement(mouseEvent)) { // nsIDragSession dragSession = visualEditor.getCurrentDragSession(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -11,6 +11,8 @@ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import org.eclipse.swt.graphics.Point; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.eclipse.wst.xml.core.internal.document.NodeImpl; @@ -218,8 +220,7 @@ } // get nsIDOMNSUIEvent event - nsIDOMNSUIEvent nsuiEvent = (nsIDOMNSUIEvent) mouseEvent - .queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_IID); + nsIDOMNSUIEvent nsuiEvent = queryInterface(mouseEvent, nsIDOMNSUIEvent.class); int selectionOffset; int selectionLength; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractBodyTemplate.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.VpeStyleUtil; @@ -114,8 +116,7 @@ final nsIDOMNode nodeChild = nodeChildren.item(i); if (HTML.TAG_BODY.equalsIgnoreCase(nodeChild .getNodeName())) { - return (nsIDOMElement) nodeChild - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + return queryInterface(nodeChild, nsIDOMElement.class); } else { nsIDOMElement body = getBody(nodeChild); if (body != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeChildrenInfo.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeChildrenInfo.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeChildrenInfo.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.ArrayList; import java.util.List; @@ -67,8 +69,9 @@ */ public VpeChildrenInfo createCashCopy(){ - VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualParent!=null?(nsIDOMElement)(XmlUtil.createClone(this.visualParent)). - queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID):null); + VpeChildrenInfo childrenInfo = new VpeChildrenInfo(visualParent != null + ? queryInterface(XmlUtil.createClone(visualParent), nsIDOMElement.class) + : null); childrenInfo.sourceChildren=this.sourceChildren; return childrenInfo; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableCreator.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,9 +10,9 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -21,7 +21,6 @@ import org.jboss.tools.vpe.editor.template.VpeDataTableElements.SourceColumnElements; import org.jboss.tools.vpe.editor.template.VpeDataTableElements.SourceDataTableElements; import org.jboss.tools.vpe.editor.template.VpeDataTableElements.VisualDataTableElements; -import org.jboss.tools.vpe.editor.template.expression.VpeExpression; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilder; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; @@ -559,8 +558,7 @@ if (child != null && child.getNodeType() == nsIDOMNode.ELEMENT_NODE) { try { - nsIDOMHTMLTableCellElement cell = (nsIDOMHTMLTableCellElement) child - .queryInterface(nsIDOMHTMLTableCellElement.NS_IDOMHTMLTABLECELLELEMENT_IID); + nsIDOMHTMLTableCellElement cell = queryInterface(child, nsIDOMHTMLTableCellElement.class); cell.setAttribute(HTML.ATTR_CLASS, classes[ind]); ind = ind < (classes.length - 1) ? ind + 1 : 0; } catch (XPCOMException ex) { @@ -580,8 +578,7 @@ if (child != null && child.getNodeType() == nsIDOMNode.ELEMENT_NODE) { try { - nsIDOMHTMLTableCellElement cell = (nsIDOMHTMLTableCellElement) child - .queryInterface(nsIDOMHTMLTableCellElement.NS_IDOMHTMLTABLECELLELEMENT_IID); + nsIDOMHTMLTableCellElement cell = queryInterface(child, nsIDOMHTMLTableCellElement.class); cell.removeAttribute(HTML.ATTR_CLASS); } catch (XPCOMException ex) { // just ignore this exception Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.ArrayList; import java.util.List; @@ -441,7 +443,7 @@ nsIDOMNode child = children.item(i); if (tagName.equalsIgnoreCase(child.getNodeName())) { if (ind == index) { - return (nsIDOMElement)child.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + return queryInterface(child, nsIDOMElement.class); } else { ind++; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,13 +10,14 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.HashMap; import java.util.List; import java.util.Map; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.jst.web.tld.TaglibData; @@ -176,7 +177,7 @@ public void validate(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, VpeCreationData creationdata) { if (sourceNode instanceof Element) validateVisualElement(pageContext, (Element)sourceNode, visualDocument, null, creationdata.getNode()==null?null: - (nsIDOMElement)(creationdata.getNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)), (Map<VpeTemplate,ModifyInfo>)creationdata.getData()); + queryInterface(creationdata.getNode(), nsIDOMElement.class), (Map<VpeTemplate,ModifyInfo>)creationdata.getData()); } @Override public void setAttribute(VpePageContext pageContext, Element sourceElement, nsIDOMDocument visualDocument, nsIDOMNode visualNode, Object data, String name, String value) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.expression.VpeExpressionException; import org.mozilla.interfaces.nsIDOMDocument; @@ -29,7 +31,7 @@ } public static boolean isPseudoElement(nsIDOMNode visualNode) { - return visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE && "yes".equalsIgnoreCase(((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).getAttribute(PSEUDO_CONTENT_ATTR)); //$NON-NLS-1$ + return visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE && "yes".equalsIgnoreCase((queryInterface(visualNode, nsIDOMElement.class)).getAttribute(PSEUDO_CONTENT_ATTR)); //$NON-NLS-1$ } public static nsIDOMNode getContainerForPseudoContent(nsIDOMNode visualNode) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ZoomEventManager.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -13,6 +13,7 @@ /** * @author yzhishko */ +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; import org.mozilla.interfaces.nsIContentViewer; @@ -133,18 +134,14 @@ private nsIMarkupDocumentViewer initMarkupViewer(XulRunnerEditor editor) { try { nsIDOMDocument document = editor.getDOMDocument(); - nsIDOMDocumentView documentView = (nsIDOMDocumentView) document - .queryInterface(nsIDOMDocumentView.NS_IDOMDOCUMENTVIEW_IID); + nsIDOMDocumentView documentView = queryInterface(document, nsIDOMDocumentView.class); nsIDOMAbstractView abstractView = documentView.getDefaultView(); - nsIInterfaceRequestor requestor = (nsIInterfaceRequestor) abstractView - .queryInterface(nsIInterfaceRequestor.NS_IINTERFACEREQUESTOR_IID); + nsIInterfaceRequestor requestor = queryInterface(abstractView, nsIInterfaceRequestor.class); nsIWebNavigation navigation = (nsIWebNavigation) requestor .getInterface(nsIWebNavigation.NS_IWEBNAVIGATION_IID); - nsIDocShell docShell = (nsIDocShell) navigation - .queryInterface(nsIDocShell.NS_IDOCSHELL_IID); + nsIDocShell docShell = queryInterface(navigation, nsIDocShell.class); nsIContentViewer contentViewer = docShell.getContentViewer(); - nsIMarkupDocumentViewer markupDocumentViewer = (nsIMarkupDocumentViewer) contentViewer - .queryInterface(nsIMarkupDocumentViewer.NS_IMARKUPDOCUMENTVIEWER_IID); + nsIMarkupDocumentViewer markupDocumentViewer = queryInterface(contentViewer, nsIMarkupDocumentViewer.class); return markupDocumentViewer; } catch (NullPointerException e) { return null; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.util; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -81,7 +83,7 @@ } public static Point getMousePoint(nsIDOMMouseEvent mouseEvent) { - nsIDOMNSUIEvent uiEvent = (nsIDOMNSUIEvent) mouseEvent.queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_IID); + nsIDOMNSUIEvent uiEvent = queryInterface(mouseEvent, nsIDOMNSUIEvent.class); return new Point(uiEvent.getPageX(), uiEvent.getPageY()); } @@ -113,7 +115,7 @@ } public static nsIDOMNode getTargetNode(nsIDOMEvent event) { - return (nsIDOMNode) event.getTarget().queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + return queryInterface(event.getTarget(), nsIDOMNode.class); } public static boolean isSelectionContains(nsISelection selection, nsIDOMNode parent, int offset) { @@ -133,7 +135,7 @@ } public static boolean isRangeContains(nsIDOMRange range, nsIDOMNode parent, int offset) { - nsIDOMNSRange domNSRange = (nsIDOMNSRange) range.queryInterface(nsIDOMNSRange.NS_IDOMNSRANGE_IID); + nsIDOMNSRange domNSRange = queryInterface(range, nsIDOMNSRange.class); boolean inRange = domNSRange.isPointInRange(parent, offset); return inRange; } @@ -271,7 +273,7 @@ // public static Rectangle getBounds(nsIDOMNode node) { // Rectangle bounds = null; // -// nsIAccessible accessible = (nsIAccessible) node.queryInterface(nsIAccessible.NS_IACCESSIBLE_IID); +// nsIAccessible accessible = queryInterface(node, nsIAccessible.class); // if (accessible != null) { // int[] xArray = new int[1]; // Left hand corner of the node // int[] yArray = new int[1]; // Top corner of the node @@ -409,7 +411,7 @@ for (int i = 0; i < nodeList.getLength(); i++) { nsIDOMElement element = null; try { - element = (nsIDOMElement) nodeList.item(i).queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + element = queryInterface(nodeList.item(i), nsIDOMElement.class); } catch (org.mozilla.xpcom.XPCOMException e) { /* * Cannot parse node to element, return null. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.util; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.util.Properties; import org.eclipse.jface.text.source.ISourceViewer; @@ -17,7 +19,6 @@ import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.ui.dnd.DnDUtil; import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput; -import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper; import org.jboss.tools.jst.jsp.jspeditor.dnd.JSPPaletteInsertHelper; import org.jboss.tools.vpe.VpePlugin; import org.mozilla.interfaces.nsIFile; @@ -59,7 +60,7 @@ boolean rst = true; try { - support.queryInterface(nsIFile.NS_IFILE_IID); + queryInterface(support, nsIFile.class); } catch (XPCOMException e) { rst = false; } @@ -74,7 +75,7 @@ boolean rst = true; try { - support.queryInterface(nsISupportsCString.NS_ISUPPORTSCSTRING_IID); + queryInterface(support, nsISupportsCString.class); } catch (XPCOMException e) { rst = false; } @@ -89,7 +90,7 @@ boolean rst = true; try { - support.queryInterface(nsISupportsString.NS_ISUPPORTSSTRING_IID); + queryInterface(support, nsISupportsString.class); } catch (XPCOMException e) { rst = false; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2010-06-01 04:31:55 UTC (rev 22448) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeStyleUtil.java 2010-06-01 04:45:47 UTC (rev 22449) @@ -10,6 +10,8 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.util; +import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface; + import java.io.File; import java.net.MalformedURLException; import java.net.URI; @@ -78,9 +80,7 @@ */ public static nsIDOMCSSStyleDeclaration getStyle(nsIDOMElement element) { nsIDOMElementCSSInlineStyle inlineStyle = - (nsIDOMElementCSSInlineStyle) - element.queryInterface(nsIDOMElementCSSInlineStyle - .NS_IDOMELEMENTCSSINLINESTYLE_IID); + queryInterface(element, nsIDOMElementCSSInlineStyle.class); return inlineStyle.getStyle(); }