Author: svasilyev Date: 2008-02-20 10:49:30 -0500 (Wed, 20 Feb 2008) New Revision: 6475 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: Improvement of VPE debug settings Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java 2008-02-20 15:07:37 UTC (rev 6474) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpeDebug.java 2008-02-20 15:49:30 UTC (rev 6475) @@ -29,6 +29,7 @@ public static final boolean VISUAL_CONTEXTMENU_DUMP_SOURCE; public static final boolean VISUAL_CONTEXTMENU_DUMP_MAPPING; + public static final boolean VISUAL_DUMP_PRINT_HASH; public static final boolean VISUAL_CONTEXTMENU_TEST; @@ -37,25 +38,26 @@ public static final boolean USE_PRINT_STACK_TRACE; static { - PRINT_SOURCE_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/mutation_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_SOURCE_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/selection_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_SOURCE_MODEL_LIFECYCLE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/model_lifecycle_event")); // $NON-NSL-1$ // $NON-NSL-1$ + PRINT_SOURCE_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/mutation_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_SOURCE_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/selection_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_SOURCE_MODEL_LIFECYCLE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/source/model_lifecycle_event")); //$NON-NLS-1$ //$NON-NLS-2$ - PRINT_VISUAL_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mutation_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_VISUAL_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/selection_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_VISUAL_CONTEXTMENU_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_VISUAL_MOUSE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mouse_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_VISUAL_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/dragdrop_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_VISUAL_KEY_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/key_event")); // $NON-NSL-1$ // $NON-NSL-1$ - PRINT_VISUAL_INNER_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/inner_dragdrop_event")); // $NON-NSL-1$ // $NON-NSL-1$ + PRINT_VISUAL_MUTATION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mutation_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_VISUAL_SELECTION_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/selection_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_VISUAL_CONTEXTMENU_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_VISUAL_MOUSE_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/mouse_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_VISUAL_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/dragdrop_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_VISUAL_KEY_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/key_event")); //$NON-NLS-1$ //$NON-NLS-2$ + PRINT_VISUAL_INNER_DRAGDROP_EVENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/inner_dragdrop_event")); //$NON-NLS-1$ //$NON-NLS-2$ - VISUAL_ADD_PSEUDO_ELEMENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/add_pseudo_element")); // $NON-NSL-1$ // $NON-NSL-1$ + VISUAL_ADD_PSEUDO_ELEMENT = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/add_pseudo_element")); //$NON-NLS-1$ //$NON-NLS-2$ - VISUAL_CONTEXTMENU_DUMP_SOURCE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_source")); // $NON-NSL-1$ // $NON-NSL-1$ - VISUAL_CONTEXTMENU_DUMP_MAPPING = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_mapping")); // $NON-NSL-1$ // $NON-NSL-1$ + VISUAL_CONTEXTMENU_DUMP_SOURCE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_source")); //$NON-NLS-1$ //$NON-NLS-2$ + VISUAL_CONTEXTMENU_DUMP_MAPPING = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/dump_mapping")); //$NON-NLS-1$ //$NON-NLS-2$ + VISUAL_DUMP_PRINT_HASH = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/dump_print_hash")); //$NON-NLS-1$ //$NON-NLS-2$ - VISUAL_CONTEXTMENU_TEST = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/show_test")); // $NON-NSL-1$ // $NON-NSL-1$ + VISUAL_CONTEXTMENU_TEST = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/visual/contextmenu/show_test")); //$NON-NLS-1$ //$NON-NLS-2$ - USE_PRINT_STACK_TRACE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/use_PrintStackTrace")); // $NON-NSL-1$ // $NON-NSL-1$ + USE_PRINT_STACK_TRACE = "true".equals(Platform.getDebugOption(VpePlugin.PLUGIN_ID + "/debug/use_PrintStackTrace")); //$NON-NLS-1$ //$NON-NLS-2$ } } Modified: 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 2008-02-20 15:07:37 UTC (rev 6474) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-02-20 15:49:30 UTC (rev 6475) @@ -1101,7 +1101,7 @@ if (VpeDebug.VISUAL_CONTEXTMENU_DUMP_SOURCE) { manager.add(new Action("Dump Source") { //$NON-NLS-1$ public void run() { - DOMTreeDumper dumper = new DOMTreeDumper(); + DOMTreeDumper dumper = new DOMTreeDumper(VpeDebug.VISUAL_DUMP_PRINT_HASH); dumper.dumpToStream(System.out, visualEditor.getDomDocument()); } }); Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java 2008-02-20 15:07:37 UTC (rev 6474) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java 2008-02-20 15:49:30 UTC (rev 6475) @@ -18,31 +18,47 @@ import org.mozilla.interfaces.nsIDOMNamedNodeMap; import org.mozilla.interfaces.nsIDOMNode; import org.mozilla.interfaces.nsIDOMNodeList; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; public class DOMTreeDumper { private PrintStream ps; private boolean inA; - private final String[] endTagForbiddenNames = {"AREA", - "BASE", - "BASEFONT", - "BR", - "COL", - "FRAME", - "HR", - "IMG", - "INPUT", - "ISINDEX", - "LINK", - "META", - "PARAM"}; + /** + * Flag to print hash code of object while dump node + * default true + */ + private boolean printHashCode; + + private final String[] endTagForbiddenNames = {"AREA", //$NON-NLS-1$ + "BASE", //$NON-NLS-1$ + "BASEFONT", //$NON-NLS-1$ + "BR", //$NON-NLS-1$ + "COL", //$NON-NLS-1$ + "FRAME", //$NON-NLS-1$ + "HR", //$NON-NLS-1$ + "IMG", //$NON-NLS-1$ + "INPUT", //$NON-NLS-1$ + "ISINDEX", //$NON-NLS-1$ + "LINK", //$NON-NLS-1$ + "META", //$NON-NLS-1$ + "PARAM"}; //$NON-NLS-1$ - public void dumpToStream(PrintStream ps, nsIDOMDocument doc) { + public DOMTreeDumper() { + this.printHashCode = true; + } + + public DOMTreeDumper(boolean isPrintHashCode) { + this.printHashCode = isPrintHashCode; + } + + public boolean isPrintHashCode() { + return printHashCode; + } + + public void setPrintHashCode(boolean printHashCode) { + this.printHashCode = printHashCode; + } + + public void dumpToStream(PrintStream ps, nsIDOMDocument doc) { this.ps = ps; dumpDocument(doc); } @@ -76,59 +92,62 @@ String value = node.getNodeValue(); switch (type) { - case Node.ELEMENT_NODE: - if (name.equals("A")) { + case nsIDOMNode.ELEMENT_NODE: + if (name.equals("A")) { //$NON-NLS-1$ inA = true; } - if (!(inA || name.equals("BR"))) { + if (!(inA || name.equals("BR"))) { //$NON-NLS-1$ ps.println(); } - ps.print("<" + name); + ps.print("<" + name); //$NON-NLS-1$ dumpAttributes(node); - ps.print(">(" + node.hashCode() + ")"); + ps.print(">"); //$NON-NLS-1$ + + printHashCode(node); + dumpChildren(node); - if (name.equals("A")) { + if (name.equals("A")) { //$NON-NLS-1$ inA = false; } if (!endTagForbidden(name)) { - ps.print("</" + name + ">"); + ps.print("</" + name + ">"); //$NON-NLS-1$ //$NON-NLS-2$ } break; - case Node.ATTRIBUTE_NODE: + case nsIDOMNode.ATTRIBUTE_NODE: nsIDOMAttr attr = (nsIDOMAttr) node.queryInterface(nsIDOMAttr.NS_IDOMATTR_IID); if (attr.getSpecified()) { - ps.print(" " + attr.getName().toUpperCase() + "=\"" + attr.getValue() + "\""); + ps.print(" " + attr.getName().toUpperCase() + "=\"" + attr.getValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } else { - ps.print(" " + attr.getName().toUpperCase()); + ps.print(" " + attr.getName().toUpperCase()); //$NON-NLS-1$ } break; - case Node.TEXT_NODE: - if (!node.getParentNode().getNodeName().equals("PRE")) { + case nsIDOMNode.TEXT_NODE: + if (!node.getParentNode().getNodeName().equals("PRE")) { //$NON-NLS-1$ value = value.trim(); } - if (!value.equals("")) { + if (!value.equals("")) { //$NON-NLS-1$ if (!inA) { ps.println(); } ps.print(canonicalize(value)); } - ps.print("(" + node.hashCode() + ")"); + printHashCode(node); break; - case Node.COMMENT_NODE: - ps.print("\n<!--" + value + "-->"); + case nsIDOMNode.COMMENT_NODE: + ps.print("\n<!--" + value + "-->"); //$NON-NLS-1$ //$NON-NLS-2$ break; - case Node.CDATA_SECTION_NODE: - case Node.ENTITY_REFERENCE_NODE: - case Node.ENTITY_NODE: - case Node.PROCESSING_INSTRUCTION_NODE: - case Node.DOCUMENT_NODE: - case Node.DOCUMENT_TYPE_NODE: - case Node.DOCUMENT_FRAGMENT_NODE: - case Node.NOTATION_NODE: - ps.println("\n<!-- NOT HANDLED: " + name + - " value=" + value + " -->"); + case nsIDOMNode.CDATA_SECTION_NODE: + case nsIDOMNode.ENTITY_REFERENCE_NODE: + case nsIDOMNode.ENTITY_NODE: + case nsIDOMNode.PROCESSING_INSTRUCTION_NODE: + case nsIDOMNode.DOCUMENT_NODE: + case nsIDOMNode.DOCUMENT_TYPE_NODE: + case nsIDOMNode.DOCUMENT_FRAGMENT_NODE: + case nsIDOMNode.NOTATION_NODE: + ps.println("\n<!-- NOT HANDLED: " + name + //$NON-NLS-1$ + " value=" + value + " -->"); //$NON-NLS-1$ //$NON-NLS-2$ break; } } @@ -166,16 +185,16 @@ for (int i = 0; i < length; i++) { switch (c = in.charAt(i)) { case '&' : - out.append("&amp;"); + out.append("&amp;"); //$NON-NLS-1$ break; case '<': - out.append("&lt;"); + out.append("&lt;"); //$NON-NLS-1$ break; case '>': - out.append("&gt;"); + out.append("&gt;"); //$NON-NLS-1$ break; case '\u00A0': - out.append("&nbsp;"); + out.append("&nbsp;"); //$NON-NLS-1$ break; default: out.append(c); @@ -192,4 +211,10 @@ } return false; } + + private void printHashCode(Object o) { + if (isPrintHashCode()) { + ps.print("(" + o.hashCode() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ + } + } } \ No newline at end of file