Author: svasilyev Date: 2007-08-09 05:09:20 -0400 (Thu, 09 Aug 2007) New Revision: 3000 Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 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/VpeDropWindow.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java Log: http://jira.jboss.org/jira/browse/EXIN-235 references to mozilla were extracted Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2007-08-09 09:09:20 UTC (rev 3000) @@ -31,7 +31,6 @@ org.jboss.tools.vpe.editor.util, org.jboss.tools.vpe.messages,meta Require-Bundle: org.jboss.tools.common.model.ui, - org.jboss.tools.vpe.mozilla, org.eclipse.jface.text, org.eclipse.jdt.core, org.jboss.tools.common, 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-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; + import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; @@ -144,6 +145,7 @@ import org.mozilla.interfaces.nsISupports; import org.mozilla.interfaces.nsISupportsArray; import org.mozilla.interfaces.nsITransferable; +import org.mozilla.xpcom.Mozilla; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -1130,8 +1132,9 @@ }); } } - public void onShowContextMenu(int contextFlags, nsIDOMMouseEvent mouseEvent, Node node) { - nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent); + + public void onShowContextMenu(long contextFlags, nsIDOMEvent event, nsIDOMNode node) { + nsIDOMNode visualNode = VisualDomUtil.getTargetNode(event); if (visualNode != null) { Node selectedSourceNode = null; @@ -2417,4 +2420,12 @@ visualBuilder.innerDrop(node, parentNode, offset); } + /* (non-Javadoc) + * @see org.mozilla.interfaces.nsISupports#queryInterface(java.lang.String) + */ + @Override + public nsISupports queryInterface(String arg0) { + return Mozilla.getInstance().queryInterface(this, arg0); + } + } \ No newline at end of file Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeDropWindow.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -10,32 +10,46 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor; -import org.jboss.tools.common.model.ui.dnd.ModelTransfer; -import org.eclipse.jface.util.*; -import org.eclipse.jface.viewers.*; +import org.eclipse.jface.util.DelegatingDropAdapter; +import org.eclipse.jface.util.TransferDropTargetListener; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; -import org.eclipse.swt.dnd.*; -import org.eclipse.swt.events.*; -import org.eclipse.swt.graphics.*; -import org.eclipse.swt.layout.*; -import org.eclipse.swt.widgets.*; +import org.eclipse.swt.dnd.DND; +import org.eclipse.swt.dnd.DropTarget; +import org.eclipse.swt.dnd.DropTargetEvent; +import org.eclipse.swt.dnd.FileTransfer; +import org.eclipse.swt.dnd.HTMLTransfer; +import org.eclipse.swt.dnd.TextTransfer; +import org.eclipse.swt.dnd.Transfer; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Tree; +import org.eclipse.swt.widgets.TreeItem; import org.eclipse.wst.common.ui.internal.dnd.ObjectTransfer; import org.eclipse.wst.common.ui.internal.dnd.ViewerDropAdapter; import org.eclipse.wst.sse.core.internal.model.FactoryRegistry; -import org.eclipse.wst.sse.ui.internal.contentoutline.*; +import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.ui.internal.contentoutline.*; +import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeContentProvider; +import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider; +import org.jboss.tools.common.model.ui.dnd.ModelTransfer; +import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; import org.jboss.tools.jst.jsp.editor.IJSPTextEditor; +import org.jboss.tools.vpe.editor.dnd.context.JSPViewerDropAdapter; import org.w3c.dom.Node; -import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext; -import org.jboss.tools.vpe.editor.dnd.context.JSPViewerDropAdapter; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIDOMMouseEvent; - public class VpeDropWindow extends Window { static final Color BACKGROUND_COLOR = new Color(null, 0xff, 0xff, 0xcd); - nsIDOMMouseEvent event; IJSPTextEditor editor; boolean active = false; TreeViewer treeViewer; Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -45,7 +45,6 @@ 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.mozilla.internal.swt.xpl.nsIFrameSelection; import org.mozilla.interfaces.nsIDOMKeyEvent; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Attr; Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/EditorDomEventListener.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -11,7 +11,7 @@ package org.jboss.tools.vpe.editor.mozilla; -import org.jboss.tools.vpe.mozilla.browser.ContextMenuListener; +import org.mozilla.interfaces.nsIContextMenuListener; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMEvent; @@ -20,8 +20,9 @@ import org.mozilla.interfaces.nsIDOMMutationEvent; import org.mozilla.interfaces.nsISelection; -public interface EditorDomEventListener extends ContextMenuListener { +public interface EditorDomEventListener extends nsIContextMenuListener { + // nsIDOMMutationListener void subtreeModified(nsIDOMMutationEvent mutationEvent); void nodeInserted(nsIDOMMutationEvent mutationEvent); Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaBaseEventListener.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -11,14 +11,6 @@ package org.jboss.tools.vpe.editor.mozilla; -import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.mozilla.browser.MozillaDebug; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.VpeDnD; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.XPCOM; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.XPCOMObject; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIComponentManager; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsID; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.nsIDOMMouseEvent; import org.mozilla.interfaces.nsIClipboardDragDropHooks; import org.mozilla.interfaces.nsIDOMEvent; import org.mozilla.interfaces.nsIDragSession; Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTagDescription.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -10,21 +10,33 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.VpeResizer; +// TODO Alexey Yukhovich add resizer support +//import org.jboss.tools.vpe.mozilla.internal.swt.xpl.VpeResizer; public class VpeTagDescription { public static final int DISPLAY_TYPE_NONE = 0; public static final int DISPLAY_TYPE_BLOCK = 1; public static final int DISPLAY_TYPE_INLINE = 2; - public static final int RESIZE_CONSTRAINS_TOPLEFT = VpeResizer.eTopLeft; - public static final int RESIZE_CONSTRAINS_TOP = VpeResizer.eTop; - public static final int RESIZE_CONSTRAINS_TOPRIGHT = VpeResizer.eTopRight; - public static final int RESIZE_CONSTRAINS_LEFT = VpeResizer.eLeft; - public static final int RESIZE_CONSTRAINS_RIGHT = VpeResizer.eRight; - public static final int RESIZE_CONSTRAINS_BOTTOMLEFT = VpeResizer.eBottomLeft; - public static final int RESIZE_CONSTRAINS_BOTTOM = VpeResizer.eBottom; - public static final int RESIZE_CONSTRAINS_BOTTOMRIGHT = VpeResizer.eBottomRight; + // TODO Alexey Yukhovich add resuzer support +// public static final int RESIZE_CONSTRAINS_TOPLEFT = VpeResizer.eTopLeft; +// public static final int RESIZE_CONSTRAINS_TOP = VpeResizer.eTop; +// public static final int RESIZE_CONSTRAINS_TOPRIGHT = VpeResizer.eTopRight; +// public static final int RESIZE_CONSTRAINS_LEFT = VpeResizer.eLeft; +// public static final int RESIZE_CONSTRAINS_RIGHT = VpeResizer.eRight; +// public static final int RESIZE_CONSTRAINS_BOTTOMLEFT = VpeResizer.eBottomLeft; +// public static final int RESIZE_CONSTRAINS_BOTTOM = VpeResizer.eBottom; +// public static final int RESIZE_CONSTRAINS_BOTTOMRIGHT = VpeResizer.eBottomRight; + // TODO Alexey Yukhovich restore above resizer constraints + public static final int RESIZE_CONSTRAINS_TOPLEFT = 1; + public static final int RESIZE_CONSTRAINS_TOP = 2; + public static final int RESIZE_CONSTRAINS_TOPRIGHT = 4; + public static final int RESIZE_CONSTRAINS_LEFT = 8; + public static final int RESIZE_CONSTRAINS_RIGHT = 16; + public static final int RESIZE_CONSTRAINS_BOTTOMLEFT = 32; + public static final int RESIZE_CONSTRAINS_BOTTOM = 64; + public static final int RESIZE_CONSTRAINS_BOTTOMRIGHT = 128; + public static final int RESIZE_CONSTRAINS_NONE = 0; public static final int RESIZE_CONSTRAINS_ALL = RESIZE_CONSTRAINS_TOPLEFT | RESIZE_CONSTRAINS_TOP | RESIZE_CONSTRAINS_TOPRIGHT | RESIZE_CONSTRAINS_LEFT | RESIZE_CONSTRAINS_RIGHT | RESIZE_CONSTRAINS_BOTTOMLEFT | RESIZE_CONSTRAINS_BOTTOM | RESIZE_CONSTRAINS_BOTTOMRIGHT; Modified: branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java =================================================================== --- branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2007-08-09 08:46:05 UTC (rev 2999) +++ branches/jbosstools_xulrunner/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2007-08-09 09:09:20 UTC (rev 3000) @@ -12,24 +12,17 @@ import java.util.HashSet; -import org.w3c.dom.Attr; +import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; +import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; -import org.jboss.tools.vpe.editor.VpeVisualInnerDragInfo; -import org.jboss.tools.vpe.editor.context.VpePageContext; -import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; -import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.editor.util.VpeStyleUtil; -import org.jboss.tools.vpe.mozilla.internal.swt.xpl.DataHelper; - public class VpeDnd { static final String TAG_DRAG = VpeTemplateManager.VPE_PREFIX + "drag"; static final String TAG_DROP = VpeTemplateManager.VPE_PREFIX + "drop";