Author: dsakovich Date: 2008-01-15 14:18:51 -0500 (Tue, 15 Jan 2008) New Revision: 5728 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java Log: http://jira.jboss.com/jira/browse/JBIDE-1359 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-01-15 19:06:54 UTC (rev 5727) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2008-01-15 19:18:51 UTC (rev 5728) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.vpe.editor.toolbar.format; import java.util.HashMap; @@ -24,88 +24,103 @@ */ public class BlockFormatController extends ComboFormatController { - public static String TYPE = "BlockFormat"; - public static HashMap TAGS = new HashMap(); - static { - TAGS.put("address", "Address"); - TAGS.put("h1", "Heading 1"); - TAGS.put("h2", "Heading 2"); - TAGS.put("h3", "Heading 3"); - TAGS.put("h4", "Heading 4"); - TAGS.put("h5", "Heading 5"); - TAGS.put("h6", "Heading 6"); - } - public static HashMap TEXTS = new HashMap(); - static { - TEXTS.put("Address", "address"); - TEXTS.put("Heading 1", "h1"); - TEXTS.put("Heading 2", "h2"); - TEXTS.put("Heading 3", "h3"); - TEXTS.put("Heading 4", "h4"); - TEXTS.put("Heading 5", "h5"); - TEXTS.put("Heading 6", "h6"); - } + public static String TYPE = "BlockFormat"; + public static HashMap TAGS = new HashMap(); + static { + TAGS.put("address", "Address"); + TAGS.put("h1", "Heading 1"); + TAGS.put("h2", "Heading 2"); + TAGS.put("h3", "Heading 3"); + TAGS.put("h4", "Heading 4"); + TAGS.put("h5", "Heading 5"); + TAGS.put("h6", "Heading 6"); + } + public static HashMap TEXTS = new HashMap(); + static { + TEXTS.put("Address", "address"); + TEXTS.put("Heading 1", "h1"); + TEXTS.put("Heading 2", "h2"); + TEXTS.put("Heading 3", "h3"); + TEXTS.put("Heading 4", "h4"); + TEXTS.put("Heading 5", "h5"); + TEXTS.put("Heading 6", "h6"); + } - private String tagName; + private String tagName; - /** - * @param manager - * @param comboBlockFormat - */ - public BlockFormatController(FormatControllerManager manager, Combo comboBlockFormat) { - super(manager, comboBlockFormat); - } + /** + * @param manager + * @param comboBlockFormat + */ + public BlockFormatController(FormatControllerManager manager, + Combo comboBlockFormat) { + super(manager, comboBlockFormat); + } - /* (non-Javadoc) - * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#getType() - */ - public String getType() { - return TYPE; + /* + * (non-Javadoc) + * + * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#getType() + */ + public String getType() { + return TYPE; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) + */ + public void handleEvent(Event event) { + selectionIndex = comboBlockFormat.getSelectionIndex(); + selectionText = comboBlockFormat.getText(); + tagName = (String) TEXTS.get(selectionText); + if (tagName == null) { + tagName = "normal"; } + super.handleEvent(event); + } - /* (non-Javadoc) - * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event) - */ - public void handleEvent(Event event) { - selectionIndex = comboBlockFormat.getSelectionIndex(); - selectionText = comboBlockFormat.getText(); - tagName = (String)TEXTS.get(selectionText); - if(tagName == null) { - tagName = "normal"; - } - super.handleEvent(event); + protected void setStyle(Attr styleAttribute, + FormatAttributeData templateData) { } - protected void setStyle(Attr styleAttribute, FormatAttributeData templateData) { - } + /** + * @return Returns the tagName. + */ + public String getTagName() { + return tagName; + } - /** - * @return Returns the tagName. - */ - public String getTagName() { - return tagName; - } + /* + * (non-Javadoc) + * + * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#setToolbarItemEnabled(boolean + * enabled) + */ + public void setToolbarItemEnabled(boolean enabled) { + comboBlockFormat.setEnabled(enabled); + if (enabled) { - /* (non-Javadoc) - * @see org.jboss.tools.vpe.editor.toolbar.format.IFormatController#setToolbarItemEnabled(boolean enabled) - */ - public void setToolbarItemEnabled(boolean enabled) { - comboBlockFormat.setEnabled(enabled); - if(enabled) { - Node selectedNode = manager.getCurrentSelectedNode(); - String nodeName = selectedNode.getNodeName().toLowerCase(); - String text = (String)TAGS.get(nodeName); - if(text!=null && text.equals(getComboBlockFormat().getText())) { - return; - } - String[] items = this.getComboBlockFormat().getItems(); - for (int i = 0; i < items.length; i++) { - if(items[i].equalsIgnoreCase(text)) { - this.getComboBlockFormat().select(i); - return; - } - } + Node selectedNode = manager.getCurrentSelectedNode(); + String nodeName = selectedNode.getParentNode().getNodeName() + .toLowerCase(); + String text = (String) TAGS.get(nodeName); + if (text == null) { + this.getComboBlockFormat().select(0); + return; + } + if (text != null && text.equals(getComboBlockFormat().getText())) { + return; + } + String[] items = this.getComboBlockFormat().getItems(); + for (int i = 0; i < items.length; i++) { + if (items[i].equalsIgnoreCase(text)) { + this.getComboBlockFormat().select(i); + return; } - getComboBlockFormat().deselectAll(); + } } + getComboBlockFormat().deselectAll(); + } } \ No newline at end of file