Author: svasilyev
Date: 2008-02-03 10:51:00 -0500 (Sun, 03 Feb 2008)
New Revision: 6100
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/editor/VpeSelectionBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
Code adjustment
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 2008-02-02
11:35:52 UTC (rev 6099)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2008-02-03
15:51:00 UTC (rev 6100)
@@ -14,6 +14,7 @@
import org.jboss.tools.vpe.editor.VpeController;
import org.jboss.tools.vpe.editor.mozilla.EditorDomEventListener;
import org.jboss.tools.vpe.editor.mozilla.MozillaDropInfo;
+import org.jboss.tools.vpe.xulrunner.XPCOM;
import org.mozilla.interfaces.nsIComponentManager;
import org.mozilla.interfaces.nsIDOMEvent;
import org.mozilla.interfaces.nsIDOMMouseEvent;
@@ -31,13 +32,6 @@
*Class which response for drag and drop functionality
*/
public class VpeDnD {
-
- private static final String CID_DRAGSERVICE =
"(a)mozilla.org/widget/dragservice;1";
- private static final String CID_TRANSFERABLE =
"(a)mozilla.org/widget/transferable;1";
- private static final String CID_SUPPORTSSTRING =
"(a)mozilla.org/supports-string;1";
-
- private static final String CID_SUPPORTSARRAY =
"(a)mozilla.org/supports-array;1";
-
/**
* service manager */
private nsIServiceManager serviceManager;
@@ -59,7 +53,7 @@
*/
public void startDragSession(nsIDOMEvent domEvent) {
nsISupportsArray transArray = (nsISupportsArray) getComponentManager()
- .createInstanceByContractID(CID_SUPPORTSARRAY, null,
+ .createInstanceByContractID(XPCOM.NS_SUPPORTSARRAY_CONTRACTID, null,
nsISupportsArray.NS_ISUPPORTSARRAY_IID);
transArray.appendElement(createTransferable());
getDragService().invokeDragSession((nsIDOMNode)
domEvent.getTarget().queryInterface(nsIDOMNode.NS_IDOMNODE_IID), transArray, null,
@@ -80,22 +74,22 @@
private nsITransferable createTransferable() {
nsITransferable iTransferable = (nsITransferable) getComponentManager()
- .createInstanceByContractID(CID_TRANSFERABLE, null,
+ .createInstanceByContractID(XPCOM.NS_TRANSFERABLE_CONTRACTID, null,
nsITransferable.NS_ITRANSFERABLE_IID);
nsISupportsString transferData = (nsISupportsString) getComponentManager()
- .createInstanceByContractID(CID_SUPPORTSSTRING, null,
+ .createInstanceByContractID(XPCOM.NS_SUPPORTSSTRING_CONTRACTID, null,
nsISupportsString.NS_ISUPPORTSSTRING_IID);
- String data="vpe-element";
+ String data="vpe-element"; //$NON-NLS-1$
transferData.setData(data);
iTransferable.setTransferData(VpeController.MODEL_FLAVOR, transferData,
data.length());
- iTransferable.setTransferData("text/plain", transferData, data.length());
- iTransferable.setTransferData("text/unicode", transferData,data.length()*2);
- iTransferable.setTransferData("text/html", transferData, data.length()*2);
- iTransferable.setTransferData("text/xml", transferData, data.length()*2);
- iTransferable.setTransferData("text/rtf", transferData, data.length()*2);
- iTransferable.setTransferData("text/enriched", transferData,
data.length()*2);
- iTransferable.setTransferData("text/richtext", transferData,
data.length()*2);
- iTransferable.setTransferData("text/t140", transferData, data.length()*2);
+ iTransferable.setTransferData("text/plain", transferData, data.length());
//$NON-NLS-1$
+ iTransferable.setTransferData("text/unicode", transferData,data.length()*2);
//$NON-NLS-1$
+ iTransferable.setTransferData("text/html", transferData, data.length()*2);
//$NON-NLS-1$
+ iTransferable.setTransferData("text/xml", transferData, data.length()*2);
//$NON-NLS-1$
+ iTransferable.setTransferData("text/rtf", transferData, data.length()*2);
//$NON-NLS-1$
+ iTransferable.setTransferData("text/enriched", transferData,
data.length()*2); //$NON-NLS-1$
+ iTransferable.setTransferData("text/richtext", transferData,
data.length()*2); //$NON-NLS-1$
+ iTransferable.setTransferData("text/t140", transferData, data.length()*2);
//$NON-NLS-1$
return iTransferable;
}
@@ -131,7 +125,7 @@
if(dragService==null) {
dragService = (nsIDragService) getServiceManager()
- .getServiceByContractID(CID_DRAGSERVICE,
+ .getServiceByContractID(XPCOM.NS_DRAGSERVICE_CONTRACTID,
nsIDragService.NS_IDRAGSERVICE_IID);
}
return dragService;
@@ -152,7 +146,7 @@
if(getDragService().getCurrentSession().getSourceNode()==null){
//external drag
- info = editorDomEventListener.canExternalDrop(mouseEvent,
VpeController.MODEL_FLAVOR, "");
+ info = editorDomEventListener.canExternalDrop(mouseEvent,
VpeController.MODEL_FLAVOR, ""); //$NON-NLS-1$
} else {
//internal drag
info = editorDomEventListener.canInnerDrop(mouseEvent);
@@ -179,7 +173,7 @@
if(getDragService().getCurrentSession().getSourceDocument()==null) {
//in this case it's is external drag
- editorDomEventListener.externalDrop((nsIDOMMouseEvent)domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID),
VpeController.MODEL_FLAVOR, "");
+ editorDomEventListener.externalDrop((nsIDOMMouseEvent)domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID),
VpeController.MODEL_FLAVOR, ""); //$NON-NLS-1$
} else {
// in this case it's is an internal drag
editorDomEventListener.innerDrop((nsIDOMMouseEvent)domEvent.queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID));
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 2008-02-02
11:35:52 UTC (rev 6099)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2008-02-03
15:51:00 UTC (rev 6100)
@@ -337,7 +337,7 @@
Node setContextMenuSelection(nsIDOMNode visualNode) {
if (VpeDebug.PRINT_VISUAL_CONTEXTMENU_EVENT) {
- System.out.println(">>>>>>>>>>>>>>
onShowContextMenu visualNode: " + visualNode.getNodeName() + "(" +
visualNode + ")");
+ System.out.println(">>>>>>>>>>>>>>
onShowContextMenu visualNode: " + visualNode.getNodeName() + "(" +
visualNode + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
visualSelectionController.setCaretEnabled(false);
@@ -659,8 +659,8 @@
if (!anchorStartFlag) visualAnchorOffset++;
}
if (VpeDebug.PRINT_SOURCE_SELECTION_EVENT) {
- System.out.println("setVisualSelection");
- System.out.println(" visualAnchorNode: " +
visualAnchorNode.getNodeName() + "(" + visualAnchorNode + ")
visualAnchorContainer: " + visualAnchorContainer.getNodeName() + "(" +
visualAnchorContainer + ") visualAnchorOffset: " + visualAnchorOffset + "
anchorStartFlag: " + anchorStartFlag);
+ System.out.println("setVisualSelection"); //$NON-NLS-1$
+ System.out.println(" visualAnchorNode: " +
visualAnchorNode.getNodeName() + "(" + visualAnchorNode + ")
visualAnchorContainer: " + visualAnchorContainer.getNodeName() + "(" +
visualAnchorContainer + ") visualAnchorOffset: " + visualAnchorOffset + "
anchorStartFlag: " + anchorStartFlag); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
//$NON-NLS-4$
}
nsIDOMNode visualFocusContainer = null;
@@ -1159,7 +1159,7 @@
nsISelection selection =
visualSelectionController.getSelection(nsISelectionController.SELECTION_NORMAL);
nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent);
if (visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE
&&
- (HTML.TAG_INPUT.equalsIgnoreCase(visualNode.getNodeName()) ||
HTML.TAG_BUTTON.equalsIgnoreCase(visualNode.getNodeName()) ||
"SELECT".equalsIgnoreCase(visualNode.getNodeName())) &&
+ (HTML.TAG_INPUT.equalsIgnoreCase(visualNode.getNodeName()) ||
HTML.TAG_BUTTON.equalsIgnoreCase(visualNode.getNodeName()) ||
HTML.TAG_SELECT.equalsIgnoreCase(visualNode.getNodeName())) &&
!selection.containsNode(visualNode, false) &&
visualBuilder.canInnerDrag((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)))
{
return (nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID);
}
@@ -1263,21 +1263,21 @@
void printVisualSelection() {
nsISelection selection =
visualSelectionController.getSelection(nsISelectionController.SELECTION_NORMAL);
boolean collapsed = selection.getIsCollapsed();
- System.out.println(" ## VisualSelection");
- System.out.println(" ## collapsed: " + collapsed);
+ System.out.println(" ## VisualSelection"); //$NON-NLS-1$
+ System.out.println(" ## collapsed: " + collapsed); //$NON-NLS-1$
if (!collapsed) {
nsIDOMNode anchorNode = selection.getAnchorNode();
if (anchorNode != null) {
- System.out.println(" ## anchorNode: " + anchorNode.getNodeName() + "
(" + anchorNode + ") offset: " + selection.getAnchorOffset());
+ System.out.println(" ## anchorNode: " + anchorNode.getNodeName() + "
(" + anchorNode + ") offset: " + selection.getAnchorOffset());
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
} else {
- System.out.println(" ## anchorNode: " + anchorNode);
+ System.out.println(" ## anchorNode: " + anchorNode); //$NON-NLS-1$
}
}
nsIDOMNode focusNode = selection.getFocusNode();
if (focusNode != null) {
- System.out.println(" ## focusNode: " + focusNode.getNodeName() + "
(" + focusNode + ") offset: " + selection.getFocusOffset());
+ System.out.println(" ## focusNode: " + focusNode.getNodeName() + "
(" + focusNode + ") offset: " + selection.getFocusOffset()); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$
} else {
- System.out.println(" ## focusNode: " + focusNode);
+ System.out.println(" ## focusNode: " + focusNode); //$NON-NLS-1$
}
}
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-02-02
11:35:52 UTC (rev 6099)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-02-03
15:51:00 UTC (rev 6100)
@@ -20,53 +20,53 @@
private HTML() {
}
- public static final String TAG_HTML = "HTML";
- public static final String TAG_HEAD = "HEAD";
- public static final String TAG_BODY = "BODY";
- public static final String TAG_IMG = "IMG";
- public static final String TAG_LINK = "LINK";
- public static final String TAG_SELECT = "SELECT";
- public static final String TAG_OPTION = "OPTION";
- public static final String TAG_STYLE = "STYLE";
- public static final String TAG_TABLE = "TABLE";
- public static final String TAG_TBODY = "TBODY";
- public static final String TAG_THEAD = "THEAD";
- public static final String TAG_TFOOT = "TFOOT";
- public static final String TAG_TH = "TH";
- public static final String TAG_TR = "TR";
- public static final String TAG_TD = "TD";
- public static final String TAG_DL = "DL";
- public static final String TAG_DT = "DT";
- public static final String TAG_COL = "COL";
- public static final String TAG_COLS = "COLS";
- public static final String TAG_COLGROUP = "COLGROUP";
- public static final String TAG_BR = "BR";
- public static final String TAG_LI = "LI";
- public static final String TAG_DIV = "DIV";
- public static final String TAG_SPAN = "SPAN";
- public static final String TAG_P = "P";
- public static final String TAG_TEXTAREA = "TEXTAREA";
- public static final String TAG_INPUT = "INPUT";
- public static final String TAG_BUTTON = "BUTTON";
- public static final String TAG_OL = "OL";
- public static final String TAG_UL = "UL";
- public static final String TAG_CODE = "CODE";
- public static final String TAG_PRE = "PRE";
+ public static final String TAG_HTML = "HTML"; //$NON-NLS-1$
+ public static final String TAG_HEAD = "HEAD"; //$NON-NLS-1$
+ public static final String TAG_BODY = "BODY"; //$NON-NLS-1$
+ public static final String TAG_IMG = "IMG"; //$NON-NLS-1$
+ public static final String TAG_LINK = "LINK"; //$NON-NLS-1$
+ public static final String TAG_SELECT = "SELECT"; //$NON-NLS-1$
+ public static final String TAG_OPTION = "OPTION"; //$NON-NLS-1$
+ public static final String TAG_STYLE = "STYLE"; //$NON-NLS-1$
+ public static final String TAG_TABLE = "TABLE"; //$NON-NLS-1$
+ public static final String TAG_TBODY = "TBODY"; //$NON-NLS-1$
+ public static final String TAG_THEAD = "THEAD"; //$NON-NLS-1$
+ public static final String TAG_TFOOT = "TFOOT"; //$NON-NLS-1$
+ public static final String TAG_TH = "TH"; //$NON-NLS-1$
+ public static final String TAG_TR = "TR"; //$NON-NLS-1$
+ public static final String TAG_TD = "TD"; //$NON-NLS-1$
+ public static final String TAG_DL = "DL"; //$NON-NLS-1$
+ public static final String TAG_DT = "DT"; //$NON-NLS-1$
+ public static final String TAG_COL = "COL"; //$NON-NLS-1$
+ public static final String TAG_COLS = "COLS"; //$NON-NLS-1$
+ public static final String TAG_COLGROUP = "COLGROUP"; //$NON-NLS-1$
+ public static final String TAG_BR = "BR"; //$NON-NLS-1$
+ public static final String TAG_LI = "LI"; //$NON-NLS-1$
+ public static final String TAG_DIV = "DIV"; //$NON-NLS-1$
+ public static final String TAG_SPAN = "SPAN"; //$NON-NLS-1$
+ public static final String TAG_P = "P"; //$NON-NLS-1$
+ public static final String TAG_TEXTAREA = "TEXTAREA"; //$NON-NLS-1$
+ public static final String TAG_INPUT = "INPUT"; //$NON-NLS-1$
+ public static final String TAG_BUTTON = "BUTTON"; //$NON-NLS-1$
+ public static final String TAG_OL = "OL"; //$NON-NLS-1$
+ public static final String TAG_UL = "UL"; //$NON-NLS-1$
+ public static final String TAG_CODE = "CODE"; //$NON-NLS-1$
+ public static final String TAG_PRE = "PRE"; //$NON-NLS-1$
- public static final String ATTR_ID = "ID";
- public static final String ATTR_TYPE = "TYPE";
- public static final String ATTR_TEXT = "TEXT";
- public static final String ATTR_CLASS = "CLASS";
- public static final String ATTR_TITLE = "TITLE";
- public static final String ATTR_NAME = "NAME";
- public static final String ATTR_VALUE = "VALUE";
- public static final String ATTR_STYLE = "STYLE";
- public static final String ATTR_SIZE = "SIZE";
- public static final String ATTR_MULTIPLE = "MULTIPLE";
- public static final String ATTR_COLSPAN = "colspan";
- public static final String ATTR_CELLSPACING = "cellspacing";
- public static final String ATTR_CELLPADDING = "cellpadding";
- public static final String ATTR_WIDTH = "WIDTH";
- public static final String ATTR_HEIGHT = "HEIGHT";
- public static final String ATTR_BORDER = "BORDER";
+ public static final String ATTR_ID = "ID"; //$NON-NLS-1$
+ public static final String ATTR_TYPE = "TYPE"; //$NON-NLS-1$
+ public static final String ATTR_TEXT = "TEXT"; //$NON-NLS-1$
+ public static final String ATTR_CLASS = "CLASS"; //$NON-NLS-1$
+ public static final String ATTR_TITLE = "TITLE"; //$NON-NLS-1$
+ public static final String ATTR_NAME = "NAME"; //$NON-NLS-1$
+ public static final String ATTR_VALUE = "VALUE"; //$NON-NLS-1$
+ public static final String ATTR_STYLE = "STYLE"; //$NON-NLS-1$
+ public static final String ATTR_SIZE = "SIZE"; //$NON-NLS-1$
+ public static final String ATTR_MULTIPLE = "MULTIPLE"; //$NON-NLS-1$
+ public static final String ATTR_COLSPAN = "colspan"; //$NON-NLS-1$
+ public static final String ATTR_CELLSPACING = "cellspacing"; //$NON-NLS-1$
+ public static final String ATTR_CELLPADDING = "cellpadding"; //$NON-NLS-1$
+ public static final String ATTR_WIDTH = "WIDTH"; //$NON-NLS-1$
+ public static final String ATTR_HEIGHT = "HEIGHT"; //$NON-NLS-1$
+ public static final String ATTR_BORDER = "BORDER"; //$NON-NLS-1$
}
\ No newline at end of file