[jbosstools-commits] JBoss Tools SVN: r6154 - in branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
Author: dsakovich
Date: 2008-02-07 08:37:02 -0500 (Thu, 07 Feb 2008)
New Revision: 6154
Modified:
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
Log:
Code adjustment
Modified:
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java
===================================================================
---
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-02-07
13:24:53 UTC (rev 6153)
+++
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-02-07
13:37:02 UTC (rev 6154)
@@ -18,6 +18,7 @@
import org.w3c.dom.Node;
import org.jboss.tools.vpe.editor.template.textformating.FormatAttributeData;
+import org.jboss.tools.vpe.editor.util.HTML;
/**
* @author Igels
@@ -103,8 +104,7 @@
if (enabled) {
Node selectedNode = manager.getCurrentSelectedNode();
- String nodeName = selectedNode.getParentNode().getNodeName()
- .toLowerCase();
+ String nodeName = getNodeName(selectedNode).toLowerCase(); //
String text = (String) TAGS.get(nodeName);
if (text == null) {
this.getComboBlockFormat().select(0);
@@ -123,4 +123,20 @@
}
getComboBlockFormat().deselectAll();
}
+
+ /**
+ *
+ * @return node name (skip tags <u>, <b> and <i>)
+ */
+ private String getNodeName(Node node) {
+
+ String nodeName = "";
+ do {
+ nodeName = node.getNodeName();
+ node = node.getParentNode();
+ } while (nodeName.equalsIgnoreCase(HTML.TAG_U)
+ || nodeName.equalsIgnoreCase(HTML.TAG_B)
+ || nodeName.equalsIgnoreCase(HTML.TAG_I));
+ return nodeName;
+ }
}
\ No newline at end of file
Modified:
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java
===================================================================
---
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-02-07
13:24:53 UTC (rev 6153)
+++
branches/jbosstools-2.0.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/HTML.java 2008-02-07
13:37:02 UTC (rev 6154)
@@ -52,7 +52,10 @@
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 TAG_B = "B"; //$NON-NLS-1$
+ public static final String TAG_I = "I"; //$NON-NLS-1$
+ public static final String TAG_U = "U"; //$NON-NLS-1$
+
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$
@@ -69,4 +72,5 @@
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