Author: dgolovin Date: 2008-12-10 00:06:32 -0500 (Wed, 10 Dec 2008) New Revision: 12524 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultXModelObjectLabelProvider.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/NavigatorLabelProvider.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTextHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/Utils.java trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml Log: Code cleanup Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -378,7 +378,7 @@ void initializeParameters() { try { MemberInfo parent = getParentMember(); - if(parent!=null && parent instanceof TypeMemberInfo) { + if(parent instanceof TypeMemberInfo) { ITypeParameter[] parameters = fType.getTypeParameters(); for (int i = 0; i < parameters.length; i++) { Type type = parent.getType().getParameter(i); @@ -986,7 +986,7 @@ @Override public boolean equals(Object obj) { - if(obj!=null && obj instanceof MemberPresentation) { + if(obj instanceof MemberPresentation) { return presentation.equals(((MemberPresentation)obj).getPresentation()); } return false; Modified: trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.kb/src/org/jboss/tools/common/kb/wtp/TLDVersionHelper.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -39,7 +39,7 @@ public static String getTldVersion(TaglibTracker tracker) { CMDocument cmd = tracker.getDocument(); - if(cmd!=null && cmd instanceof CMDocumentImpl) { + if(cmd instanceof CMDocumentImpl) { CMDocumentImpl doc = (CMDocumentImpl)cmd; return doc.getTlibversion(); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/meta/action/impl/handlers/CopyHandler.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -71,7 +71,7 @@ for (int i = 0; i < buffer.getSize(); i++) { XModelObject o = buffer.source(i); IResource resource = (IResource)o.getAdapter(IResource.class); - if(resource != null && (resource instanceof IFile || resource instanceof IContainer)) { + if(resource instanceof IFile || resource instanceof IContainer) { resources.add(resource); } if(texts.length() > 0) texts.append(' '); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/options/impl/SharableElementImpl.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -45,7 +45,7 @@ public SharableElement getSharableParent() { Object p = getParent(); - return (p != null && p instanceof SharableElement) + return (p instanceof SharableElement) ? (SharableElement)p : null; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -856,7 +856,7 @@ } else if(es[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) { IPath path = es[i].getPath(); IResource r = project.getWorkspace().getRoot().findMember(path); - if(r != null && (r instanceof IContainer)) { + if(r instanceof IContainer) { l.add(r); } else if(r != null && !project.getFullPath().isPrefixOf(r.getFullPath())) { l.add(r); //probably it is jar Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/ObjectMultiPageEditor.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -842,7 +842,7 @@ IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor(); if(contributor instanceof EditorActionBarContributorWrapper) contributor = ((EditorActionBarContributorWrapper)contributor).getActiveContributer(); - if (contributor != null && contributor instanceof MultiPageEditorActionBarContributor) { + if (contributor instanceof MultiPageEditorActionBarContributor) { ((MultiPageEditorActionBarContributor) contributor).setActivePage(activeEditor); } updateSelectionProvider(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -151,7 +151,7 @@ Object object; while (i.hasNext()) { object = i.next(); - if (object!=null && object instanceof FieldEditor) ((FieldEditor)object).dispose(); + if (object instanceof FieldEditor) ((FieldEditor)object).dispose(); } editors.clear(); editors = null; @@ -161,7 +161,7 @@ Object object; while (i.hasNext()) { object = i.next(); - if (object!=null && object instanceof DefaultValueAdapter) ((DefaultValueAdapter)object).dispose(); + if (object instanceof DefaultValueAdapter) ((DefaultValueAdapter)object).dispose(); } adapters.clear(); adapters = null; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultXModelObjectLabelProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultXModelObjectLabelProvider.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/adapter/DefaultXModelObjectLabelProvider.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -45,7 +45,7 @@ } public Image getImage(Object element) { - if (element != null && element instanceof XModelObject) { + if (element instanceof XModelObject) { return EclipseResourceUtil.getImage((XModelObject)element); } return null; Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -70,7 +70,7 @@ Iterator i = fieldEditors.iterator(); while (i.hasNext()) { object = i.next(); - if (object!=null && object instanceof ExtendedFieldEditor) ((ExtendedFieldEditor)object).dispose(); + if (object instanceof ExtendedFieldEditor) ((ExtendedFieldEditor)object).dispose(); } fieldEditors.clear(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/NavigatorLabelProvider.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/NavigatorLabelProvider.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/navigator/NavigatorLabelProvider.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -42,7 +42,7 @@ public Image getImage(Object element) { Image result = null; - if (element != null && element instanceof XModelObject) + if (element instanceof XModelObject) result = EclipseResourceUtil.getImage((XModelObject)element); return result; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/select/SelectObjectWizard.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -48,7 +48,7 @@ if(p != null && p.getSite().getSelectionProvider() != null && (object instanceof XModelObject)) { Display.getDefault().syncExec(new Runnable() { public void run() { - if(preferredPage != null && p instanceof EditorPartWrapper) { + if(p instanceof EditorPartWrapper) { EditorPartWrapper w = (EditorPartWrapper)p; if(w.getEditor() instanceof ObjectMultiPageEditor) { ObjectMultiPageEditor oe = (ObjectMultiPageEditor)w.getEditor(); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/widgets/DefaultSettings.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -241,7 +241,7 @@ */ public void setupControl(Control control) { FormToolkit toolkit = getToolkit(control.getDisplay()); - if(toolkit != null && control instanceof Composite) { + if(control instanceof Composite) { toolkit.adapt((Composite)control); } if (control instanceof CCombo || control instanceof Combo) { Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPRootHyperlinkPartitioner.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -79,7 +79,7 @@ axis = "/" + nodeName; } Node parent = (n instanceof Attr)? ((Attr)n).getOwnerElement() : n.getParentNode(); - while (parent != null && (parent instanceof Element)) { + while (parent instanceof Element) { // Get the axis part depending on the type and name of node String nodeName = extractName(parent.getNodeName(), trackersMap, tm); if (nodeName != null && nodeName.length() > 0) Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLRootHyperlinkPartitioner.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -66,7 +66,7 @@ axis = "/" + nodeName; } Node parent = (n instanceof Attr)? ((Attr)n).getOwnerElement():n.getParentNode(); - while (parent != null && (parent instanceof Element)) { + while (parent instanceof Element) { // Get the axis part depending on the type and name of node String nodeName = extractName(parent.getNodeName(), trackersMap); if (nodeName != null && nodeName.length() > 0) Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTextHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTextHyperlinkPartitioner.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLTextHyperlinkPartitioner.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -69,7 +69,7 @@ if (xmlDocument == null) return false; Node n = Utils.findNodeForOffset(xmlDocument, region.getOffset()); - return (n != null && n instanceof Text); + return (n instanceof Text); } finally { smw.dispose(); } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/Utils.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/Utils.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/util/Utils.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -92,7 +92,7 @@ String axis = ""; if (node == null) return null; Node parent = (node instanceof Attr)? ((Attr)node).getOwnerElement():node.getParentNode(); - while (parent != null && (parent instanceof Element)) { + while (parent instanceof Element) { String nodeName = parent.getNodeName(); axis = "/" + nodeName + axis; parent = parent.getParentNode(); Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/xpl/ToggleOccurencesMarkUpAction.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -62,7 +62,7 @@ } fOccurrencePreferenceProvider = null; StructuredTextEditor sse = getStructuredTextEditor(getTextEditor()); - if (sse != null && sse instanceof IOccurrencePreferenceProvider) { + if (sse instanceof IOccurrencePreferenceProvider) { fOccurrencePreferenceProvider = (IOccurrencePreferenceProvider)sse; if (fOccurrencePreferenceProvider != null) { fEditorId = fOccurrencePreferenceProvider.getOccurrencePreferenceProvider().getEditorId(); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/operation/WebNatureOperation.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -25,10 +25,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -49,8 +47,6 @@ import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager; import org.eclipse.wst.server.core.IRuntime; -import org.osgi.framework.Bundle; - import org.jboss.tools.common.meta.action.SpecialWizard; import org.jboss.tools.common.meta.action.SpecialWizardFactory; import org.jboss.tools.common.model.XModel; @@ -59,18 +55,19 @@ import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.common.model.project.ClassPathUpdate; import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.project.Watcher; import org.jboss.tools.common.model.project.WatcherLoader; import org.jboss.tools.common.model.ui.ModelUIPlugin; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.context.RegisterServerContext; import org.jboss.tools.jst.web.project.helpers.NewWebProjectContext; import org.jboss.tools.jst.web.server.RegistrationHelper; import org.jboss.tools.jst.web.ui.WebUiPlugin; +import org.osgi.framework.Bundle; /** * Modified: trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java =================================================================== --- trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/tests/tests/org.jboss.tools.test/src/org/jboss/tools/test/util/ResourcesUtils.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -173,6 +173,8 @@ importProjectIntoWorkspace(bean); } + private static final long IMPORT_DELAY = 50; + /** * Import project into workspace. * @@ -187,8 +189,8 @@ project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName); project.create(null); project.open(null); - JobUtils.waitForIdle(); - + JobUtils.waitForIdle(IMPORT_DELAY); + IOverwriteQuery overwrite = new IOverwriteQuery() { public String queryOverwrite(String pathString) { return ALL; @@ -214,7 +216,7 @@ .getActiveWorkbenchWindow().getShell()); // run import importOp.run(null); - JobUtils.waitForIdle(); + JobUtils.waitForIdle(IMPORT_DELAY); } catch (InvocationTargetException ite) { // TePlugin.getDefault().logError(ite.getCause()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -40,6 +40,7 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.LineStyleEvent; import org.eclipse.swt.custom.LineStyleListener; @@ -1489,7 +1490,7 @@ && elementMapping.getTemplate().getType() == VpeHtmlTemplate.TYPE_ANY) { final VpeTemplate selectedTemplate = elementMapping .getTemplate(); - manager.add(new VpeAction("Template", node) { //$NON-NLS-1$ + manager.add(new VpeAction(NLS.bind(VpeUIMessages.SETUP_TEMPLATE_FOR_MENU,"<" + node.getNodeName() + ">"), node) { //$NON-NLS-1$ public void run() { boolean isCorrectNS = pageContext .isCorrectNS(actionNode); 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 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2008-12-10 05:06:32 UTC (rev 12524) @@ -10,33 +10,15 @@ ******************************************************************************/ package org.jboss.tools.vpe.messages; -import java.util.Locale; -import java.util.MissingResourceException; -import java.util.ResourceBundle; - import org.eclipse.osgi.util.NLS; -import org.jboss.tools.vpe.VpePlugin; public class VpeUIMessages extends NLS { private static final String BUNDLE_NAME = "org.jboss.tools.vpe.messages.messages";//$NON-NLS-1$ - private static ResourceBundle fResourceBundle; static { // load message values from bundle file NLS.initializeMessages(BUNDLE_NAME, VpeUIMessages.class); } private VpeUIMessages(){} - - public static ResourceBundle getResourceBundle() { - try { - if (fResourceBundle == null) - fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME, Locale.getDefault()); - } - catch (MissingResourceException x) { - VpePlugin.getPluginLog().logError(x); - fResourceBundle = null; - } - return fResourceBundle; - } public static String NAMESPACE_NOT_DEFINED; public static String PREFERENCES; @@ -104,4 +86,5 @@ public static String MAX_VISUAL_PANE; public static String RESTORE_PREVIOUS_LOCATION; public static String BACKGROUND_COLOR_TIP; + public static String SETUP_TEMPLATE_FOR_MENU; } 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 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2008-12-10 05:06:32 UTC (rev 12524) @@ -65,3 +65,4 @@ MAX_VISUAL_PANE=Maximize Visual Pane RESTORE_PREVIOUS_LOCATION=Restore Previous Location BACKGROUND_COLOR_TIP=Choose background color +SETUP_TEMPLATE_FOR_MENU=Setup Template for {0} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml 2008-12-09 23:09:04 UTC (rev 12523) +++ trunk/vpe/plugins/org.jboss.tools.vpe/templates/vpe-templates-auto.xml 2008-12-10 05:06:32 UTC (rev 12524) @@ -1,13 +1,3 @@ <?xml version="1.0" encoding="UTF-8"?> <vpe:templates> - <vpe:tag case-sensitive="no" name=""> - <vpe:template children="no" modify="no"> - <vpe:any style="color:red" tag-for-display="tag-name1" value="tag-value"/> - </vpe:template> - </vpe:tag> - <vpe:tag case-sensitive="no" name=""> - <vpe:template children="no" modify="no"> - <vpe:any style="color:white" tag-for-display="tag-name2" value="tag-value"/> - </vpe:template> - </vpe:tag> </vpe:templates>