[jbosstools-commits] JBoss Tools SVN: r11956 - in trunk/vpe/plugins: org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util and 1 other directories.

Author: sdzmitrovich Date: 2008-11-21 11:58:18 -0500 (Fri, 21 Nov 2008) New Revision: 11956 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/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2961 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-11-21 16:55:26 UTC (rev 11955) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-21 16:58:18 UTC (rev 11956) @@ -11,6 +11,7 @@ package org.jboss.tools.vpe.editor; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -148,6 +149,7 @@ import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.toolbar.format.FormatControllerManager; import org.jboss.tools.vpe.editor.util.DocTypeUtil; +import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.NodesManagingUtil; import org.jboss.tools.vpe.editor.util.SelectionUtil; import org.jboss.tools.vpe.editor.util.VisualDomUtil; @@ -1341,7 +1343,7 @@ /* * JBIDE-2670 */ - keyEvent.stopPropagation(); + keyEvent.preventDefault(); switcher .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_VISUAL); try { @@ -1352,8 +1354,8 @@ // trying to edit of read-only elements // TODO check editing and if are appear errors then // uncommented next code - // sourceSelectionChanged(true); - // visualSelectionController.setCaretEnabled(true); +// sourceSelectionChanged(true); +// visualSelectionController.setCaretEnabled(true); } finally { switcher.stopActiveEditor(); @@ -1639,6 +1641,9 @@ DOMTreeDumper dumper = new DOMTreeDumper( VpeDebug.VISUAL_DUMP_PRINT_HASH); + List<String> ignoredAttributes = new ArrayList<String>(); + ignoredAttributes.add(HTML.ATTR_TITLE); + dumper.setIgnoredAttributes(ignoredAttributes); dumper.dumpNode(nodeMapping.getVisualNode()); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2008-11-21 16:55:26 UTC (rev 11955) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/NodesManagingUtil.java 2008-11-21 16:58:18 UTC (rev 11956) @@ -104,7 +104,9 @@ */ public static int getEndOffsetNode(Node node) { - if (node instanceof IndexedRegion) { + if (node instanceof IDOMAttr) { + return getStartOffsetNode(node) + getNodeLength(node); + } else if (node instanceof IndexedRegion) { return ((IndexedRegion) node).getEndOffset(); } return 0; 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-11-21 16:55:26 UTC (rev 11955) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/util/DOMTreeDumper.java 2008-11-21 16:58:18 UTC (rev 11956) @@ -14,6 +14,7 @@ import java.io.PrintStream; +import java.util.List; import org.mozilla.interfaces.nsIDOMAttr; import org.mozilla.interfaces.nsIDOMDocument; @@ -51,6 +52,8 @@ "LINK", //$NON-NLS-1$ "META", //$NON-NLS-1$ "PARAM" }; //$NON-NLS-1$ + + private List<String> ignoredAttributes = null; /** * The Constructor. @@ -165,8 +168,12 @@ } ps.print("<" + name); //$NON-NLS-1$ dumpAttributes(node); - ps.print(">"); //$NON-NLS-1$ - + + if (endTagForbidden(name)) { + ps.print("/>"); //$NON-NLS-1$ + } else { + ps.print(">"); //$NON-NLS-1$ + } printHashCode(node); dumpChildren(node); @@ -180,11 +187,15 @@ case nsIDOMNode.ATTRIBUTE_NODE: nsIDOMAttr attr = (nsIDOMAttr) node.queryInterface(nsIDOMAttr.NS_IDOMATTR_IID); - if (attr.getSpecified()) { - ps.print(" " + attr.getName().toUpperCase() + "=\"" + attr.getValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - } else { - ps.print(" " + attr.getName().toUpperCase()); //$NON-NLS-1$ - } + + if (!(ignoredAttributes != null && listContains(ignoredAttributes, + attr.getName()))) + if (attr.getSpecified()) { + ps + .print(" " + attr.getName().toUpperCase() + "=\"" + attr.getValue() + "\""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + } else { + ps.print(" " + attr.getName().toUpperCase()); //$NON-NLS-1$ + } break; case nsIDOMNode.TEXT_NODE: @@ -299,7 +310,17 @@ } return false; } + + private boolean listContains(List<String> list, String string) { + for (String listString : list) { + if (string.equalsIgnoreCase(listString)) + return true; + } + return false; + + } + /** * Prints the hash code. * @@ -310,4 +331,12 @@ ps.print("(" + o.hashCode() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ } } + + public List<String> getIgnoredAttributes() { + return ignoredAttributes; + } + + public void setIgnoredAttributes(List<String> ignoredAttributes) { + this.ignoredAttributes = ignoredAttributes; + } } \ No newline at end of file