Author: mareshkau Date: 2007-08-17 05:43:22 -0400 (Fri, 17 Aug 2007) New Revision: 3203 Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java Log: http://jira.jboss.com/jira/browse/JBIDE-744 Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-17 09:40:58 UTC (rev 3202) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-17 09:43:22 UTC (rev 3203) @@ -1305,6 +1305,7 @@ } private boolean startActiveEditor(int newType) { + System.out.print("start"); if (type == ACTIVE_EDITOR_NONE) { if( newType == ACTIVE_EDITOR_SOURCE && editPart.getVisualMode() == VpeEditorPart.SOURCE_MODE) { @@ -1318,6 +1319,7 @@ } private void stopActiveEditor() { + System.out.println("stop"); type = ACTIVE_EDITOR_NONE; } } Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2007-08-17 09:40:58 UTC (rev 3202) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2007-08-17 09:43:22 UTC (rev 3203) @@ -151,7 +151,7 @@ if (info.startFlag) { visualBuilder.setSelectionRectangle((nsIDOMElement)visualSelectedNode, false); } else { - visualParentElement = (nsIDOMElement)visualSelectedNode.getParentNode(); + visualParentElement = (nsIDOMElement)visualSelectedNode.getParentNode().queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); visualBuilder.setSelectionRectangle(visualParentElement, false); } int offset = info.startFlag ? 0 : ((IndexedRegion)sourceNode).getEndOffset() - Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-08-17 09:40:58 UTC (rev 3202) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2007-08-17 09:43:22 UTC (rev 3203) @@ -90,7 +90,7 @@ private nsIDOMElement visualContentArea; private VpePageContext pageContext; // TODO Max Areshkau figure out with DnD -// private VpeDnD dnd; + private VpeDnD dnd; private nsIDOMNode headNode; private List includeStack; boolean rebuildFlag = false; @@ -144,7 +144,7 @@ this.visualDocument = visualEditor.getDomDocument(); this.visualContentArea = visualEditor.getContentArea(); // TODO Max Areshkau figure out -// this.dnd = visualEditor.getLocalDnD(); + this.dnd = new VpeDnD(); this.pageContext = pageContext; this.headNode = visualEditor.getHeadNode(); // TODO Max Areshkau figure out @@ -1359,9 +1359,8 @@ } Rectangle getNodeBounds(nsIDOMNode visualNode) { - // TODO Max Areshkau add DnD support -// return dnd.getBounds(visualNode); - return null; + + return dnd.getBounds(visualNode); } static boolean canInsertAfter(int x, int y, Rectangle rect) { Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-08-17 09:40:58 UTC (rev 3202) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java 2007-08-17 09:43:22 UTC (rev 3203) @@ -334,7 +334,7 @@ * @see org.mozilla.interfaces.nsIDOMEventListener#handleEvent(org.mozilla.interfaces.nsIDOMEvent) */ public void handleEvent(nsIDOMEvent domEvent) { - + try{ if(getEditorDomEventListener()==null){ return; @@ -350,14 +350,14 @@ getEditorDomEventListener().mouseDown(mouseEvent); } else if(MOUSEUPEVENTTYPE.equals(domEvent.getType())) { -// nsIDOMMouseEvent mouseEvent; -// mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); -// getEditorDomEventListener().mouseUp(mouseEvent); + nsIDOMMouseEvent mouseEvent; + mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + getEditorDomEventListener().mouseUp(mouseEvent); } else if(CLICKEVENTTYPE.equals(domEvent.getType())) { -// nsIDOMMouseEvent mouseEvent; -// mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); -// getEditorDomEventListener().mouseClick(mouseEvent); + nsIDOMMouseEvent mouseEvent; + mouseEvent = (nsIDOMMouseEvent) domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID); + getEditorDomEventListener().mouseClick(mouseEvent); } else if(DBLCLICK.equals(domEvent.getType())) { nsIDOMMouseEvent mouseEvent; @@ -368,6 +368,12 @@ nsIDOMKeyEvent keyEvent = (nsIDOMKeyEvent) domEvent.queryInterface(nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID); getEditorDomEventListener().keyPress(keyEvent); } + //not using default mozilla event handlers + domEvent.stopPropagation(); + domEvent.preventDefault(); + }catch(Throwable th) { + th.printStackTrace(); + } } /* (non-Javadoc) Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-08-17 09:40:58 UTC (rev 3202) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java 2007-08-17 09:43:22 UTC (rev 3203) @@ -62,8 +62,6 @@ import org.mozilla.interfaces.nsIDOMNamedNodeMap; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; -import org.w3c.dom.Element; -import org.w3c.dom.Node; public class MozillaEditor extends EditorPart implements IReusableEditor { protected static final String INIT_URL = "file://" + (new File(VpePlugin.getDefault().getResourcePath("ve"), "init.html")).getAbsolutePath(); Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2007-08-17 09:40:58 UTC (rev 3202) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2007-08-17 09:43:22 UTC (rev 3203) @@ -29,7 +29,7 @@ } public static boolean isPseudoElement(nsIDOMNode visualNode) { - return visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE && "yes".equalsIgnoreCase(((Element)visualNode).getAttribute(PSEUDO_CONTENT_ATTR)); + return visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE && "yes".equalsIgnoreCase(((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).getAttribute(PSEUDO_CONTENT_ATTR)); } public static nsIDOMNode getContainerForPseudoContent(nsIDOMNode visualNode) {