Author: sflanigan Date: 2009-07-10 02:52:36 -0400 (Fri, 10 Jul 2009) New Revision: 16522 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.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/VpeSourceDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/EditAttributesAction.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCommentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTextPseudoContentCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagString.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagText.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeTextExpression.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/TemplateResizeData.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/AttributeFormatController.java 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/BoldFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BulletsFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/CenterFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ItalicFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/JustifyFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/NumberingFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/UnderlineFormatController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-3557 Externalize English strings Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -113,11 +113,11 @@ private int visualMode = 0; private EditorPart multiPageEditor; private static final QualifiedName SPLITTER_POSITION_KEY1 = new QualifiedName( - "", "splitter_position1"); + "", "splitter_position1"); //$NON-NLS-1$ //$NON-NLS-2$ private static final QualifiedName SPLITTER_POSITION_KEY2 = new QualifiedName( - "", "splitter_position2"); + "", "splitter_position2"); //$NON-NLS-1$ //$NON-NLS-2$ private static final QualifiedName SPLITTER_POSITION_KEY3 = new QualifiedName( - "", "splitter_position3"); + "", "splitter_position3"); //$NON-NLS-1$ //$NON-NLS-2$ private int controlCount = 0; @@ -1043,10 +1043,10 @@ private class ActivationListener extends ShellAdapter implements IPartListener { - private static final String VPE_EDITOR_CONTEXT = "org.jboss.tools.vpe.editorContext"; - private static final String VPE_VISUAL_MAXMIN = "org.jboss.tools.vpe.visual.maxmin"; - private static final String VPE_SOURCE_MAXMIN = "org.jboss.tools.vpe.source.maxmin"; - private static final String VPE_JUMPING = "org.jboss.tools.vpe.jumping"; + private static final String VPE_EDITOR_CONTEXT = "org.jboss.tools.vpe.editorContext"; //$NON-NLS-1$ + private static final String VPE_VISUAL_MAXMIN = "org.jboss.tools.vpe.visual.maxmin"; //$NON-NLS-1$ + private static final String VPE_SOURCE_MAXMIN = "org.jboss.tools.vpe.source.maxmin"; //$NON-NLS-1$ + private static final String VPE_JUMPING = "org.jboss.tools.vpe.jumping"; //$NON-NLS-1$ private IWorkbenchPart fActivePart; private boolean fIsHandlingActivation = false; 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 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSelectionBuilder.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -103,7 +103,7 @@ visualSelectedNode = visualNode; } if (VpeDebug.PRINT_VISUAL_SELECTION_EVENT) { - System.out.println(" visualNode: " + visualSelectedNode.getNodeName() + "(" + visualSelectedNode + ") sourceNode: " + (sourceNode == null ? null : sourceNode.getNodeName()) + " node: " + node); + System.out.println(" visualNode: " + visualSelectedNode.getNodeName() + "(" + visualSelectedNode + ") sourceNode: " + (sourceNode == null ? null : sourceNode.getNodeName()) + " node: " + node); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } if (sourceNode != null) { switch (visualSelectedNode.getNodeType()) { @@ -664,7 +664,7 @@ } if (VpeDebug.PRINT_SOURCE_SELECTION_EVENT) { 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$ + 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$ //$NON-NLS-5$ //$NON-NLS-6$ } nsIDOMNode visualFocusContainer = null; @@ -705,12 +705,12 @@ if (!focusStartFlag) visualFocusOffset++; } if (VpeDebug.PRINT_SOURCE_SELECTION_EVENT) { - System.out.println(" visualFocusNode: " + + System.out.println(" visualFocusNode: " + //$NON-NLS-1$ (visualFocusNode != null ? - visualFocusNode.getNodeName() + "(" + visualFocusNode + ")" : null) + - " visualFocusContainer: " + + visualFocusNode.getNodeName() + "(" + visualFocusNode + ")" : null) + //$NON-NLS-1$ //$NON-NLS-2$ + " visualFocusContainer: " + //$NON-NLS-1$ (visualFocusContainer != null ? - visualFocusContainer.getNodeName() + "(" + visualFocusContainer + ") visualFocusOffset: " + visualFocusOffset + " focusStartFlag: " + focusStartFlag : null)); + visualFocusContainer.getNodeName() + "(" + visualFocusContainer + ") visualFocusOffset: " + visualFocusOffset + " focusStartFlag: " + focusStartFlag : null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } // Ed tmp Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDomBuilder.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -99,7 +99,7 @@ sourceNode = domMapping.getNearSourceNode(visualNode); if (sourceNode != null) { if (sourceNode.getNodeType() == Node.COMMENT_NODE) { - sourceNode.setNodeValue(""); + sourceNode.setNodeValue(""); //$NON-NLS-1$ } } } @@ -391,7 +391,7 @@ IDOMAttr xmlAttr = (IDOMAttr)sourceAttr; int start = xmlAttr.getValueRegionStartOffset() + offset; String value = xmlAttr.getValueRegionText(); - if (value.startsWith("\"") || value.startsWith("\'")) { + if (value.startsWith("\"") || value.startsWith("\'")) { //$NON-NLS-1$ //$NON-NLS-2$ start++; } int end = xmlAttr.getEndOffset(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -1179,7 +1179,7 @@ nsIDOMAttr toggleLookupAttr = visualElement .getAttributeNode(VPE_USER_TOGGLE_LOOKUP_PARENT); if (toggleLookupAttr != null) { - toggleLookup = "true".equals(toggleLookupAttr.getNodeValue()); + toggleLookup = "true".equals(toggleLookupAttr.getNodeValue()); //$NON-NLS-1$ } nsIDOMElement selectedElem = getLastSelectedElement(); @@ -1221,7 +1221,7 @@ toggleLookupAttr = selectedElem .getAttributeNode(VPE_USER_TOGGLE_LOOKUP_PARENT); if (toggleLookupAttr != null) { - toggleLookup = "true".equals(toggleLookupAttr.getNodeValue()); + toggleLookup = "true".equals(toggleLookupAttr.getNodeValue()); //$NON-NLS-1$ } // end of fix @@ -1346,7 +1346,7 @@ String ext_val) { nsIDOMElement linkNode = null; if ((ATTR_REL_STYLESHEET_VALUE.equalsIgnoreCase(rel_val)) - && href_val.startsWith("file:")) { + && href_val.startsWith("file:")) { //$NON-NLS-1$ /* * Because of the Mozilla caches the linked css files we replace tag * <link rel="styleseet" href="file://..."> with tag <style @@ -1757,22 +1757,22 @@ && parent.getNodeType() == nsIDOMNode.ELEMENT_NODE) { nsIDOMElement element = (nsIDOMElement) parent .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - nsIDOMAttr style = element.getAttributeNode("style"); + nsIDOMAttr style = element.getAttributeNode("style"); //$NON-NLS-1$ if (style != null) { String styleValue = style.getNodeValue(); - String[] items = styleValue.split(";"); + String[] items = styleValue.split(";"); //$NON-NLS-1$ for (int i = 0; i < items.length; i++) { - String[] item = items[i].split(":"); - if ("-moz-user-modify".equals(item[0].trim()) - && "read-only".equals(item[1].trim())) { + String[] item = items[i].split(":"); //$NON-NLS-1$ + if ("-moz-user-modify".equals(item[0].trim()) //$NON-NLS-1$ + && "read-only".equals(item[1].trim())) { //$NON-NLS-1$ return false; } } } - nsIDOMAttr classAttr = element.getAttributeNode("class"); + nsIDOMAttr classAttr = element.getAttributeNode("class"); //$NON-NLS-1$ if (classAttr != null) { String classValue = classAttr.getNodeValue().trim(); - if ("__any__tag__caption".equals(classValue)) { + if ("__any__tag__caption".equals(classValue)) { //$NON-NLS-1$ return false; } } @@ -1845,9 +1845,9 @@ String titleValue = getTooltip(sourceElement); if (titleValue != null) { - titleValue = titleValue.replaceAll("&", "&amp;"); - titleValue = titleValue.replaceAll("<", "&lt;"); - titleValue = titleValue.replaceAll(">", "&gt;"); + titleValue = titleValue.replaceAll("&", "&amp;"); //$NON-NLS-1$ //$NON-NLS-2$ + titleValue = titleValue.replaceAll("<", "&lt;"); //$NON-NLS-1$ //$NON-NLS-2$ + titleValue = titleValue.replaceAll(">", "&gt;"); //$NON-NLS-1$ //$NON-NLS-2$ } if (titleValue != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -97,7 +97,7 @@ handled = nonctrlKeyPressHandler(keyEvent); } if (VpeDebug.PRINT_VISUAL_KEY_EVENT) { - System.out.println(" handled: " + handled); + System.out.println(" handled: " + handled); //$NON-NLS-1$ } if (handled) { keyEvent.stopPropagation(); @@ -263,7 +263,7 @@ Node focusNode = selection.getFocusNode(); if (VpeDebug.PRINT_VISUAL_KEY_EVENT) { - System.out.println(">>> 1. VpeVisualKeyHandler.deleteRight(): focusNode = " + focusNode + " | focusOffset = " + selection.getFocusOffset()); + System.out.println(">>> 1. VpeVisualKeyHandler.deleteRight(): focusNode = " + focusNode + " | focusOffset = " + selection.getFocusOffset()); //$NON-NLS-1$ //$NON-NLS-2$ } if (focusNode != null) { if (focusNode.getNodeType() == Node.TEXT_NODE && @@ -390,7 +390,7 @@ String escString = TextUtil.isEcsToRight(sourceText, offset); if(escString != null){ Point range = sourceEditor.getTextViewer().getSelectedRange(); - sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x, escString.length(), ""); + sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x, escString.length(), ""); //$NON-NLS-1$ atLeastOneCharIsDeleted = true; continue; } @@ -418,7 +418,7 @@ endPos++; } Point range = sourceEditor.getTextViewer().getSelectedRange(); - sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x, endPos, ""); + sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x, endPos, ""); //$NON-NLS-1$ selection = sourceSelectionBuilder.getSelection(); atLeastOneCharIsDeleted = true; break; @@ -532,7 +532,7 @@ Node focusNode = selection.getFocusNode(); if (VpeDebug.PRINT_VISUAL_KEY_EVENT) { - System.out.println(">>> 1. VpeVisualKeyHandler.deleteLeft(): focusNode = " + focusNode + " | focusOffset = " + selection.getFocusOffset()); + System.out.println(">>> 1. VpeVisualKeyHandler.deleteLeft(): focusNode = " + focusNode + " | focusOffset = " + selection.getFocusOffset()); //$NON-NLS-1$ //$NON-NLS-2$ } if (focusNode != null) { if (focusNode.getNodeType() == Node.TEXT_NODE && selection.getFocusOffset() >= 0) { @@ -720,7 +720,7 @@ if(escString != null){ Point range = sourceEditor.getTextViewer().getSelectedRange(); - sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x-escString.length(), escString.length(), ""); + sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x-escString.length(), escString.length(), ""); //$NON-NLS-1$ atLeastOneCharIsDeleted = true; return selection; @@ -739,7 +739,7 @@ endPos--; if(endPos!=0){ Point range = sourceEditor.getTextViewer().getSelectedRange(); - sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x-endPos, endPos, ""); + sourceEditor.getTextViewer().getTextWidget().replaceTextRange(range.x-endPos, endPos, ""); //$NON-NLS-1$ selection = sourceSelectionBuilder.getSelection(); atLeastOneCharIsDeleted = true; } @@ -880,7 +880,7 @@ nsIDOMNode visualNode = domMapping.getVisualNode(node); if (visualNode.getNodeType() == Node.ELEMENT_NODE) { - nsIDOMNode styleAttr = visualNode.getAttributes().getNamedItem("style"); + nsIDOMNode styleAttr = visualNode.getAttributes().getNamedItem("style"); //$NON-NLS-1$ if (styleAttr != null) { String style = styleAttr.getNodeValue(); if (style != null) { @@ -999,7 +999,7 @@ nsIDOMNode visualNode = mapping.getVisualNode(sourceNode); if (visualNode != null) { if (visualNode.getNodeType() == Node.ELEMENT_NODE) { - nsIDOMNode styleAttr = visualNode.getAttributes().getNamedItem("style"); + nsIDOMNode styleAttr = visualNode.getAttributes().getNamedItem("style"); //$NON-NLS-1$ if (styleAttr != null) { String style = styleAttr.getNodeValue(); if (style != null) { @@ -1164,8 +1164,8 @@ } } Text newNode = ((Text)focusNode).splitText(focusOffset); - Node br = focusNode.getParentNode().insertBefore(focusNode.getOwnerDocument().createElement("br"), newNode); - Text newNode1 = (Text)focusNode.getParentNode().insertBefore(focusNode.getOwnerDocument().createTextNode("\r\n" + getLinePrefix(n1Start + focusOffset) + newNode.getData()), newNode); + Node br = focusNode.getParentNode().insertBefore(focusNode.getOwnerDocument().createElement("br"), newNode); //$NON-NLS-1$ + Text newNode1 = (Text)focusNode.getParentNode().insertBefore(focusNode.getOwnerDocument().createTextNode("\r\n" + getLinePrefix(n1Start + focusOffset) + newNode.getData()), newNode); //$NON-NLS-1$ focusNode.getParentNode().removeChild(newNode); newNode = newNode1; setCursor(pageContext, newNode); @@ -1209,7 +1209,7 @@ return linePrefix.substring(0, linePrefixLength); } catch (BadLocationException e) { VpePlugin.getPluginLog().logError(e); - return ""; + return ""; //$NON-NLS-1$ } } @@ -1566,7 +1566,7 @@ private boolean moveEnd(boolean extend) { - VpePlugin.getDefault().logInfo("MoveEnd"); + VpePlugin.getDefault().logInfo("MoveEnd"); //$NON-NLS-1$ // TODO Max Areshkau figure out // frameSelection.intraLineMove(true, extend); return true; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bundle/BundleMap.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -64,7 +64,7 @@ private BundleEntry[] bundles = new BundleEntry[0]; private Map<String,UsedKey> usedKeys = new HashMap<String,UsedKey>(); - boolean isShowBundleUsageAsEL = "yes".equals(VpePreference.SHOW_RESOURCE_BUNDLES.getValue()); + boolean isShowBundleUsageAsEL = "yes".equals(VpePreference.SHOW_RESOURCE_BUNDLES.getValue()); //$NON-NLS-1$ XModelTreeListener modelListener = new ML(); public void init(StructuredTextEditor editor){ @@ -89,7 +89,7 @@ while(it.hasNext()) { String uri = it.next().toString(); String prefix = map.get(uri).toString(); - int hash = (prefix + ":" + uri).hashCode(); + int hash = (prefix + ":" + uri).hashCode(); //$NON-NLS-1$ removeBundle(hash); addBundle(hash, prefix, uri, true); } @@ -153,7 +153,7 @@ XModel model = EclipseResourceUtil.getModelNature(project).getModel(); String prefix2 = prefix; if(propertyName != null && prefix != null) { - prefix2 = prefix + "." + propertyName; + prefix2 = prefix + "." + propertyName; //$NON-NLS-1$ } WebPromptingProvider.getInstance().getList(model, WebPromptingProvider.JSF_BEAN_OPEN, prefix2, null); } @@ -180,7 +180,7 @@ public IFile getBundleFile(String uri){ IEditorInput input = editor.getEditorInput(); IProject project = ((FileEditorInput)input).getFile().getProject(); - String name = uri.replace('.','/')+".properties"; + String name = uri.replace('.','/')+".properties"; //$NON-NLS-1$ if(project == null || !project.isOpen()) return null; try { @@ -189,7 +189,7 @@ IClasspathEntry[] es = javaProject.getResolvedClasspath(true); for (int i = 0; i < es.length; i++) { if(es[i].getEntryKind() != IClasspathEntry.CPE_SOURCE) continue; - IFile file = (IFile)project.getWorkspace().getRoot().getFolder(es[i].getPath()).findMember("/"+name); + IFile file = (IFile)project.getWorkspace().getRoot().getFolder(es[i].getPath()).findMember("/"+name); //$NON-NLS-1$ if(file != null && file.exists()) return file; } } catch (CoreException e) { @@ -395,10 +395,10 @@ if(expr instanceof ELPropertyInvocation) { return new String[]{left.getText(), name}; } else if(expr instanceof ELArgumentInvocation) { - if(name.startsWith("\"") || name.startsWith("'")) { + if(name.startsWith("\"") || name.startsWith("'")) { //$NON-NLS-1$ //$NON-NLS-2$ name = name.substring(1); } - if(name.endsWith("\"") || name.endsWith("'")) { + if(name.endsWith("\"") || name.endsWith("'")) { //$NON-NLS-1$ //$NON-NLS-2$ name = name.substring(0, name.length() - 1); } if(name.length() == 0) return null; @@ -411,7 +411,7 @@ String bundleValue = null; BundleEntry entry = getBundle(prefix); if (entry != null) { - String name = prefix + "." + propertyName; + String name = prefix + "." + propertyName; //$NON-NLS-1$ try { bundleValue = (String) entry.bundle.getObject(propertyName); if (!usedKeys.containsKey(name)) @@ -503,7 +503,7 @@ class ML implements XModelTreeListener { public void nodeChanged(XModelTreeEvent event) { - boolean b = "yes".equals(VpePreference.SHOW_RESOURCE_BUNDLES.getValue()); + boolean b = "yes".equals(VpePreference.SHOW_RESOURCE_BUNDLES.getValue()); //$NON-NLS-1$ if(isShowBundleUsageAsEL != b) { isShowBundleUsageAsEL = b; refresh(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -75,7 +75,7 @@ } public boolean isAbsolutePosition(){ - if("yes".equals(VpePreference.USE_ABSOLUTE_POSITION.getValue()))return true; + if("yes".equals(VpePreference.USE_ABSOLUTE_POSITION.getValue()))return true; //$NON-NLS-1$ else return false; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mapping/VpeDomMapping.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -311,7 +311,7 @@ //for debug public void printMapping() { - System.out.println("Source DOM Mapping ------------------------------------"); + System.out.println("Source DOM Mapping ------------------------------------"); //$NON-NLS-1$ Set entrySet = sourceMap.entrySet(); Iterator iter = entrySet.iterator(); while (iter.hasNext()) { @@ -319,9 +319,9 @@ VpeNodeMapping nodeMapping = (VpeNodeMapping)entry.getValue(); Node sourceNode = nodeMapping.getSourceNode(); nsIDOMNode visualNode = nodeMapping.getVisualNode(); - System.out.println("sourceNode: " + sourceNode.getNodeName() + " (" + sourceNode.hashCode() + ") visualNode: " + (visualNode != null ? visualNode.getNodeName() + " (" + visualNode.hashCode() + ")" : null)); + System.out.println("sourceNode: " + sourceNode.getNodeName() + " (" + sourceNode.hashCode() + ") visualNode: " + (visualNode != null ? visualNode.getNodeName() + " (" + visualNode.hashCode() + ")" : null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ } - System.out.println("Visual DOM Mapping ------------------------------------"); + System.out.println("Visual DOM Mapping ------------------------------------"); //$NON-NLS-1$ entrySet = visualMap.entrySet(); iter = entrySet.iterator(); while (iter.hasNext()) { @@ -329,7 +329,7 @@ VpeNodeMapping nodeMapping = (VpeNodeMapping)entry.getValue(); Node sourceNode = nodeMapping.getSourceNode(); nsIDOMNode visualNode = nodeMapping.getVisualNode(); - System.out.println("sourceNode: " + (sourceNode != null ? sourceNode.getNodeName() + " (" + sourceNode.hashCode() + ")" : null) + " visualNode: " + visualNode.getNodeName() + " (" + visualNode.hashCode() + ")"); + System.out.println("sourceNode: " + (sourceNode != null ? sourceNode.getNodeName() + " (" + sourceNode.hashCode() + ")" : null) + " visualNode: " + visualNode.getNodeName() + " (" + visualNode.hashCode() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/AbstractActionManager.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -458,7 +458,7 @@ List list = builder.getResult(); if (list.size() > 0 - && ((Node) list.get(0)).getNodeName().equals("HTML")) { + && ((Node) list.get(0)).getNodeName().equals("HTML")) { //$NON-NLS-1$ Node node = (Node) list.get(0); Node child = node.getFirstChild(); while (child != null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/BaseActionManager.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -32,6 +32,7 @@ import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl; import org.eclipse.wst.xml.ui.internal.actions.MenuBuilder; import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources; +import org.jboss.tools.vpe.messages.VpeUIMessages; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -49,14 +50,12 @@ protected static ITextNodeSplitter textNodeSplitter; - public static final String INSERT_AROUND_MENU = "Insert Around"; - public static final String INSERT_BEFORE_MENU = "Insert Before"; - public static final String INSERT_AFTER_MENU = "Insert After"; - public static final String REPLACE_TAG_MENU = "Replace With"; - public static final String INSERT_TAG_MENU = "Insert Tag"; - + public static final String INSERT_AROUND_MENU = VpeUIMessages.BaseActionManager_InsertAround; + public static final String INSERT_BEFORE_MENU = VpeUIMessages.BaseActionManager_InsertBefore; + public static final String INSERT_AFTER_MENU = VpeUIMessages.BaseActionManager_InsertAfter; + public static final String REPLACE_TAG_MENU = VpeUIMessages.BaseActionManager_ReplaceWith; + public static final String INSERT_TAG_MENU = VpeUIMessages.BaseActionManager_InsertTag; - static public void setTextNodeSplitter(ITextNodeSplitter splitter) { textNodeSplitter = splitter; } @@ -336,9 +335,9 @@ Element parentElement, CMElementDeclaration parentEd, int index) { if (isUnconstrainedActionAllowed()) { if (parentEd == null - || parentEd.getProperty("isInferred") == Boolean.TRUE + || parentEd.getProperty("isInferred") == Boolean.TRUE //$NON-NLS-1$ || ( modelQuery.getEditMode() != ModelQuery.EDIT_MODE_CONSTRAINED_STRICT - && isElementAllowed(parentEd) )) { //$NON-NLS-1$ + && isElementAllowed(parentEd) )) { contributeAction(menu, createAddElementAction(parentElement, null, index, 2)); } @@ -380,8 +379,8 @@ Element parentElement, CMElementDeclaration parentEd) { if (isUnconstrainedActionAllowed()) { if (parentEd == null - || parentEd.getProperty("isInferred") == Boolean.TRUE - || modelQuery.getEditMode() != ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) { //$NON-NLS-1$ + || parentEd.getProperty("isInferred") == Boolean.TRUE //$NON-NLS-1$ + || modelQuery.getEditMode() != ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) { contributeAction(menu, createAddAttributeAction(parentElement, null)); } @@ -542,14 +541,14 @@ static HashSet noContainerTags = new HashSet(); static { - noContainerTags.add("basefont"); - noContainerTags.add("bgsound"); - noContainerTags.add("br"); - noContainerTags.add("img"); - noContainerTags.add("input"); - noContainerTags.add("isindex"); - noContainerTags.add("script"); - noContainerTags.add("wbr"); + noContainerTags.add("basefont"); //$NON-NLS-1$ + noContainerTags.add("bgsound"); //$NON-NLS-1$ + noContainerTags.add("br"); //$NON-NLS-1$ + noContainerTags.add("img"); //$NON-NLS-1$ + noContainerTags.add("input"); //$NON-NLS-1$ + noContainerTags.add("isindex"); //$NON-NLS-1$ + noContainerTags.add("script"); //$NON-NLS-1$ + noContainerTags.add("wbr"); //$NON-NLS-1$ } public static class ActionHelper extends ModelQueryActionHelper { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/MenuCreationHelper.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -69,11 +69,11 @@ */ public class MenuCreationHelper { - public static final String CUT_ACTION = "Cut"; + public static final String CUT_ACTION = VpeUIMessages.MenuCreationHelper_Cut; public static final String COPY_ACTION = JFaceResources.getString("copy"); //$NON-NLS-1$ - public static final String PASTE_ACTION = "Paste"; + public static final String PASTE_ACTION = VpeUIMessages.MenuCreationHelper_Paste; public static final String DELETE_ACTION = JFaceResources.getString("Delete"); //$NON-NLS-1$ - public static final String TEST_ACTION = "Test"; + public static final String TEST_ACTION = VpeUIMessages.MenuCreationHelper_Test; private VpeDomMapping domMapping = null; private VpePageContext pageContext = null; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/EditAttributesAction.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/EditAttributesAction.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/action/EditAttributesAction.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -48,7 +48,7 @@ private void init() { final String name = MessageFormat.format( VpeUIMessages.ATTRIBUTES_MENU_ITEM, - node != null ? node.getNodeName() : ""); + node != null ? node.getNodeName() : ""); //$NON-NLS-1$ setText(name); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/menu/xpl/ActionHelper.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -36,7 +36,7 @@ import org.w3c.dom.NodeList; public class ActionHelper { - public static final String copyright = "(c) Copyright IBM Corporation 2002."; + public static final String copyright = "(c) Copyright IBM Corporation 2002."; //$NON-NLS-1$ protected ModelQueryImpl modelQuery; protected static class Action implements ModelQueryAction { @@ -283,9 +283,9 @@ .getOrigin(childElement); CMNodeList cmNodeList = childOrigin != null ? (CMNodeList) childOrigin - .getProperty("SubstitutionGroup") + .getProperty("SubstitutionGroup") //$NON-NLS-1$ : (CMNodeList) childEd - .getProperty("SubstitutionGroup"); + .getProperty("SubstitutionGroup"); //$NON-NLS-1$ if (cmNodeList != null && cmNodeList.getLength() > 1) { int replaceIndex = getIndex(parent, childElement); @@ -294,7 +294,7 @@ CMNode substitution = cmNodeList.item(i); if (!substitution.getNodeName().equals(childEdName) && !Boolean.TRUE.equals(substitution - .getProperty("Abstract"))) { + .getProperty("Abstract"))) { //$NON-NLS-1$ Action action = new Action(Action.REPLACE, parent, cmNodeList.item(i), replaceIndex, replaceIndex); @@ -429,7 +429,7 @@ String cmNodeName = matchModelNode.cmNode != null ? matchModelNode.cmNode .getNodeName() - : "null"; + : "null"; //$NON-NLS-1$ indent += 2; for (Iterator iterator = matchModelNode.children.iterator(); iterator Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomBuilder.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mozilla/MozillaDomBuilder.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -40,7 +40,7 @@ int len = nodes.getLength(); for (int i = 0; i < len; i++) { Node node = nodes.item(i); - if (node.getNodeType() == Node.ELEMENT_NODE && "BODY".equalsIgnoreCase(node.getNodeName())) { + if (node.getNodeType() == Node.ELEMENT_NODE && "BODY".equalsIgnoreCase(node.getNodeName())) { //$NON-NLS-1$ return (Element)node; } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/ELVariablesPreferencePage.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -33,7 +33,7 @@ */ public class ELVariablesPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - public static final String ID = "org.jboss.tools.common.xstudio.elvariables"; + public static final String ID = "org.jboss.tools.common.xstudio.elvariables"; //$NON-NLS-1$ /** The el. */ private GlobalElVariablesComposite el = new GlobalElVariablesComposite(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpeEditorPreferencesPage.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -25,7 +25,7 @@ public class VpeEditorPreferencesPage extends TabbedPreferencesPage implements IWorkbenchPreferencePage { - public static final String ID = "org.jboss.tools.vpe.editor"; + public static final String ID = "org.jboss.tools.vpe.editor"; //$NON-NLS-1$ public VpeEditorPreferencesPage() { addPreferencePage(new GeneralPage()); addPreferencePage(new TemplatesPreferencePage()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/InvisibleTemplate.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -38,7 +38,7 @@ nsIDOMElement div = visualDocument.createElement(HTML.TAG_SPAN); div.setAttribute(HTML.TAG_STYLE, - "border: solid 1px #0037FF;color:#0037FF;font-size:12px;"); + "border: solid 1px #0037FF;color:#0037FF;font-size:12px;"); //$NON-NLS-1$ nsIDOMText text = visualDocument.createTextNode(sourceNode .getNodeName()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -229,16 +229,16 @@ */ public void init(Element templateElement, boolean caseSensitive) { this.caseSensitive = caseSensitive; - children = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CHILDREN)); //$NON-NLS-1$ - modify = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_MODIFY)); //$NON-NLS-1$ - invisible = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_INVISIBLE)); //$NON-NLS-1$ + children = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_CHILDREN)); + modify = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_MODIFY)); + invisible = Constants.YES_STRING.equals(templateElement.getAttribute(VpeTemplateManager.ATTR_TEMPLATE_INVISIBLE)); String strHasImaginaryBorder = templateElement .getAttribute(VpeTemplateManager.ATTR_TEMPLATE_HAS_IMAGINARY_BORDER); if (strHasImaginaryBorder != null && strHasImaginaryBorder.length() != 0) { - hasImaginaryBorder = Constants.YES_STRING.equalsIgnoreCase(strHasImaginaryBorder); //$NON-NLS-1$ + hasImaginaryBorder = Constants.YES_STRING.equalsIgnoreCase(strHasImaginaryBorder); } else { hasImaginaryBorder = false; } @@ -721,16 +721,16 @@ Node p1 = null, p2 = null; Node parentParent = parent.getParentNode(); if (parentParent != null) { - if (!parentParent.getNodeName().equalsIgnoreCase("p")) { + if (!parentParent.getNodeName().equalsIgnoreCase("p")) { //$NON-NLS-1$ if (parentParent.getNodeType() != Node.DOCUMENT_NODE) { p1 = parentParent.getOwnerDocument() - .createElement("p"); + .createElement("p"); //$NON-NLS-1$ parentParent.insertBefore(p1, parent); parent = parentParent.removeChild(parent); p1.appendChild(parent); } else { p1 = ((Document) parentParent) - .createElement("p"); + .createElement("p"); //$NON-NLS-1$ parentParent.insertBefore(p1, parent); parent = parentParent.removeChild(parent); p1.appendChild(parent); @@ -1260,7 +1260,7 @@ } } catch (VpeExpressionException ex) { - VpeExpressionException exception = new VpeExpressionException(sourceContainer+" ",ex); + VpeExpressionException exception = new VpeExpressionException(sourceContainer+" ",ex); //$NON-NLS-1$ VpePlugin.reportProblem(exception); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -149,10 +149,10 @@ } } } - Attr attr = element.getAttributeNode("title"); + Attr attr = element.getAttributeNode("title"); //$NON-NLS-1$ if (attr == null) { if (propertyCreators == null) propertyCreators = new ArrayList(); - propertyCreators.add(new VpeAttributeCreator("title", "{tagstring()}", dependencyMap, true)); + propertyCreators.add(new VpeAttributeCreator("title", "{tagstring()}", dependencyMap, true)); //$NON-NLS-1$ //$NON-NLS-2$ } } @Override Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCommentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCommentCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCommentCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -25,21 +25,21 @@ import org.w3c.dom.Node; public class VpeCommentCreator extends VpeAbstractCreator implements VpeOutputComment { - public static final String SIGNATURE_VPE_COMMENT = ":vpe:comment"; - private static final String COMMENT_STYLE = "font-style:italic; color:green"; - private static final String COMMENT_PREFIX = ""; - private static final String COMMENT_SUFFIX = ""; + public static final String SIGNATURE_VPE_COMMENT = ":vpe:comment"; //$NON-NLS-1$ + private static final String COMMENT_STYLE = "font-style:italic; color:green"; //$NON-NLS-1$ + private static final String COMMENT_PREFIX = ""; //$NON-NLS-1$ + private static final String COMMENT_SUFFIX = ""; //$NON-NLS-1$ VpeCommentCreator(Element element, VpeDependencyMap dependencyMap, boolean caseSensitive) { dependencyMap.setCreator(this, SIGNATURE_VPE_COMMENT); } public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { - if(!"yes".equals(VpePreference.SHOW_COMMENTS.getValue())) { + if(!"yes".equals(VpePreference.SHOW_COMMENTS.getValue())) { //$NON-NLS-1$ return null; } nsIDOMElement div = visualDocument.createElement(HTML.TAG_DIV); - div.setAttribute("style", COMMENT_STYLE); + div.setAttribute("style", COMMENT_STYLE); //$NON-NLS-1$ String value = COMMENT_PREFIX + sourceNode.getNodeValue() + COMMENT_SUFFIX; nsIDOMText text = visualDocument.createTextNode(value); div.appendChild(text); @@ -48,7 +48,7 @@ } public void setOutputCommentValue(VpePageContext pageContext, Comment sourceComment, Map visualNodeMap) { - String commentValue = ""; + String commentValue = ""; //$NON-NLS-1$ nsIDOMElement div = (nsIDOMElement)visualNodeMap.get(this); if (div != null) { nsIDOMNodeList children = div.getChildNodes(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCopyCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -30,7 +30,7 @@ public class VpeCopyCreator extends VpeAbstractCreator { - private static String STYLE_ATTR_NAME = "style"; + private static String STYLE_ATTR_NAME = "style"; //$NON-NLS-1$ private boolean caseSensitive; private HashSet attrSet; @@ -49,7 +49,7 @@ if (attrsAttr != null) { attrSet = new HashSet(); String attrsValue = attrsAttr.getValue(); - String[] attrsArr = attrsValue.split(","); + String[] attrsArr = attrsValue.split(","); //$NON-NLS-1$ for (int i = 0; i < attrsArr.length; i++) { String attr = attrsArr[i].trim(); if (attr.length() > 0) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeCreatorUtil.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -37,14 +37,14 @@ public static boolean isFacet(Node node) { if (node != null && node.getNodeType() == Node.ELEMENT_NODE) { - return "facet".equals(node.getLocalName()); + return "facet".equals(node.getLocalName()); //$NON-NLS-1$ } return false; } public static String getFacetName(Node node) { if (node != null && node.getNodeType() == Node.ELEMENT_NODE) { - return ((Element)node).getAttribute("name"); + return ((Element)node).getAttribute("name"); //$NON-NLS-1$ } return null; } @@ -52,15 +52,15 @@ public static int getFacetType(Node node) { String value = getFacetName(node); if (value != null) { - if ("header".equals(value)) { + if ("header".equals(value)) { //$NON-NLS-1$ return FACET_TYPE_HEADER; - } else if ("footer".equals(value)) { + } else if ("footer".equals(value)) { //$NON-NLS-1$ return FACET_TYPE_FOOTER; - } else if ("body".equals(value)) { + } else if ("body".equals(value)) { //$NON-NLS-1$ return FACET_TYPE_BODY; - } else if ("navigation".equals(value)) { + } else if ("navigation".equals(value)) { //$NON-NLS-1$ return FACET_TYPE_NAVIGATION; - } else if ("caption".equals(value)) { + } else if ("caption".equals(value)) { //$NON-NLS-1$ return FACET_TYPE_CAPTION; } } @@ -69,7 +69,7 @@ public static boolean isInclude(Node node) { if (node != null && node.getNodeType() == Node.ELEMENT_NODE) { - return node.getNodeName().indexOf("jsp:include") >=0 || node.getNodeName().indexOf("jsp:directive.include")>=0; + return node.getNodeName().indexOf("jsp:include") >=0 || node.getNodeName().indexOf("jsp:directive.include")>=0; //$NON-NLS-1$ //$NON-NLS-2$ } return false; } @@ -91,9 +91,9 @@ public static Document getIncludeDocument(Node includeNode, VpePageContext pageContext) { if (isInclude(includeNode)) { - String pageName = ((Element)includeNode).getAttribute("page"); + String pageName = ((Element)includeNode).getAttribute("page"); //$NON-NLS-1$ if (pageName == null) { - pageName = ((Element)includeNode).getAttribute("file"); + pageName = ((Element)includeNode).getAttribute("file"); //$NON-NLS-1$ } if (pageName != null) { IDOMModel wtpModel = getWtpModelForRead(pageName, pageContext); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableColumnCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -62,7 +62,7 @@ } creatorInfo.addChildrenInfo(info); - String styleClass = ""; + String styleClass = ""; //$NON-NLS-1$ String tableHeaderClass = getNodeAttrValue(sourceNode.getParentNode(), VpeTemplateManager.ATTR_DATATABLE_HEADER_CLASS); String columnHeaderClass = getNodeAttrValue(sourceNode, VpeTemplateManager.ATTR_DATATABLE_HEADER_CLASS); if (null != columnHeaderClass) { @@ -80,7 +80,7 @@ } creatorInfo.addChildrenInfo(info); - styleClass = ""; + styleClass = ""; //$NON-NLS-1$ String tableFooterClass = getNodeAttrValue(sourceNode.getParentNode(), VpeTemplateManager.ATTR_DATATABLE_FOOTER_CLASS); String columnFooterClass = getNodeAttrValue(sourceNode, VpeTemplateManager.ATTR_DATATABLE_FOOTER_CLASS); if (null != columnFooterClass) { @@ -100,9 +100,9 @@ for (int i = 0; i < cnt; i++) { Node node = list.item(i); if (node.getNodeType() == Node.ELEMENT_NODE) { - boolean isFacet = namesIsEquals("facet", node.getNodeName()); - Node attrName = node.getAttributes().getNamedItem("name"); - if (!isFacet || (attrName != null && !"header".equals(attrName.getNodeValue()) && !"footer".equals(attrName.getNodeValue()))) { + boolean isFacet = namesIsEquals("facet", node.getNodeName()); //$NON-NLS-1$ + Node attrName = node.getAttributes().getNamedItem("name"); //$NON-NLS-1$ + if (!isFacet || (attrName != null && !"header".equals(attrName.getNodeValue()) && !"footer".equals(attrName.getNodeValue()))) { //$NON-NLS-1$ //$NON-NLS-2$ info.addSourceChild(node); useTextNodeAsBody = false; } @@ -133,7 +133,7 @@ int index = 0; Node prevNode = sourceNode.getPreviousSibling(); while (prevNode != null) { - if((sourceNode.getNodeName().indexOf("column") >= 0 || sourceNode.getNodeName().indexOf("treeColumn") >= 0) && (prevNode.getNodeName().indexOf("column") >= 0 || prevNode.getNodeName().indexOf("treeColumn") >= 0)){ + if((sourceNode.getNodeName().indexOf("column") >= 0 || sourceNode.getNodeName().indexOf("treeColumn") >= 0) && (prevNode.getNodeName().indexOf("column") >= 0 || prevNode.getNodeName().indexOf("treeColumn") >= 0)){ //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ index++; }else if (prevNode.getNodeName().equals(sourceNode.getNodeName())) { index++; @@ -179,7 +179,7 @@ } private static boolean namesIsEquals(String name1, String name2) { - int ind = name2.indexOf(":"); + int ind = name2.indexOf(":"); //$NON-NLS-1$ return ind < name2.length() && name1.equals(name2.substring(ind >= 0 ? ind + 1 : 0)); } @@ -197,7 +197,7 @@ if ((null != classes) && (classes.length > 0)) { int classesCount = classes.length; int columnCount = index + 1; - String className = ""; + String className = ""; //$NON-NLS-1$ // Finds correct css style class index // for the column @@ -209,7 +209,7 @@ className = classes[classesIndex]; } if (className.trim().length() > 0) { - cell.setAttribute("class", className); + cell.setAttribute("class", className); //$NON-NLS-1$ } } @@ -225,7 +225,7 @@ */ private String[] splitClasses(String value) { if (value != null) { - return value.split(","); + return value.split(","); //$NON-NLS-1$ } return null; } @@ -239,7 +239,7 @@ private void setCellClass(nsIDOMElement cell, String className) { if (cell != null) { if (className != null && className.trim().length() > 0) { - cell.setAttribute("class", className); + cell.setAttribute("class", className); //$NON-NLS-1$ } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDataTableElements.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -55,14 +55,14 @@ } if (node.getNodeType() == Node.ELEMENT_NODE) { - boolean isColumn = node.getNodeName().indexOf(":column") > 0 || node.getNodeName().indexOf(":treeColumn") > 0; - boolean isFacet = !isColumn && node.getNodeName().indexOf(":facet") > 0; - Node attrName = node.getAttributes().getNamedItem("name"); - if (!isColumn && isFacet && attrName != null && "header".equals(attrName.getNodeValue())) { + boolean isColumn = node.getNodeName().indexOf(":column") > 0 || node.getNodeName().indexOf(":treeColumn") > 0; //$NON-NLS-1$ //$NON-NLS-2$ + boolean isFacet = !isColumn && node.getNodeName().indexOf(":facet") > 0; //$NON-NLS-1$ + Node attrName = node.getAttributes().getNamedItem("name"); //$NON-NLS-1$ + if (!isColumn && isFacet && attrName != null && "header".equals(attrName.getNodeValue())) { //$NON-NLS-1$ tableHeader = node; - } else if (!isColumn && isFacet && attrName != null && "footer".equals(attrName.getNodeValue())) { + } else if (!isColumn && isFacet && attrName != null && "footer".equals(attrName.getNodeValue())) { //$NON-NLS-1$ tableFooter = node; - } else if (!isColumn && isFacet && attrName != null && "caption".equals(attrName.getNodeValue())) { + } else if (!isColumn && isFacet && attrName != null && "caption".equals(attrName.getNodeValue())) { //$NON-NLS-1$ tableCaption = node; } else if (isColumn) { if (columns == null) columns = new ArrayList<SourceColumnElements>(); @@ -188,11 +188,11 @@ for (int i = 0; i < cnt; i++) { Node node = list.item(i); if (node.getNodeType() == Node.ELEMENT_NODE) { - boolean isFacet = node.getNodeName().indexOf(":facet") > 0; - Node attrName = node.getAttributes().getNamedItem("name"); - if (isFacet && attrName != null && "header".equals(attrName.getNodeValue())) { + boolean isFacet = node.getNodeName().indexOf(":facet") > 0; //$NON-NLS-1$ + Node attrName = node.getAttributes().getNamedItem("name"); //$NON-NLS-1$ + if (isFacet && attrName != null && "header".equals(attrName.getNodeValue())) { //$NON-NLS-1$ header = node; - } else if (isFacet && attrName != null && "footer".equals(attrName.getNodeValue())) { + } else if (isFacet && attrName != null && "footer".equals(attrName.getNodeValue())) { //$NON-NLS-1$ footer = node; } else { getBody().add(node); @@ -461,12 +461,12 @@ VpeDataTableElements.getNamedChild(visualParent, HTML.TAG_TFOOT) ); - visualDataTableElements.setCaption(VpeDataTableElements.getNamedChild(visualDataTableElements.getCaption(), "caption")); - visualDataTableElements.setTableHeaderRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getTableHeader(), "tr")); - visualDataTableElements.setColumnsHeaderRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getColumnsHeader(), "tr")); - visualDataTableElements.setBodyRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getBody(), "tr")); - visualDataTableElements.setColumnsFooterRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getColumnsFooter(), "tr")); - visualDataTableElements.setTableFooterRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getTableFooter(), "tr")); + visualDataTableElements.setCaption(VpeDataTableElements.getNamedChild(visualDataTableElements.getCaption(), "caption")); //$NON-NLS-1$ + visualDataTableElements.setTableHeaderRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getTableHeader(), "tr")); //$NON-NLS-1$ + visualDataTableElements.setColumnsHeaderRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getColumnsHeader(), "tr")); //$NON-NLS-1$ + visualDataTableElements.setBodyRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getBody(), "tr")); //$NON-NLS-1$ + visualDataTableElements.setColumnsFooterRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getColumnsFooter(), "tr")); //$NON-NLS-1$ + visualDataTableElements.setTableFooterRow(VpeDataTableElements.getNamedChild(visualDataTableElements.getTableFooter(), "tr")); //$NON-NLS-1$ return visualDataTableElements; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeDefineContainerTemplate.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -101,7 +101,7 @@ } StringBuilder sb = new StringBuilder(); - String word = "((\\w+)([\\.\\[\\]]*))"; + String word = "((\\w+)([\\.\\[\\]]*))"; //$NON-NLS-1$ Matcher m; String variable; String signs; @@ -134,7 +134,7 @@ sb.append(origStr.substring(endIndex, origStr.length())); } - if (!"".equals(sb.toString())) { + if (!"".equals(sb.toString())) { //$NON-NLS-1$ return sb.toString(); } return origStr; @@ -144,18 +144,18 @@ Set<String> keys = paramsMap.keySet(); if (null != node) { String nodeValue = node.getNodeValue(); - String curlyBracketResultPattern = "(" + Pattern.quote("#") - + "\\{(.+?)\\})+?"; + String curlyBracketResultPattern = "(" + Pattern.quote("#") //$NON-NLS-1$ //$NON-NLS-2$ + + "\\{(.+?)\\})+?"; //$NON-NLS-1$ int matcherGroupWithVariable = 2; - if ((null != nodeValue) && (!"".equals(nodeValue))) { + if ((null != nodeValue) && (!"".equals(nodeValue))) { //$NON-NLS-1$ for (String key : keys) { Matcher curlyBracketMatcher = Pattern.compile( curlyBracketResultPattern).matcher(nodeValue); String replacement = paramsMap.get(key); - if (replacement.startsWith("#{") - && replacement.endsWith("}")) { + if (replacement.startsWith("#{") //$NON-NLS-1$ + && replacement.endsWith("}")) { //$NON-NLS-1$ // remove first 2 signs '#{' replacement = replacement.substring(2); // remove last '}' sign @@ -231,7 +231,7 @@ for (int i = 0; i < len; i++) { Node sourceChild = sourceChildren.item(i); if (sourceChild.getNodeType() == Node.ELEMENT_NODE - && "param".equals(sourceChild.getLocalName())) { + && "param".equals(sourceChild.getLocalName())) { //$NON-NLS-1$ String name = ((Element) sourceChild) .getAttribute(HTML.ATTR_NAME); String value = ((Element) sourceChild) @@ -275,7 +275,7 @@ for (int i = 0; i < len; i++) { Node sourceChild = sourceChildren.item(i); if (sourceChild.getNodeType() == Node.ELEMENT_NODE - && "define".equals(sourceChild.getLocalName())) { + && "define".equals(sourceChild.getLocalName())) { //$NON-NLS-1$ if (template == null) { VpeTemplateManager templateManager = pageContext .getVisualBuilder().getTemplateManager(); @@ -333,12 +333,12 @@ Node sourceElement, nsIDOMDocument visualDocument) { nsIDOMElement container = visualDocument.createElement(HTML.TAG_DIV); - container.setAttribute("style", "border: 1px dashed #2A7F00"); + container.setAttribute("style", "border: 1px dashed #2A7F00"); //$NON-NLS-1$ //$NON-NLS-2$ VpeVisualDomBuilder.markIncludeElement(container); nsIDOMElement title = visualDocument.createElement(HTML.TAG_DIV); nsIDOMElement tag = visualDocument.createElement(HTML.TAG_SPAN); - tag.setAttribute("class", "__any__tag__caption"); + tag.setAttribute("class", "__any__tag__caption"); //$NON-NLS-1$ //$NON-NLS-2$ tag.appendChild(visualDocument.createTextNode(sourceElement.getNodeName())); title.appendChild(tag); if (fileName != null) { @@ -354,7 +354,7 @@ for (int i = 0; i < len; i++) { Node sourceChild = sourceChildren.item(i); if (sourceChild.getNodeType() == Node.ELEMENT_NODE - && "define".equals(sourceChild.getLocalName())) { + && "define".equals(sourceChild.getLocalName())) { //$NON-NLS-1$ childrenInfo.addSourceChild(sourceChild); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeFacetCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -34,11 +34,11 @@ boolean isHeader = false; boolean isFooter = false; - Node nameAttr = sourceNode.getAttributes().getNamedItem("name"); + Node nameAttr = sourceNode.getAttributes().getNamedItem("name"); //$NON-NLS-1$ if (nameAttr != null) { String name = nameAttr.getNodeValue(); - isHeader = name.equals("header"); - isFooter = name.equals("footer"); + isHeader = name.equals("header"); //$NON-NLS-1$ + isFooter = name.equals("footer"); //$NON-NLS-1$ } if (isHeader || isFooter) { @@ -54,9 +54,9 @@ } if (cell != null) { if (isHeader) { - setCellClass(cell, getTableAttrValue(sourceParent, "headerClass")); + setCellClass(cell, getTableAttrValue(sourceParent, "headerClass")); //$NON-NLS-1$ } else if (isFooter) { - setCellClass(cell, getTableAttrValue(sourceParent, "footerClass")); + setCellClass(cell, getTableAttrValue(sourceParent, "footerClass")); //$NON-NLS-1$ } creatorInfo = new VpeCreatorInfo(cell); } @@ -84,7 +84,7 @@ private void setCellClass(nsIDOMElement cell, String className) { if (cell != null) { if (className != null && className.trim().length() > 0) { - cell.setAttribute("class", className); + cell.setAttribute("class", className); //$NON-NLS-1$ } } } @@ -105,7 +105,7 @@ int length = childs != null ? childs.getLength() : 0; for (int i = 0; i < length; i++) { Node child = childs.item(i); - if (child.getNodeType() == Node.ELEMENT_NODE && child.getNodeName().indexOf(":column") > 0) { + if (child.getNodeType() == Node.ELEMENT_NODE && child.getNodeName().indexOf(":column") > 0) { //$NON-NLS-1$ count++; } } @@ -115,7 +115,7 @@ private nsIDOMElement makeCell(int columnCount, String cellTag, nsIDOMDocument visualDocument) { nsIDOMElement visualCell = visualDocument.createElement(cellTag); if (columnCount > 1) { - visualCell.setAttribute("colspan", "" + columnCount); + visualCell.setAttribute("colspan", "" + columnCount); //$NON-NLS-1$ //$NON-NLS-2$ } return visualCell; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeGridCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -33,7 +33,7 @@ import org.w3c.dom.NodeList; public class VpeGridCreator extends VpeAbstractCreator { - static final String VAL_PAGE_DIRECTION = "pageDirection"; + static final String VAL_PAGE_DIRECTION = "pageDirection"; //$NON-NLS-1$ private boolean caseSensitive; private VpeExpression layoutExpr; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeHtmlTemplate.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -61,11 +61,11 @@ public static final int PANEL_LAYOUT = 17; public static final int TYPE_A = 18; - static final String ATTR_STYLE = "style"; - public static final String ATTR_STYLE_MODIFY_NAME = "-moz-user-modify"; - public static final String ATTR_STYLE_MODIFY_READ_WRITE_VALUE = "read-write"; - public static final String ATTR_STYLE_MODIFY_READ_ONLY_VALUE = "read-only"; - static final String ATTR_CURSOR_POINTER = "cursor:pointer;"; + static final String ATTR_STYLE = "style"; //$NON-NLS-1$ + public static final String ATTR_STYLE_MODIFY_NAME = "-moz-user-modify"; //$NON-NLS-1$ + public static final String ATTR_STYLE_MODIFY_READ_WRITE_VALUE = "read-write"; //$NON-NLS-1$ + public static final String ATTR_STYLE_MODIFY_READ_ONLY_VALUE = "read-only"; //$NON-NLS-1$ + static final String ATTR_CURSOR_POINTER = "cursor:pointer;"; //$NON-NLS-1$ private int type = TYPE_NONE; private VpeCreator creator = null; @@ -330,9 +330,9 @@ } } - private static final String VIEW_TAGNAME = "view"; - private static final String LOCALE_ATTRNAME = "locale"; - private static final String PREFIX_SEPARATOR = ":"; + private static final String VIEW_TAGNAME = "view"; //$NON-NLS-1$ + private static final String LOCALE_ATTRNAME = "locale"; //$NON-NLS-1$ + private static final String PREFIX_SEPARATOR = ":"; //$NON-NLS-1$ private String getPageLocale(VpePageContext pageContext, IDOMElement sourceElement) { @@ -341,7 +341,7 @@ TaglibData fTD = null; for (int i = 0; i < taglibs.size(); i++) { TaglibData td = (TaglibData)taglibs.get(i); - if ("http://java.sun.com/jsf/core".equals(td.getUri())) fTD = td; + if ("http://java.sun.com/jsf/core".equals(td.getUri())) fTD = td; //$NON-NLS-1$ } if (fTD == null || fTD.getPrefix() == null || fTD.getPrefix().length() == 0) return null; @@ -435,22 +435,22 @@ } static void makeModify(nsIDOMElement visualElement, boolean modify) { - String s = ATTR_STYLE_MODIFY_NAME + ":" + + String s = ATTR_STYLE_MODIFY_NAME + ":" + //$NON-NLS-1$ (modify ? ATTR_STYLE_MODIFY_READ_WRITE_VALUE : ATTR_STYLE_MODIFY_READ_ONLY_VALUE); String style = visualElement.getAttribute(ATTR_STYLE); if (style != null && style.length() > 0) { if (style.indexOf(ATTR_STYLE_MODIFY_NAME) >= 0) { - String[] items = style.split(";"); - style = ""; + String[] items = style.split(";"); //$NON-NLS-1$ + style = ""; //$NON-NLS-1$ for (int i = 0; i < items.length; i++) { - String[] item = items[i].split(":"); + String[] item = items[i].split(":"); //$NON-NLS-1$ if (ATTR_STYLE_MODIFY_NAME.trim().equalsIgnoreCase(item[0].trim())) { item[1] = modify ? ATTR_STYLE_MODIFY_READ_WRITE_VALUE : ATTR_STYLE_MODIFY_READ_ONLY_VALUE; } - style += item[0] + ":" + item[1] + ";"; + style += item[0] + ":" + item[1] + ";"; //$NON-NLS-1$ //$NON-NLS-2$ } } else { - if (!";".equals(style.substring(style.length() - 1))) style += ";"; + if (!";".equals(style.substring(style.length() - 1))) style += ";"; //$NON-NLS-1$ //$NON-NLS-2$ style += s; } } else { @@ -561,7 +561,7 @@ @Override public Node getNodeForUpdate(VpePageContext pageContext, Node sourceNode, nsIDOMNode visualNode, Object data) { // TODO Sergey Vasilyev redevelop JSF's facet template - if (sourceNode.getNodeName().endsWith(":facet")) { + if (sourceNode.getNodeName().endsWith(":facet")) { //$NON-NLS-1$ return sourceNode.getParentNode(); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeIncludeTemplate.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -140,7 +140,7 @@ protected VpeCreationData createStub(String fileName, nsIDOMDocument visualDocument) { nsIDOMElement visualNewElement = visualDocument.createElement(HTML.TAG_DIV); - visualNewElement.setAttribute("style", "background-color:#ECF3FF;cursor:pointer;padding:0 5px;margin:3px 0;font-style:italic;color:#0051DD;"); + visualNewElement.setAttribute("style", "background-color:#ECF3FF;cursor:pointer;padding:0 5px;margin:3px 0;font-style:italic;color:#0051DD;"); //$NON-NLS-1$ //$NON-NLS-2$ VpeVisualDomBuilder.markIncludeElement(visualNewElement); if (fileName != null) { visualNewElement.appendChild(visualDocument.createTextNode(fileName)); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeLinkCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -54,7 +54,7 @@ public VpeCreatorInfo create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, nsIDOMElement visualElement, Map visualNodeMap) { String href_value = getExprValue(pageContext, hrefExpr, sourceNode); - nsIDOMNode newNode = pageContext.getVisualBuilder().addLinkNodeToHead(href_value, "no", false); + nsIDOMNode newNode = pageContext.getVisualBuilder().addLinkNodeToHead(href_value, "no", false); //$NON-NLS-1$ visualNodeMap.put(this, newNode); VpeCreatorInfo creatorInfo = new VpeCreatorInfo(null); return creatorInfo; @@ -74,9 +74,9 @@ nsIDOMNode oldNode = (nsIDOMNode)visualNodeMap.get(this); nsIDOMNode newNode; if(oldNode == null){ - newNode = pageContext.getVisualBuilder().addLinkNodeToHead(href_value, "no", false); + newNode = pageContext.getVisualBuilder().addLinkNodeToHead(href_value, "no", false); //$NON-NLS-1$ }else{ - newNode = pageContext.getVisualBuilder().replaceLinkNodeToHead(oldNode, href_value, "no"); + newNode = pageContext.getVisualBuilder().replaceLinkNodeToHead(oldNode, href_value, "no"); //$NON-NLS-1$ if(visualNodeMap.containsKey(this)) visualNodeMap.remove(this); } visualNodeMap.put(this, newNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeListCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -91,7 +91,7 @@ } } - nsIDOMElement visualList = visualDocument.createElement("true".equals(strValue)?HTML.TAG_OL:HTML.TAG_UL); + nsIDOMElement visualList = visualDocument.createElement("true".equals(strValue)?HTML.TAG_OL:HTML.TAG_UL); //$NON-NLS-1$ VpeCreatorInfo creatorInfo = new VpeCreatorInfo(visualList); for (int i = 0; i < propertyCreators.size(); i++) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelGridCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -390,7 +390,7 @@ nsIDOMElement visualRow = visualDocument.createElement(HTML.TAG_TR); visualHead.appendChild(visualRow); nsIDOMElement visualCell = visualDocument.createElement(cellTag); - visualCell.setAttribute(HTML.ATTR_COLSPAN, "" + tableSize); + visualCell.setAttribute(HTML.ATTR_COLSPAN, "" + tableSize); //$NON-NLS-1$ if (headerClassExpr != null && header.getParentNode() != null) { String headerClass = headerClassExpr.exec(pageContext, header.getParentNode()).stringValue(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePanelLayoutCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -28,12 +28,12 @@ import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; 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; +@SuppressWarnings("nls") public class VpePanelLayoutCreator extends VpeAbstractCreator { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpePseudoContentCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -15,22 +15,21 @@ import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; -import org.w3c.dom.Element; import org.w3c.dom.Node; public abstract class VpePseudoContentCreator { - private static final String PSEUDO_CONTENT_ATTR = "vpe:pseudo-element"; + private static final String PSEUDO_CONTENT_ATTR = "vpe:pseudo-element"; //$NON-NLS-1$ public abstract void setPseudoContent(VpePageContext pageContext, Node sourceContainer, nsIDOMNode visualContainer, nsIDOMDocument visualDocument) throws VpeExpressionException; public static void setPseudoAttribute(nsIDOMElement visualPseudoElement) { - visualPseudoElement.setAttribute(PSEUDO_CONTENT_ATTR, "yes"); - visualPseudoElement.setAttribute("style", "font-style:italic; color:green"); + visualPseudoElement.setAttribute(PSEUDO_CONTENT_ATTR, "yes"); //$NON-NLS-1$ + visualPseudoElement.setAttribute("style", "font-style:italic; color:green"); //$NON-NLS-1$ //$NON-NLS-2$ VpeHtmlTemplate.makeModify(visualPseudoElement, false); } public static boolean isPseudoElement(nsIDOMNode visualNode) { - return visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE && "yes".equalsIgnoreCase(((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).getAttribute(PSEUDO_CONTENT_ATTR)); + return visualNode != null && visualNode.getNodeType() == Node.ELEMENT_NODE && "yes".equalsIgnoreCase(((nsIDOMElement)visualNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)).getAttribute(PSEUDO_CONTENT_ATTR)); //$NON-NLS-1$ } public static nsIDOMNode getContainerForPseudoContent(nsIDOMNode visualNode) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateData.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -71,8 +71,8 @@ } public String getPrefix() { - if (name != null && name.indexOf(":") > 0) { - return name.substring(0, name.indexOf(":")); + if (name != null && name.indexOf(":") > 0) { //$NON-NLS-1$ + return name.substring(0, name.indexOf(":")); //$NON-NLS-1$ } return null; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateFileList.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -41,7 +41,7 @@ newAutoTemplateFile = new VpeTemplateFile( VpeTemplateManager.getAutoTemplates(), null); } catch (IOException e) { - VpePlugin.getPluginLog().logError("Default template for unknown tags loading error ",e); + VpePlugin.getPluginLog().logError("Default template for unknown tags loading error ",e); //$NON-NLS-1$ } changed = (autoTemplateFile == null) != (newAutoTemplateFile == null); if (!changed && autoTemplateFile != null) { @@ -95,7 +95,7 @@ VpeTemplateFile templateFile = new VpeTemplateFile(pathAttrValue, elements[j]); templateList.add(templateFile); } catch (IOException e) { - VpePlugin.getPluginLog().logError("Error during loading template '" + pathAttrValue + "'", e); + VpePlugin.getPluginLog().logError("Error during loading template '" + pathAttrValue + "'", e); //$NON-NLS-1$ //$NON-NLS-2$ } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -998,7 +998,7 @@ String nameSpaceIdentifyer, Exception e) { String message = e.getMessage(); if(message==null) { - message = "Can't get VPE template class: " + templateClassName + ", from bundle:" + nameSpaceIdentifyer; //$NON-NLS-1$ + message = "Can't get VPE template class: " + templateClassName + ", from bundle:" + nameSpaceIdentifyer; //$NON-NLS-1$ //$NON-NLS-2$ } VpePlugin.getPluginLog().logError(message, e); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTextPseudoContentCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTextPseudoContentCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTextPseudoContentCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -10,12 +10,13 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template; -import org.w3c.dom.Document; +import java.text.MessageFormat; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.util.HTML; +import org.jboss.tools.vpe.messages.VpeUIMessages; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -51,9 +52,9 @@ if (name == null || attrName.length() <= 0) { name = ((Element)sourceContainer).getNodeName(); } - text = "Insert Content for " + name; + text = MessageFormat.format(VpeUIMessages.VpeTextPseudoContentCreator_InsertContentFor, name); } else { - text = "Insert Content"; + text = VpeUIMessages.VpeTextPseudoContentCreator_InsertContent; } } nsIDOMText newTextNode = visualDocument.createTextNode(text); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeValueCreator.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -57,7 +57,7 @@ if (expression != null) { value = expression.exec(pageContext, sourceNode).stringValue(); } else { - value = ""; + value = ""; //$NON-NLS-1$ } nsIDOMText valueNode = visualDocument.createTextNode(value); visualNodeMap.put(this, valueNode); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -24,15 +24,15 @@ public class VpeDnd { - static final String TAG_DRAG = VpeTemplateManager.VPE_PREFIX + "drag"; - static final String TAG_DROP = VpeTemplateManager.VPE_PREFIX + "drop"; - static final String TAG_CONTAINER_CHILD = VpeTemplateManager.VPE_PREFIX + "container-child"; + static final String TAG_DRAG = VpeTemplateManager.VPE_PREFIX + "drag"; //$NON-NLS-1$ + static final String TAG_DROP = VpeTemplateManager.VPE_PREFIX + "drop"; //$NON-NLS-1$ + static final String TAG_CONTAINER_CHILD = VpeTemplateManager.VPE_PREFIX + "container-child"; //$NON-NLS-1$ - static final String ATTRIBUTE_START_ENABLE = "start-enable"; - static final String ATTRIBUTE_CONTAINER = "container"; - static final String ATTRIBUTE_TAG_NAME = "tag-name"; + static final String ATTRIBUTE_START_ENABLE = "start-enable"; //$NON-NLS-1$ + static final String ATTRIBUTE_CONTAINER = "container"; //$NON-NLS-1$ + static final String ATTRIBUTE_TAG_NAME = "tag-name"; //$NON-NLS-1$ - static final String STRING_YES = "yes"; + static final String STRING_YES = "yes"; //$NON-NLS-1$ private boolean dragEnabled = false; private boolean isContainer = false; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeAttributeOperand.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.template.expression; -import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -29,7 +28,7 @@ public VpeValue exec(VpePageContext pageContext, Node sourceNode) { String value = null; value = ((Element)sourceNode).getAttribute(name); - return new VpeValue((value == null ? "" : value)); + return new VpeValue((value == null ? "" : value)); //$NON-NLS-1$ } public String getAttributeName() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionParentName.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -28,6 +28,6 @@ String parentTemplateName = VpeTemplateManager.getInstance().getTemplateName(pageContext, parentNode); - return new VpeValue(parentTemplateName != null ? parentTemplateName : ""); + return new VpeValue(parentTemplateName != null ? parentTemplateName : ""); //$NON-NLS-1$ } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagString.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagString.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagString.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -17,6 +17,7 @@ public class VpeFunctionTagString extends VpeFunction { + @SuppressWarnings("nls") public VpeValue exec(VpePageContext pageContext, Node sourceNode) { String tagString = " <" + sourceNode.getNodeName(); NamedNodeMap attrs = sourceNode.getAttributes(); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagText.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagText.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTagText.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -12,7 +12,6 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; -import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -20,6 +19,7 @@ public class VpeFunctionTagText extends VpeFunction { + @SuppressWarnings("nls") public VpeValue exec(VpePageContext pageContext, Node sourceNode) { String tagText = ""; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -170,12 +170,12 @@ * version-comparator like [<a href="http://maven.apache.org/ref/current/maven-artifact/apidocs/org...>] */ private double stringVersionToDouble(String sVersion) { - String tokens[] = sVersion.split("\\."); + String tokens[] = sVersion.split("\\."); //$NON-NLS-1$ String parseableVersion; switch (tokens.length) { case 0: - parseableVersion = "0"; //$NON-NLS-N$ + parseableVersion = "0"; //$NON-NLS-1$ break; case 1: parseableVersion = tokens[0]; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeTextExpression.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeTextExpression.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeTextExpression.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -23,7 +23,7 @@ public VpeValue exec(VpePageContext pageContext, Node sourceNode) { if (text == null) { - return new VpeValue(""); + return new VpeValue(""); //$NON-NLS-1$ } else { return new VpeValue(text); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/TemplateResizeData.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/TemplateResizeData.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/TemplateResizeData.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -19,6 +19,7 @@ private TemplateResizeData next=null; + @SuppressWarnings("nls") public TemplateResizeData(String attribute, String position, String xPath, String test, String enabledString){ sizeAttribute = attribute; if("".equals(sizeAttribute)) sizeAttribute = null; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/resize/VpeResizer.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -33,16 +33,16 @@ */ public class VpeResizer { /** TAG_WIDTH */ - private static final String TAG_WIDTH = VpeTemplateManager.VPE_PREFIX + "width"; + private static final String TAG_WIDTH = VpeTemplateManager.VPE_PREFIX + "width"; //$NON-NLS-1$ /** TAG_HEIGHT */ - private static final String TAG_HEIGHT = VpeTemplateManager.VPE_PREFIX + "height"; + private static final String TAG_HEIGHT = VpeTemplateManager.VPE_PREFIX + "height"; //$NON-NLS-1$ - private static final String ATTRIBUTE_WIDTH = "width-attr"; - private static final String ATTRIBUTE_HEIGHT = "height-attr"; - private static final String ATTRIBUTE_TAG_XPATH = "tag-xpath"; - private static final String ATTRIBUTE_TEST = "test"; - private static final String ATTRIBUTE_DISABLE_ABSOLUTE_POSITION = "disable-absolute-position"; + private static final String ATTRIBUTE_WIDTH = "width-attr"; //$NON-NLS-1$ + private static final String ATTRIBUTE_HEIGHT = "height-attr"; //$NON-NLS-1$ + private static final String ATTRIBUTE_TAG_XPATH = "tag-xpath"; //$NON-NLS-1$ + private static final String ATTRIBUTE_TEST = "test"; //$NON-NLS-1$ + private static final String ATTRIBUTE_DISABLE_ABSOLUTE_POSITION = "disable-absolute-position"; //$NON-NLS-1$ private TemplateResizeData horizontalData; private TemplateResizeData verticalData; @@ -176,14 +176,14 @@ Element ancestor = (Element)SourceDomUtil.getAncestorNode(sourceElement, resizeData.getTagXpath()); if(ancestor != null){ if(sizeAttribute.indexOf(VpeStyleUtil.DOT_STRING) < 0){ - ancestor.setAttribute(sizeAttribute, ""+size); + ancestor.setAttribute(sizeAttribute, ""+size); //$NON-NLS-1$ }else{ VpeStyleUtil.setParameterInStyle(ancestor, sizeAttribute, size+VpeStyleUtil.PX_STRING); } } }else{ if(sizeAttribute.indexOf(VpeStyleUtil.DOT_STRING) < 0){ - sourceElement.setAttribute(sizeAttribute, ""+size); + sourceElement.setAttribute(sizeAttribute, ""+size); //$NON-NLS-1$ }else{ VpeStyleUtil.setParameterInStyle(sourceElement, sizeAttribute, size+VpeStyleUtil.PX_STRING); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/AttributeFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/AttributeFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/AttributeFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -148,7 +148,7 @@ Element element = (Element)node; String name = data.getName(); if(name==null) { - String message = "Wrong vpe template for tag " + node.getNodeName() + ". Attribute 'name' or 'type' of <vpe:formatAttribute> must be set."; + String message = "Wrong vpe template for tag " + node.getNodeName() + ". Attribute 'name' or 'type' of <vpe:formatAttribute> must be set."; //$NON-NLS-1$ //$NON-NLS-2$ VpePlugin.getDefault().getLog().log(new Status(Status.ERROR, VpePlugin.PLUGIN_ID, Status.OK, message, new Exception(message))); } element.setAttribute(name, ""); //$NON-NLS-1$ 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 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BlockFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -25,26 +25,26 @@ */ public class BlockFormatController extends ComboFormatController { - public static String TYPE = "BlockFormat"; + public static String TYPE = "BlockFormat"; //$NON-NLS-1$ 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"); + TAGS.put("address", "Address"); //$NON-NLS-1$ //$NON-NLS-2$ + TAGS.put("h1", "Heading 1"); //$NON-NLS-1$ //$NON-NLS-2$ + TAGS.put("h2", "Heading 2"); //$NON-NLS-1$ //$NON-NLS-2$ + TAGS.put("h3", "Heading 3"); //$NON-NLS-1$ //$NON-NLS-2$ + TAGS.put("h4", "Heading 4"); //$NON-NLS-1$ //$NON-NLS-2$ + TAGS.put("h5", "Heading 5"); //$NON-NLS-1$ //$NON-NLS-2$ + TAGS.put("h6", "Heading 6"); //$NON-NLS-1$ //$NON-NLS-2$ } 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"); + TEXTS.put("Address", "address"); //$NON-NLS-1$ //$NON-NLS-2$ + TEXTS.put("Heading 1", "h1"); //$NON-NLS-1$ //$NON-NLS-2$ + TEXTS.put("Heading 2", "h2"); //$NON-NLS-1$ //$NON-NLS-2$ + TEXTS.put("Heading 3", "h3"); //$NON-NLS-1$ //$NON-NLS-2$ + TEXTS.put("Heading 4", "h4"); //$NON-NLS-1$ //$NON-NLS-2$ + TEXTS.put("Heading 5", "h5"); //$NON-NLS-1$ //$NON-NLS-2$ + TEXTS.put("Heading 6", "h6"); //$NON-NLS-1$ //$NON-NLS-2$ } private String tagName; @@ -77,7 +77,7 @@ selectionText = comboBlockFormat.getText(); tagName = (String) TEXTS.get(selectionText); if (tagName == null) { - tagName = "normal"; + tagName = "normal"; //$NON-NLS-1$ } super.handleEvent(event); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BoldFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BoldFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BoldFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -20,11 +20,11 @@ */ public class BoldFormatController extends ToolItemFormatController { - public static String TYPE = "BoldFormat"; + public static String TYPE = "BoldFormat"; //$NON-NLS-1$ - private static String STYLE_PROPERTY_NAME = "FONT-WEIGHT"; - private static String STYLE_PROPERTY_BOLD_VALUE = "bold"; - private static String STYLE_PROPERTY_NORMAL_VALUE = "normal"; + private static String STYLE_PROPERTY_NAME = "FONT-WEIGHT"; //$NON-NLS-1$ + private static String STYLE_PROPERTY_BOLD_VALUE = "bold"; //$NON-NLS-1$ + private static String STYLE_PROPERTY_NORMAL_VALUE = "normal"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BulletsFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BulletsFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/BulletsFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -20,7 +20,7 @@ */ public class BulletsFormatController extends ToolItemFormatController { - public static String TYPE = "BulletsFormat"; + public static String TYPE = "BulletsFormat"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/CenterFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/CenterFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/CenterFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -20,7 +20,7 @@ */ public class CenterFormatController extends ToolItemFormatController { - public static String TYPE = "CenterFormat"; + public static String TYPE = "CenterFormat"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -52,17 +52,17 @@ StringBuffer buf = new StringBuffer(); String c = Integer.toHexString(newColor.red); if(c.length()<2) { - buf.append("0"); + buf.append("0"); //$NON-NLS-1$ } buf.append(c); c = Integer.toHexString(newColor.green); if(c.length()<2) { - buf.append("0"); + buf.append("0"); //$NON-NLS-1$ } buf.append(c); c = Integer.toHexString(newColor.blue); if(c.length()<2) { - buf.append("0"); + buf.append("0"); //$NON-NLS-1$ } buf.append(c); color = buf.toString(); @@ -73,7 +73,7 @@ protected String createStylePropertyValue() { if(color!=null && color.trim().length()>0) { - return "#" + color; + return "#" + color; //$NON-NLS-1$ } return null; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ItalicFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ItalicFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ItalicFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -20,11 +20,11 @@ */ public class ItalicFormatController extends ToolItemFormatController { - public static String TYPE = "ItalicFormat"; + public static String TYPE = "ItalicFormat"; //$NON-NLS-1$ - private static String STYLE_PROPERTY_NAME = "FONT-STYLE"; - private static String STYLE_PROPERTY_ITALIC_VALUE = "italic"; - private static String STYLE_PROPERTY_NORMAL_VALUE = "normal"; + private static String STYLE_PROPERTY_NAME = "FONT-STYLE"; //$NON-NLS-1$ + private static String STYLE_PROPERTY_ITALIC_VALUE = "italic"; //$NON-NLS-1$ + private static String STYLE_PROPERTY_NORMAL_VALUE = "normal"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/JustifyFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/JustifyFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/JustifyFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -20,7 +20,7 @@ */ public class JustifyFormatController extends ToolItemFormatController { - public static String TYPE = "JustifyFormat"; + public static String TYPE = "JustifyFormat"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/NumberingFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/NumberingFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/NumberingFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -20,7 +20,7 @@ */ public class NumberingFormatController extends ToolItemFormatController { - public static String TYPE = "NumberingFormat"; + public static String TYPE = "NumberingFormat"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/UnderlineFormatController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/UnderlineFormatController.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/UnderlineFormatController.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -23,11 +23,11 @@ */ public class UnderlineFormatController extends ToolItemFormatController { - public static String TYPE = "UnderlineFormat"; + public static String TYPE = "UnderlineFormat"; //$NON-NLS-1$ - private static String STYLE_PROPERTY_NAME = "TEXT-DECORATION"; - private static String STYLE_PROPERTY_UNDERLINE_VALUE = "underline"; - private static String STYLE_PROPERTY_NORMAL_VALUE = "none"; + private static String STYLE_PROPERTY_NAME = "TEXT-DECORATION"; //$NON-NLS-1$ + private static String STYLE_PROPERTY_UNDERLINE_VALUE = "underline"; //$NON-NLS-1$ + private static String STYLE_PROPERTY_NORMAL_VALUE = "none"; //$NON-NLS-1$ /** * @param manager Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2009-07-10 06:52:36 UTC (rev 16522) @@ -62,6 +62,14 @@ public static String CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE; public static String VPE_UPDATE_JOB_TITLE; public static String VPE_VISUAL_REFRESH_JOB; + public static String VpeExpressionBuilder_ClosingApostropheNotFound; + public static String VpeExpressionBuilder_ClosingBracketNotFound; + public static String VpeExpressionBuilder_FunctionNotFound; + public static String VpeExpressionBuilder_UndefinedCharacter; + public static String VpeExpressionBuilder_UndefinedName; + public static String VpeExpressionBuilderException_Message; + public static String VpeTextPseudoContentCreator_InsertContent; + public static String VpeTextPseudoContentCreator_InsertContentFor; public static String NON_VISUAL_TAGS; public static String SHOW_NON_VISUAL_TAGS; public static String HIDE_NON_VISUAL_TAGS; @@ -71,6 +79,9 @@ public static String HIDE; public static String TAG_FOR_DISPLAY_IS_NOT_VALID; public static String TAG_FOR_DISPLAY; + public static String MenuCreationHelper_Cut; + public static String MenuCreationHelper_Paste; + public static String MenuCreationHelper_Test; public static String TemplatesPreferencePage_Edit; public static String TemplatesPreferencePage_Remove; public static String TemplatesTableProvider_Children; @@ -84,6 +95,11 @@ public static String MAX_VISUAL_PANE; public static String RESTORE_PREVIOUS_LOCATION; public static String BACKGROUND_COLOR_TIP; + public static String BaseActionManager_InsertAfter; + public static String BaseActionManager_InsertAround; + public static String BaseActionManager_InsertBefore; + public static String BaseActionManager_InsertTag; + public static String BaseActionManager_ReplaceWith; public static String SETUP_TEMPLATE_FOR_MENU; public static String INSERT_AROUND; public static String INSERT_BEFORE; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-07-09 22:40:27 UTC (rev 16521) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2009-07-10 06:52:36 UTC (rev 16522) @@ -41,6 +41,14 @@ CONFIRM_SELECTION_BAR_DIALOG_TOGGLE_MESSAGE=Always hide selection bar without prompt VPE_UPDATE_JOB_TITLE=Visual Editor View Update VPE_VISUAL_REFRESH_JOB=Visual Editor Refresh +VpeExpressionBuilder_ClosingApostropheNotFound=Closing apostrophe is not found +VpeExpressionBuilder_ClosingBracketNotFound=Closing bracket is not found +VpeExpressionBuilder_FunctionNotFound=Function ''{0}'' is not found +VpeExpressionBuilder_UndefinedCharacter=Undefined character ''{0}'' +VpeExpressionBuilder_UndefinedName=Undefined name "{0}" +VpeExpressionBuilderException_Message=Expression: "{0}" pos={1} {2} +VpeTextPseudoContentCreator_InsertContent=Insert Content +VpeTextPseudoContentCreator_InsertContentFor=Insert Content for {0} SHOW_NON_VISUAL_TAGS=Show non-visual tags HIDE_NON_VISUAL_TAGS=Hide non-visual tags SHOW_TOOLBAR=Show {0} @@ -50,6 +58,9 @@ HIDE=Hide TAG_FOR_DISPLAY_IS_NOT_VALID=Tag for display is not valid ({0}). TAG_FOR_DISPLAY=Tag for Display + MenuCreationHelper_Cut=Cut + MenuCreationHelper_Paste=Paste + MenuCreationHelper_Test=Test TemplatesPreferencePage_Edit=Edit TemplatesPreferencePage_Remove=Remove TemplatesTableProvider_Children=Children @@ -63,6 +74,11 @@ MAX_VISUAL_PANE=Maximize Visual Pane RESTORE_PREVIOUS_LOCATION=Restore Previous Location BACKGROUND_COLOR_TIP=Choose background color +BaseActionManager_InsertAfter=Insert After +BaseActionManager_InsertAround=Insert Around +BaseActionManager_InsertBefore=Insert Before +BaseActionManager_InsertTag=Insert Tag +BaseActionManager_ReplaceWith=Replace With SETUP_TEMPLATE_FOR_MENU=Setup Template for <{0}>... INSERT_AROUND=Around INSERT_BEFORE=Before