Author: mareshkau Date: 2009-10-08 10:30:01 -0400 (Thu, 08 Oct 2009) New Revision: 17979 Modified: workspace/mareshkau/xulrunner1.9.diff Log: Fix for https://jira.jboss.org/jira/browse/JBIDE-4998 Modified: workspace/mareshkau/xulrunner1.9.diff =================================================================== --- workspace/mareshkau/xulrunner1.9.diff 2009-10-08 14:26:28 UTC (rev 17978) +++ workspace/mareshkau/xulrunner1.9.diff 2009-10-08 14:30:01 UTC (rev 17979) @@ -1,6 +1,6 @@ Index: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java =================================================================== ---- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java (revision 17955) +--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java (revision 17977) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java (working copy) @@ -50,8 +50,8 @@ @@ -24,7 +24,7 @@ Index: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java =================================================================== ---- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java (revision 17955) +--- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java (revision 17977) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlTextTemplate.java (working copy) @@ -19,14 +19,12 @@ import org.jboss.tools.vpe.editor.mapping.VpeElementData; @@ -52,9 +52,9 @@ Index: 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 (revision 17955) +--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java (revision 17977) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java (working copy) -@@ -2013,6 +2013,8 @@ +@@ -2031,6 +2031,8 @@ styleClasses = ATTR_DRAG_AVAILABLE_CLASS + " " //$NON-NLS-1$ + styleClasses; } @@ -63,7 +63,7 @@ } else { // change cursor style to normal if (styleClasses != null) { -@@ -2025,7 +2027,7 @@ +@@ -2043,7 +2045,7 @@ } } @@ -72,11 +72,23 @@ // TODO add drag and drop support return dragArea.contains(mousePoint) && mousePoint.x < (dragArea.x + DRAG_AREA_WIDTH) +Index: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java +=================================================================== +--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java (revision 17977) ++++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomEventListener.java (working copy) +@@ -166,6 +166,7 @@ + } else if(DRAGOVEREVENT.equals(eventType)) { + getEditorDomEventListener().dragOver(domEvent); + } ++ + getEditorDomEventListener().onRefresh(); + } + } Index: 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 (revision 17955) +--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java (revision 17977) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaEditor.java (working copy) -@@ -923,7 +923,7 @@ +@@ -1040,7 +1040,7 @@ nsIEditingSession iEditingSession = (nsIEditingSession) getXulRunnerEditor(). getComponentManager().createInstanceByContractID(XPCOM.NS_EDITINGSESSION_CONTRACTID, null, nsIEditingSession.NS_IEDITINGSESSION_IID); //make window editable @@ -87,7 +99,7 @@ //getting some editor to disable some actions Index: 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 (revision 17955) +--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java (revision 17977) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VisualDomUtil.java (working copy) @@ -10,18 +10,14 @@ ******************************************************************************/ @@ -179,7 +191,7 @@ int[] yArray = new int[1]; // Top corner of the node Index: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== ---- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java (revision 17955) +--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java (revision 17977) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java (working copy) @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IPath; @@ -206,7 +218,7 @@ private CSSReferenceList cssReferenceListListener; private TaglibReferenceList taglibReferenceListListener; -@@ -1096,8 +1098,17 @@ +@@ -1096,8 +1098,16 @@ // } // selection will be set only if press left button @@ -216,8 +228,7 @@ + //drag gesture isn't generated in XR 1.9 for Linux Platforms, so we start it's manually + //mareshkau + nsIDOMElement selectedElement = getXulRunnerEditor().getLastSelectedElement(); -+ if (Platform.OS_LINUX.equals(Platform.getOS()) && -+ VpeVisualDomBuilder.inDragArea(XulRunnerVpeUtils.getElementBounds(selectedElement), VisualDomUtil ++ if (VpeVisualDomBuilder.inDragArea(XulRunnerVpeUtils.getElementBounds(selectedElement), VisualDomUtil + .getMousePoint(mouseEvent))) { + dragGesture(mouseEvent); + } @@ -225,7 +236,7 @@ } finally { switcher.stopActiveEditor(); } -@@ -1313,6 +1324,7 @@ +@@ -1313,6 +1323,7 @@ boolean canDragFlag = canInnerDrag(mouseEvent); // start drag sessionvpe-element if (canDragFlag) {