JBoss Tools SVN: r15477 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans: .settings and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 01:22:00 -0400 (Mon, 25 May 2009)
New Revision: 15477
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/.settings/
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/.settings/org.eclipse.jdt.core.prefs
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Activator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/SharedImages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLCorrectionAssistantProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLOutlineConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/proposals/internal/ConvertNodeToXPathDialogOutlineMenuItemProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewSessionBeanWizard.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewMessageDrivenBeanWizardPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/ServiceXMLEditorUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/.settings/org.eclipse.jdt.core.prefs 2009-05-25 05:22:00 UTC (rev 15477)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Activator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Activator.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Activator.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -30,7 +30,7 @@
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.mbeans";
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui.mbeans"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -25,9 +25,19 @@
public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.ui.mbeans.Messages"; //$NON-NLS-1$
+
+ public static String ConvertNodeToXPathDialogOutlineMenuItemProvider_AddToXPathsAction;
+
+ public static String ConvertNodeToXPathDialogOutlineMenuItemProvider_AddToXPathsDescription;
+
/* XML service editor */
public static String ServiceXMLAddAttributeTags;
+ public static String ServiceXMLEditorConfiguration_OccurrenceNameWithAttributes;
+
+ public static String ServiceXMLEditorConfiguration_UnableToDisplayInEditor;
+
/* MBean Wizard */
public static String NewMBeanInterface;
@@ -38,6 +48,8 @@
public static String MBeanClassDescription;
public static String MBeanServiceXML;
+ public static String NewSessionBeanWizard_WindowTitle;
+
public static String NewSessionBeanWizardTitle;
public static String NewSessionBeanWizardBeanTypeLabel;
public static String NewSessionBeanWizardStatefulButtonLabel;
@@ -49,12 +61,16 @@
public static String NewSessionBeanWizardRemoteInterfaceNameLabel;
public static String NewSessionBeanWizardMessage;
public static String NewSessionBeanWizardDescription;
+ public static String NewMBeanWizard_CreatingTaskName;
+ public static String NewMBeanWizard_WindowTitle;
+ public static String NewMBeanWizard_XMLTaskName;
public static String NewMessageBeanWizardMessage;
public static String NewMessageBeanWizardDescription;
+
+ public static String NewMessageDrivenBeanWizardPage_Name;
static {
- NLS.initializeMessages("org.jboss.ide.eclipse.as.ui.mbeans.Messages",
- Messages.class);
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.properties 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.properties 2009-05-25 05:22:00 UTC (rev 15477)
@@ -1,5 +1,7 @@
+ConvertNodeToXPathDialogOutlineMenuItemProvider_AddToXPathsDescription=Add this element to the list of xpaths you can edit from the properties view.
#Mbean wizard
+ConvertNodeToXPathDialogOutlineMenuItemProvider_AddToXPathsAction=Add to XPaths
NewMBeanInterface=New MBean Interface
NewMBeanInterfaceDesc=Create the interface for the MBean
NewMBeanName=MBean Name
@@ -10,9 +12,12 @@
# service xml
ServiceXMLAddAttributeTags=Add missing attribute tags
+ServiceXMLEditorConfiguration_OccurrenceNameWithAttributes={0} (with attributes)
+ServiceXMLEditorConfiguration_UnableToDisplayInEditor=Unable to display element in editor.
+NewSessionBeanWizard_WindowTitle=New Session Bean
NewSessionBeanWizardTitle=Session Bean Wizard
NewSessionBeanWizardBeanTypeLabel=Session Bean Type:
NewSessionBeanWizardStatefulButtonLabel=Stateful
@@ -26,3 +31,7 @@
NewSessionBeanWizardDescription=Create a new EJB3 Session Bean
NewMessageBeanWizardMessage=Create a new Message-Driven Bean
NewMessageBeanWizardDescription=Create a new Message-Driven Bean
+NewMessageDrivenBeanWizardPage_Name=New Message Driven Bean Page
+NewMBeanWizard_CreatingTaskName=Creating Files
+NewMBeanWizard_WindowTitle=New MBean Wizard
+NewMBeanWizard_XMLTaskName=XMLDescriptor
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/SharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/SharedImages.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/SharedImages.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -33,7 +33,7 @@
* @author rob.stryker(a)jboss.com
*/
public class SharedImages {
- public static final String IMG_MBEAN = "mbean16";
+ public static final String IMG_MBEAN = "mbean16"; //$NON-NLS-1$
private static SharedImages instance;
@@ -46,7 +46,7 @@
Bundle pluginBundle = Activator.getDefault().getBundle();
- descriptors.put(IMG_MBEAN, createImageDescriptor(pluginBundle, "icons/mbean16"));
+ descriptors.put(IMG_MBEAN, createImageDescriptor(pluginBundle, "icons/mbean16")); //$NON-NLS-1$
Iterator iter = descriptors.keySet().iterator();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLCorrectionAssistantProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLCorrectionAssistantProvider.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLCorrectionAssistantProvider.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -70,10 +70,10 @@
if( providers == null ) {
ArrayList list = new ArrayList();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "ServiceXMLQuickFixProvider");
+ IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "ServiceXMLQuickFixProvider"); //$NON-NLS-1$
for( int i = 0; i < cf.length; i++ ) {
try {
- list.add((IServiceXMLQuickFixProposalProvider)cf[i].createExecutableExtension("class"));
+ list.add((IServiceXMLQuickFixProposalProvider)cf[i].createExecutableExtension("class")); //$NON-NLS-1$
} catch( CoreException ce ) {
// don't even log
}
@@ -151,24 +151,24 @@
private String[] mbeanGetMissingAttributes( IDOMNode node ) {
Node parentNode = node.getParentNode();
- if( node.getNodeName().equals("mbean") || (node.getNodeName().equals("#text") && parentNode.getNodeName().equals("mbean"))) {
- Node mbeanNode = node.getNodeName().equals("mbean") ? node : parentNode;
+ if( node.getNodeName().equals("mbean") || (node.getNodeName().equals("#text") && parentNode.getNodeName().equals("mbean"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ Node mbeanNode = node.getNodeName().equals("mbean") ? node : parentNode; //$NON-NLS-1$
NamedNodeMap attributes = mbeanNode.getAttributes();
for( int i = 0; i < attributes.getLength(); i++ ) {
- if( attributes.item(i).getNodeName().equals("code")) {
+ if( attributes.item(i).getNodeName().equals("code")) { //$NON-NLS-1$
// we found our code element, now lets get the IType.
String codeClass = attributes.item(i).getNodeValue();
IType type = ServiceXMLEditorUtil.findType(codeClass);
if( type != null ) {
IMethod[] methods = ServiceXMLEditorUtil.getAllMethods(type);
- ArrayList attributeNames = new ArrayList(Arrays.asList(ServiceXMLEditorUtil.findAttributesFromMethods(methods, "")));
+ ArrayList attributeNames = new ArrayList(Arrays.asList(ServiceXMLEditorUtil.findAttributesFromMethods(methods, ""))); //$NON-NLS-1$
NodeList mbeanChildren = mbeanNode.getChildNodes();
// count children named 'attribute'
for( int j = 0; j < mbeanChildren.getLength(); j++ ) {
- if( mbeanChildren.item(j).getNodeName().equals("attribute")) {
+ if( mbeanChildren.item(j).getNodeName().equals("attribute")) { //$NON-NLS-1$
try {
- Node t = mbeanChildren.item(j).getAttributes().getNamedItem("name");
+ Node t = mbeanChildren.item(j).getAttributes().getNamedItem("name"); //$NON-NLS-1$
String attName = t.getNodeValue();
attributeNames.remove(attName);
} catch( Exception e ) {
@@ -210,7 +210,7 @@
if( missing.length == 0 ) return;
Node parentNode = node.getParentNode();
- Node mbeanNode = node.getNodeName().equals("mbean") ? node : parentNode;
+ Node mbeanNode = node.getNodeName().equals("mbean") ? node : parentNode; //$NON-NLS-1$
// how many tabs?
@@ -218,24 +218,24 @@
StringBuffer attributeIndent = new StringBuffer();
StringBuffer mbeanClosingIndent = new StringBuffer();
boolean starting = true;
- attributeIndent.append("\n");
- mbeanClosingIndent.append("\n");
+ attributeIndent.append("\n"); //$NON-NLS-1$
+ mbeanClosingIndent.append("\n"); //$NON-NLS-1$
while( newParent != null && !(newParent instanceof DocumentImpl)) {
newParent = newParent.getParentNode();
- attributeIndent.append("\t");
+ attributeIndent.append("\t"); //$NON-NLS-1$
if( starting )
starting = false;
else
- mbeanClosingIndent.append("\t");
+ mbeanClosingIndent.append("\t"); //$NON-NLS-1$
}
StringBuffer buf = new StringBuffer();
for( int i = 0; i < missing.length; i++ ) {
buf.append(attributeIndent);
- buf.append("<attribute name=\"");
+ buf.append("<attribute name=\""); //$NON-NLS-1$
buf.append(missing[i]);
- buf.append("\"></attribute>");
+ buf.append("\"></attribute>"); //$NON-NLS-1$
}
buf.append(mbeanClosingIndent);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -21,6 +21,7 @@
*/
package org.jboss.ide.eclipse.as.ui.mbeans.editors;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -67,6 +68,7 @@
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
import org.jboss.ide.eclipse.as.ui.mbeans.Activator;
+import org.jboss.ide.eclipse.as.ui.mbeans.Messages;
import org.jboss.ide.eclipse.as.ui.util.BaseXMLHyperlinkUtil;
import org.jboss.ide.eclipse.as.ui.util.PackageTypeSearcher;
import org.jboss.ide.eclipse.as.ui.util.ServiceXMLEditorUtil;
@@ -115,10 +117,10 @@
}
private class ChildOccurances {
- public static final String ZERO_OR_ONE = "_ZERO_OR_ONE_";
- public static final String ONE = "_ONE_";
- public static final String ZERO_TO_INFINITY = "_ZERO_TO_INFINITY_";
- public static final String ONE_TO_INFINITY = "_ONE_TO_INFINITY_";
+ public static final String ZERO_OR_ONE = "_ZERO_OR_ONE_"; //$NON-NLS-1$
+ public static final String ONE = "_ONE_"; //$NON-NLS-1$
+ public static final String ZERO_TO_INFINITY = "_ZERO_TO_INFINITY_"; //$NON-NLS-1$
+ public static final String ONE_TO_INFINITY = "_ONE_TO_INFINITY_"; //$NON-NLS-1$
public String name;
public String numOccurances;
@@ -155,76 +157,76 @@
this.enumOptions = enumOptions;
this.mandatory = mandatory;
this.dataType = dataType;
- this.defaultValue = defaultValue == null ? "" : defaultValue;
+ this.defaultValue = defaultValue == null ? "" : defaultValue; //$NON-NLS-1$
}
}
private void fillChildren() {
ArrayList<ChildOccurances> list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("loader-repository", ChildOccurances.ZERO_OR_ONE));
- list.add(new ChildOccurances("local-directory", ChildOccurances.ZERO_TO_INFINITY));
- list.add(new ChildOccurances("classpath", ChildOccurances.ZERO_TO_INFINITY));
- list.add(new ChildOccurances("mbean", ChildOccurances.ZERO_TO_INFINITY));
- children.put("server", list);
+ list.add(new ChildOccurances("loader-repository", ChildOccurances.ZERO_OR_ONE)); //$NON-NLS-1$
+ list.add(new ChildOccurances("local-directory", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ list.add(new ChildOccurances("classpath", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ list.add(new ChildOccurances("mbean", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ children.put("server", list); //$NON-NLS-1$
list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("loader-repository-config", ChildOccurances.ZERO_TO_INFINITY));
- children.put("loader-repository", list);
+ list.add(new ChildOccurances("loader-repository-config", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ children.put("loader-repository", list); //$NON-NLS-1$
- children.put("loader-repository-config", new ArrayList<ChildOccurances>());
- children.put("local-directory", new ArrayList<ChildOccurances>());
- children.put("classpath", new ArrayList<ChildOccurances>());
+ children.put("loader-repository-config", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
+ children.put("local-directory", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
+ children.put("classpath", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("constructor", ChildOccurances.ZERO_OR_ONE));
- list.add(new ChildOccurances("xmbean", ChildOccurances.ZERO_OR_ONE));
- list.add(new ChildOccurances("attribute", ChildOccurances.ZERO_TO_INFINITY));
- list.add(new ChildOccurances("depends", ChildOccurances.ZERO_TO_INFINITY));
- list.add(new ChildOccurances("depends-list", ChildOccurances.ZERO_TO_INFINITY));
- children.put("mbean", list);
+ list.add(new ChildOccurances("constructor", ChildOccurances.ZERO_OR_ONE)); //$NON-NLS-1$
+ list.add(new ChildOccurances("xmbean", ChildOccurances.ZERO_OR_ONE)); //$NON-NLS-1$
+ list.add(new ChildOccurances("attribute", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ list.add(new ChildOccurances("depends", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ list.add(new ChildOccurances("depends-list", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ children.put("mbean", list); //$NON-NLS-1$
- children.put("xmbean", new ArrayList<ChildOccurances>());
+ children.put("xmbean", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("arg", ChildOccurances.ZERO_TO_INFINITY));
- children.put("constructor", list);
+ list.add(new ChildOccurances("arg", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ children.put("constructor", list); //$NON-NLS-1$
- children.put("arg", new ArrayList<ChildOccurances>());
- children.put("attribute", new ArrayList<ChildOccurances>());
- children.put("property", new ArrayList<ChildOccurances>());
+ children.put("arg", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
+ children.put("attribute", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
+ children.put("property", new ArrayList<ChildOccurances>()); //$NON-NLS-1$
list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("mbean", ChildOccurances.ZERO_TO_INFINITY));
- children.put("depends", list);
+ list.add(new ChildOccurances("mbean", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ children.put("depends", list); //$NON-NLS-1$
list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("depends-list-element", ChildOccurances.ONE_TO_INFINITY));
- children.put("depends-list", list);
+ list.add(new ChildOccurances("depends-list-element", ChildOccurances.ONE_TO_INFINITY)); //$NON-NLS-1$
+ children.put("depends-list", list); //$NON-NLS-1$
list = new ArrayList<ChildOccurances>();
- list.add(new ChildOccurances("mbean", ChildOccurances.ZERO_TO_INFINITY));
- children.put("depends-list-element", list);
+ list.add(new ChildOccurances("mbean", ChildOccurances.ZERO_TO_INFINITY)); //$NON-NLS-1$
+ children.put("depends-list-element", list); //$NON-NLS-1$
}
private void fillAttributes() {
- attributes.put("server", new ArrayList());
+ attributes.put("server", new ArrayList()); //$NON-NLS-1$
/*
* <!ELEMENT loader-repository (#PCDATA | loader-repository-config)*>
* <!ATTLIST loader-repository loaderRepositoryClass CDATA #IMPLIED>
*/
- attributes.put("loader-repository", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("loaderRepositoryClass", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ attributes.put("loader-repository", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("loaderRepositoryClass", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
/*
* <!ELEMENT loader-repository-config (#PCDATA)>
* <!ATTLIST loader-repository-config configParserClass CDATA #IMPLIED>
*/
- attributes.put("loader-repository-config", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("configParserClass", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ attributes.put("loader-repository-config", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("configParserClass", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
@@ -232,8 +234,8 @@
* <!ELEMENT local-directory EMPTY>
* <!ATTLIST local-directory path CDATA #IMPLIED>
*/
- attributes.put("local-directory", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("path", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ attributes.put("local-directory", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("path", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
/*
@@ -242,9 +244,9 @@
<!ATTLIST classpath archives CDATA #IMPLIED>
*/
- attributes.put("classpath", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("codebase", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED),
- new DTDAttributes("archives", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ attributes.put("classpath", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("codebase", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED), //$NON-NLS-1$
+ new DTDAttributes("archives", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
@@ -256,13 +258,13 @@
<!ATTLIST mbean xmbean-dd CDATA #IMPLIED>
<!ATTLIST mbean xmbean-code CDATA #IMPLIED>
*/
- attributes.put("mbean", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("code", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED),
- new DTDAttributes("name", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED),
+ attributes.put("mbean", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("code", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED), //$NON-NLS-1$
+ new DTDAttributes("name", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED), //$NON-NLS-1$
- new DTDAttributes("interface", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED),
- new DTDAttributes("xmbean-dd", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED),
- new DTDAttributes("xmbean-code", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ new DTDAttributes("interface", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED), //$NON-NLS-1$
+ new DTDAttributes("xmbean-dd", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED), //$NON-NLS-1$
+ new DTDAttributes("xmbean-code", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
@@ -272,9 +274,9 @@
<!ATTLIST arg type CDATA #IMPLIED>
<!ATTLIST arg value CDATA #REQUIRED>
*/
- attributes.put("arg", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("type", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED),
- new DTDAttributes("value", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED)
+ attributes.put("arg", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("type", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED), //$NON-NLS-1$
+ new DTDAttributes("value", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED) //$NON-NLS-1$
}));
@@ -287,19 +289,19 @@
<!ATTLIST attribute attributeClass CDATA #IMPLIED>
<!ATTLIST attribute serialDataType (text | javaBean | jbxb) 'text'>
*/
- attributes.put("attribute", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("name", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED),
+ attributes.put("attribute", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("name", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED), //$NON-NLS-1$
- new DTDAttributes("replace", DTDAttributes.ENUM_TYPE,
- DTDAttributes.IMPLIED, "true", new String[] { "true", "false" }),
+ new DTDAttributes("replace", DTDAttributes.ENUM_TYPE, //$NON-NLS-1$
+ DTDAttributes.IMPLIED, "true", new String[] { "true", "false" }), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- new DTDAttributes("trim", DTDAttributes.ENUM_TYPE,
- DTDAttributes.IMPLIED, "true", new String[] { "true", "false" }),
+ new DTDAttributes("trim", DTDAttributes.ENUM_TYPE, //$NON-NLS-1$
+ DTDAttributes.IMPLIED, "true", new String[] { "true", "false" }), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- new DTDAttributes("attributeClass", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED),
+ new DTDAttributes("attributeClass", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED), //$NON-NLS-1$
- new DTDAttributes("serialDataType", DTDAttributes.ENUM_TYPE,
- DTDAttributes.IMPLIED, "text", new String[] { "text", "javaBean", "jbxb"})
+ new DTDAttributes("serialDataType", DTDAttributes.ENUM_TYPE, //$NON-NLS-1$
+ DTDAttributes.IMPLIED, "text", new String[] { "text", "javaBean", "jbxb"}) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}));
@@ -307,8 +309,8 @@
<!ELEMENT property (#PCDATA)>
<!ATTLIST property name CDATA #REQUIRED>
*/
- attributes.put("property", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("name", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED)
+ attributes.put("property", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("name", DTDAttributes.CDATA_TYPE, DTDAttributes.REQUIRED) //$NON-NLS-1$
}));
/*
@@ -317,9 +319,9 @@
<!ATTLIST depends optional-attribute-name CDATA #IMPLIED>
<!ATTLIST depends proxy-type CDATA #IMPLIED>
*/
- attributes.put("depends", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("optional-attribute-name", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED),
- new DTDAttributes("proxy-type", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ attributes.put("depends", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("optional-attribute-name", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED), //$NON-NLS-1$
+ new DTDAttributes("proxy-type", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
@@ -327,8 +329,8 @@
<!ELEMENT depends-list (depends-list-element)+>
<!ATTLIST depends-list optional-attribute-name CDATA #IMPLIED>
*/
- attributes.put("depends-list", Arrays.asList(new DTDAttributes[] {
- new DTDAttributes("type", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED)
+ attributes.put("depends-list", Arrays.asList(new DTDAttributes[] { //$NON-NLS-1$
+ new DTDAttributes("type", DTDAttributes.CDATA_TYPE, DTDAttributes.IMPLIED) //$NON-NLS-1$
}));
@@ -339,14 +341,14 @@
super.addEmptyDocumentProposals(contentAssistRequest);
int beginPosition = contentAssistRequest.getReplacementBeginPosition();
- String text = "<server>";
+ String text = "<server>"; //$NON-NLS-1$
int cursorPos = text.length();
contentAssistRequest.addProposal(new CompletionProposal(text, beginPosition,
0, cursorPos, null, text, null, null));
- text += "\n\t\n</server>";
+ text += "\n\t\n</server>"; //$NON-NLS-1$
contentAssistRequest.addProposal(new CompletionProposal(text, beginPosition,
- 0, cursorPos+2, null, text.replaceAll("\n", "").replaceAll("\t", ""), null, null));
+ 0, cursorPos+2, null, text.replaceAll("\n", "").replaceAll("\t", ""), null, null)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
/**
@@ -361,7 +363,7 @@
protected void addTagNameProposals(ContentAssistRequest contentAssistRequest, int childPosition) {
String parentElement = contentAssistRequest.getParent().getNodeName();
String thisNode = contentAssistRequest.getNode().getNodeName();
- if( thisNode.equals("#text")) thisNode = "";
+ if( thisNode.equals("#text")) thisNode = ""; //$NON-NLS-1$ //$NON-NLS-2$
ArrayList possibleNodes = children.get(parentElement);
ChildOccurances occ;
@@ -411,16 +413,16 @@
*/
// <element></element>
- String nName = (thisNode.getNodeName().equals("#text") ? "" : thisNode.getNodeName());
+ String nName = (thisNode.getNodeName().equals("#text") ? "" : thisNode.getNodeName()); //$NON-NLS-1$ //$NON-NLS-2$
- String emptyCompletionText = occ.name + ">";
+ String emptyCompletionText = occ.name + ">"; //$NON-NLS-1$
int cursorLoc = emptyCompletionText.length();
- emptyCompletionText += "</" + occ.name + ">";
- String descriptionText = "";
+ emptyCompletionText += "</" + occ.name + ">"; //$NON-NLS-1$ //$NON-NLS-2$
+ String descriptionText = ""; //$NON-NLS-1$
if( !isTagOpened ) {
- emptyCompletionText = "<" + emptyCompletionText;
+ emptyCompletionText = "<" + emptyCompletionText; //$NON-NLS-1$
cursorLoc++;
}
descriptionText = occ.name;
@@ -434,26 +436,26 @@
List l = attributes.get(occ.name);
Iterator i = l.iterator();
cursorLoc = -1;
- String attributes = "";
+ String attributes = ""; //$NON-NLS-1$
while( i.hasNext()) {
DTDAttributes attribute = (DTDAttributes)i.next();
if( attribute.mandatory == DTDAttributes.REQUIRED) {
- attributes += " " + attribute.name + "=\"" + attribute.defaultValue + "\"";
- if( cursorLoc == -1 && attribute.defaultValue.equals("")) {
+ attributes += " " + attribute.name + "=\"" + attribute.defaultValue + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ if( cursorLoc == -1 && attribute.defaultValue.equals("")) { //$NON-NLS-1$
cursorLoc = occ.name.length() + attributes.length() - 1;
}
}
}
- String requiredCompletionText = occ.name + attributes + "></" + occ.name + ">";
+ String requiredCompletionText = occ.name + attributes + "></" + occ.name + ">"; //$NON-NLS-1$ //$NON-NLS-2$
if( !isTagOpened ) {
- requiredCompletionText = "<" + requiredCompletionText;
+ requiredCompletionText = "<" + requiredCompletionText; //$NON-NLS-1$
cursorLoc++;
}
- descriptionText = occ.name + " (with attributes)";
+ descriptionText = MessageFormat.format(Messages.ServiceXMLEditorConfiguration_OccurrenceNameWithAttributes, occ.name);
- if( !attributes.equals("")) {
+ if( !attributes.equals("")) { //$NON-NLS-1$
contentAssistRequest.addProposal(new CompletionProposal(requiredCompletionText,
beginPosition, nName.length(), cursorLoc != -1 ? cursorLoc : requiredCompletionText.length(),
propImage, descriptionText, null, null));
@@ -492,7 +494,7 @@
while(i.hasNext()) {
DTDAttributes att = (DTDAttributes)i.next();
if( att.name.startsWith(match) && !activeAttributes.contains(att.name) && !alreadyAddedStrings.contains(att.name)) {
- String txt = att.name + "=\"" + att.defaultValue + "\"";
+ String txt = att.name + "=\"" + att.defaultValue + "\""; //$NON-NLS-1$ //$NON-NLS-2$
contentAssistRequest.addProposal(new CompletionProposal(txt, contentAssistRequest.getReplacementBeginPosition(),
match.length(), txt.length()-1, attImage, att.name, null, null));
}
@@ -522,10 +524,10 @@
}
}
if( found ) {
- if( elementName.equals("mbean") && attribute.getName().equals("code")) {
+ if( elementName.equals("mbean") && attribute.getName().equals("code")) { //$NON-NLS-1$ //$NON-NLS-2$
handleCodeClassNameCompletion(contentAssistRequest);
}
- if( elementName.equals("attribute") && attribute.getName().equals("name")) {
+ if( elementName.equals("attribute") && attribute.getName().equals("name")) { //$NON-NLS-1$ //$NON-NLS-2$
handleAttributeNamesCompletion(contentAssistRequest);
}
}
@@ -534,7 +536,7 @@
protected void handleCodeClassNameCompletion(ContentAssistRequest contentAssistRequest) {
String match = contentAssistRequest.getMatchString();
String attributeCurrentValue;
- if( match.startsWith("\"")) attributeCurrentValue = match.substring(1);
+ if( match.startsWith("\"")) attributeCurrentValue = match.substring(1); //$NON-NLS-1$
else attributeCurrentValue = match;
ResultFilter filter = new ResultFilter() {
@@ -547,7 +549,7 @@
IType type = (IType)found;
String[] interfaces = type.getSuperInterfaceNames();
for( int i = 0; i < interfaces.length; i++ ) {
- if( interfaces[i].equals(type.getElementName() + "MBean")) {
+ if( interfaces[i].equals(type.getElementName() + "MBean")) { //$NON-NLS-1$
return true;
}
}
@@ -568,14 +570,14 @@
protected void handleAttributeNamesCompletion(ContentAssistRequest contentAssistRequest) {
String match = contentAssistRequest.getMatchString();
String attributeCurrentValue;
- if( match.startsWith("\"")) attributeCurrentValue = match.substring(1);
+ if( match.startsWith("\"")) attributeCurrentValue = match.substring(1); //$NON-NLS-1$
else attributeCurrentValue = match;
Node node = contentAssistRequest.getNode();
Node mbeanNode = node.getParentNode();
NamedNodeMap mbeanAttributes = mbeanNode.getAttributes();
- Node att = mbeanAttributes.getNamedItem("code");
+ Node att = mbeanAttributes.getNamedItem("code"); //$NON-NLS-1$
String codeClass = att.getNodeValue();
IType type = ServiceXMLEditorUtil.findType(codeClass);
if( type != null ) {
@@ -634,7 +636,7 @@
Node currentNode = getCurrentNode(document, region.getOffset() );
Attr attr = getCurrentAttrNode(currentNode, region.getOffset());
- if( currentNode.getNodeName().equals("mbean") && attr != null && attr.getName().equals("code")) {
+ if( currentNode.getNodeName().equals("mbean") && attr != null && attr.getName().equals("code")) { //$NON-NLS-1$ //$NON-NLS-2$
IJavaSearchScope scope = SearchEngine.createWorkspaceScope();
SearchPattern codePattern = SearchPattern.createPattern(attr.getValue(),
@@ -685,7 +687,7 @@
EditorUtility.revealInEditor(part, element);
}
} catch (PartInitException e) {
- IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Unable to display element in editor.", e);
+ IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, Messages.ServiceXMLEditorConfiguration_UnableToDisplayInEditor, e);
Activator.getDefault().getLog().log(status);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLOutlineConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLOutlineConfiguration.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLOutlineConfiguration.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -190,7 +190,7 @@
if( menuProviders == null ) {
ArrayList list = new ArrayList();
IExtensionRegistry registry = Platform.getExtensionRegistry();
- IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "ServiceXMLOutlineMenuProvider");
+ IConfigurationElement[] cf = registry.getConfigurationElementsFor(Activator.PLUGIN_ID, "ServiceXMLOutlineMenuProvider"); //$NON-NLS-1$
for( int i = 0; i < cf.length; i++ ) {
try {
list.add(new OutlineMenuProvider(cf[i]));
@@ -226,7 +226,7 @@
private static class OutlineMenuProvider {
private IServiceXMLOutlineActionProvider listener;
public OutlineMenuProvider(IConfigurationElement element) throws CoreException {
- listener = (IServiceXMLOutlineActionProvider)element.createExecutableExtension("class");
+ listener = (IServiceXMLOutlineActionProvider)element.createExecutableExtension("class"); //$NON-NLS-1$
}
public void menuAboutToShow(IMenuManager manager, ISelection selection) {
if( listener != null ) listener.menuAboutToShow(manager, selection);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/proposals/internal/ConvertNodeToXPathDialogOutlineMenuItemProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/proposals/internal/ConvertNodeToXPathDialogOutlineMenuItemProvider.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/proposals/internal/ConvertNodeToXPathDialogOutlineMenuItemProvider.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -27,6 +27,7 @@
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.wst.xml.core.internal.document.AttrImpl;
import org.jboss.ide.eclipse.as.ui.dialogs.ConvertNodeToXPathDialog.ConvertNodeRunnable;
+import org.jboss.ide.eclipse.as.ui.mbeans.Messages;
import org.jboss.ide.eclipse.as.ui.mbeans.editors.proposals.IServiceXMLOutlineActionProvider;
import org.w3c.dom.Node;
@@ -56,8 +57,8 @@
new ConvertNodeRunnable(n2, attName2).run();
}
};
- temp.setText("Add to XPaths");
- temp.setDescription("Add this element to the list of xpaths you can edit from the properties view.");
+ temp.setText(Messages.ConvertNodeToXPathDialogOutlineMenuItemProvider_AddToXPathsAction);
+ temp.setDescription(Messages.ConvertNodeToXPathDialogOutlineMenuItemProvider_AddToXPathsDescription);
manager.add(temp);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewMBeanWizard.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -98,10 +98,10 @@
private MBeanInterfacePage interfacePage;
private MBeanPage mbeanPage;
private NewFilePageExtension newFilePage;
- private static String INTERFACE_NAME = "__INTERFACE_NAME__";
+ private static final String INTERFACE_NAME = "__INTERFACE_NAME__"; //$NON-NLS-1$
public NewMBeanWizard() {
- setWindowTitle("New MBean Wizard");
+ setWindowTitle(Messages.NewMBeanWizard_WindowTitle);
}
public void createPageControls(Composite pageContainer) {
@@ -193,7 +193,7 @@
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
try {
- monitor.beginTask("Creating Files", 100);
+ monitor.beginTask(Messages.NewMBeanWizard_CreatingTaskName, 100);
SubProgressMonitor interfaceMonitor = new SubProgressMonitor(monitor, 40);
SubProgressMonitor mbeanMonitor = new SubProgressMonitor(monitor, 40);
SubProgressMonitor xmlMonitor = new SubProgressMonitor(monitor, 20);
@@ -202,13 +202,13 @@
interfacePage.createType(interfaceMonitor);
mbeanPage.createType(mbeanMonitor);
- xmlMonitor.beginTask("XMLDescriptor", 1);
+ xmlMonitor.beginTask(Messages.NewMBeanWizard_XMLTaskName, 1);
if( mbeanPage.shouldCreateDescriptor()) {
- newFilePage.setFileName(mbeanPage.getCreatedType().getElementName() + "-service.xml");
+ newFilePage.setFileName(mbeanPage.getCreatedType().getElementName() + "-service.xml"); //$NON-NLS-1$
IPath fullPath = newFilePage.getContainerFullPath();
- IPath newPath = new Path(fullPath.segment(0)).append("META-INF");
+ IPath newPath = new Path(fullPath.segment(0)).append("META-INF"); //$NON-NLS-1$
createContainer(newPath);
newFilePage.setContainerFullPath(newPath);
@@ -281,9 +281,9 @@
newFilePage = new NewFilePageExtension(sel);
Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
- String ext = "xml";
+ String ext = "xml"; //$NON-NLS-1$
newFilePage.defaultFileExtension = "."+ext; //$NON-NLS-1$
- newFilePage.filterExtensions = new String[] {"*.xml"};
+ newFilePage.filterExtensions = new String[] {"*.xml"}; //$NON-NLS-1$
addPage(newFilePage);
//
}
@@ -316,7 +316,7 @@
String fieldName = null;
if( field == fMBeanNameDialogField ) {
String txt = fMBeanNameDialogField.getText();
- fMBeanInterfaceNameDialogField.getTextControl(null).setText(txt + "MBean");
+ fMBeanInterfaceNameDialogField.getTextControl(null).setText(txt + "MBean"); //$NON-NLS-1$
fieldName = INTERFACE_NAME;
fTypeNameStatus = typeNameChanged(getTypeName());
fMBeanNameStatus = typeNameChanged(fMBeanNameDialogField.getText());
@@ -385,7 +385,7 @@
protected void handleFieldChanged(String fieldName) {
super.handleFieldChanged(fieldName);
- if( fieldName == INTERFACE_NAME) {
+ if( INTERFACE_NAME.equals(fieldName)) {
mbeanPage.setMBeanName(fMBeanNameDialogField.getText());
}
doStatusUpdate();
@@ -442,7 +442,7 @@
IResource resource= cu.getResource();
if (resource.exists()) {
- status.setError(NewWizardMessages.NewTypeWizardPage_error_TypeNameExists + "(" + typeName + ")");
+ status.setError(NewWizardMessages.NewTypeWizardPage_error_TypeNameExists + "(" + typeName + ")"); //$NON-NLS-1$ //$NON-NLS-2$
return status;
}
URI location= resource.getLocationURI();
@@ -602,10 +602,10 @@
PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream, charSet));
writer.println("<?xml version=\"1.0\" encoding=\"" + charSet + "\"?>"); //$NON-NLS-1$ //$NON-NLS-2$
- writer.println("<server>");
- writer.println("\t<mbean code=\"" + mbeanPage.getCreatedType().getFullyQualifiedName() + "\" name=\"your.domain:key=value\">");
- writer.println("\t</mbean>");
- writer.println("</server>");
+ writer.println("<server>"); //$NON-NLS-1$
+ writer.println("\t<mbean code=\"" + mbeanPage.getCreatedType().getFullyQualifiedName() + "\" name=\"your.domain:key=value\">"); //$NON-NLS-1$ //$NON-NLS-2$
+ writer.println("\t</mbean>"); //$NON-NLS-1$
+ writer.println("</server>"); //$NON-NLS-1$
writer.flush();
outputStream.close();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewSessionBeanWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewSessionBeanWizard.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/NewSessionBeanWizard.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -30,6 +30,7 @@
import org.eclipse.jdt.internal.ui.wizards.NewElementWizard;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import org.jboss.ide.eclipse.as.ui.mbeans.Messages;
import org.jboss.ide.eclipse.as.ui.mbeans.wizards.pages.NewSessionBeanWizardPage;
/**
@@ -46,7 +47,7 @@
{
super();
setDefaultPageImageDescriptor(JavaPluginImages.DESC_WIZBAN_NEWCLASS);
- setWindowTitle("New Session Bean");
+ setWindowTitle(Messages.NewSessionBeanWizard_WindowTitle);
}
public void init(IWorkbench workbench, IStructuredSelection selection)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewMessageDrivenBeanWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewMessageDrivenBeanWizardPage.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewMessageDrivenBeanWizardPage.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -61,7 +61,7 @@
public NewMessageDrivenBeanWizardPage()
{
- super(true, "New Message Driven Bean Page");
+ super(true, Messages.NewMessageDrivenBeanWizardPage_Name);
setTitle(Messages.NewMessageBeanWizardMessage);
setDescription(Messages.NewMessageBeanWizardDescription);
}
@@ -99,7 +99,7 @@
WorkbenchHelp.setHelp(composite, IJavaHelpContextIds.NEW_CLASS_WIZARD_PAGE);
ArrayList superInterfaces = new ArrayList();
- superInterfaces.add("javax.jms.MessageListener");
+ superInterfaces.add("javax.jms.MessageListener"); //$NON-NLS-1$
setSuperInterfaces(superInterfaces, true);
}
@@ -131,11 +131,11 @@
ImportDeclaration importDecl = ast.newImportDeclaration();
importDecl.setOnDemand(false);
importDecl.setName(ast.newName(new String[]
- {"javax", "ejb", "MessageDriven"}));
+ {"javax", "ejb", "MessageDriven"})); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
beanAstUnit.imports().add(importDecl);
MarkerAnnotation sessionAnnotation = ast.newMarkerAnnotation();
- sessionAnnotation.setTypeName(ast.newSimpleName("MessageDriven"));
+ sessionAnnotation.setTypeName(ast.newSimpleName("MessageDriven")); //$NON-NLS-1$
TypeDeclaration type = (TypeDeclaration) beanAstUnit.types().get(0);
type.modifiers().add(sessionAnnotation);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/wizards/pages/NewSessionBeanWizardPage.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -74,15 +74,15 @@
public class NewSessionBeanWizardPage extends NewTypeWizardPage
{
- public static final String BEAN_PACKAGE_NAME = "NewSessionBeanWizard.beanPackageName";
+ public static final String BEAN_PACKAGE_NAME = "NewSessionBeanWizard.beanPackageName"; //$NON-NLS-1$
- public static final String BEAN_NAME = "NewSessionBeanWizard.beanName";
+ public static final String BEAN_NAME = "NewSessionBeanWizard.beanName"; //$NON-NLS-1$
- public static final String REMOTE_INTERFACE_PACKAGE_NAME = "NewSessionBeanWizard.remoteInterfacePackageName";
+ public static final String REMOTE_INTERFACE_PACKAGE_NAME = "NewSessionBeanWizard.remoteInterfacePackageName"; //$NON-NLS-1$
- public static final String STATEFUL = "Stateful";
+ public static final String STATEFUL = "Stateful"; //$NON-NLS-1$
- public static final String STATELESS = "Stateless";
+ public static final String STATELESS = "Stateless"; //$NON-NLS-1$
private String remoteInterfacePackage, beanClass, remoteInterfaceName, beanPackage;
@@ -117,7 +117,7 @@
setDescription(Messages.NewSessionBeanWizardDescription);
packageCompletionProcessor = new JavaPackageCompletionProcessor();
- beanClass = "";
+ beanClass = ""; //$NON-NLS-1$
}
public void createControl(Composite parent)
@@ -228,7 +228,7 @@
fillAcrossColumns(beanNameText, nColumns - 1);
Label sessionClassNameLabel = createLabel(composite, Messages.NewSessionBeanWizardBeanClassNameLabel);
- beanClassName = createLabelWithImage(composite, "", JavaUI.getSharedImages().getImage(
+ beanClassName = createLabelWithImage(composite, "", JavaUI.getSharedImages().getImage( //$NON-NLS-1$
ISharedImages.IMG_OBJS_CLASS), nColumns - 1);
}
@@ -278,7 +278,7 @@
ControlContentAssistHelper.createTextContentAssistant(remoteInterfacePackageText, packageCompletionProcessor);
createLabel(composite, Messages.NewSessionBeanWizardRemoteInterfaceNameLabel);
- remoteInterfaceNameLabel = createLabelWithImage(composite, "", JavaUI.getSharedImages().getImage(
+ remoteInterfaceNameLabel = createLabelWithImage(composite, "", JavaUI.getSharedImages().getImage( //$NON-NLS-1$
ISharedImages.IMG_OBJS_INTERFACE), nColumns - 1);
}
@@ -307,13 +307,13 @@
ImportDeclaration importDecl = ast.newImportDeclaration();
importDecl.setName(ast.newName(new String[]
- {"javax", "ejb", beanType}));
+ {"javax", "ejb", beanType})); //$NON-NLS-1$ //$NON-NLS-2$
importDecl.setOnDemand(false);
beanAstUnit.imports().add(importDecl);
importDecl = ast.newImportDeclaration();
- String pkgElements[] = remoteInterfacePackage.split("\\.");
+ String pkgElements[] = remoteInterfacePackage.split("\\."); //$NON-NLS-1$
String fullImport[] = new String[pkgElements.length + 1];
System.arraycopy(pkgElements, 0, fullImport, 0, pkgElements.length);
fullImport[fullImport.length - 1] = remoteInterfaceName;
@@ -348,11 +348,11 @@
public ICompilationUnit createRemoteInterface(IProgressMonitor monitor) throws CoreException, InterruptedException
{
// lame.
- String source = "package " + remoteInterfacePackage + ";\n" + "\n" + "import javax.ejb.Remote;\n" + "\n"
- + "@Remote\n" + "public interface " + remoteInterfaceName + " {\n" + "\n" + "}\n";
+ String source = "package " + remoteInterfacePackage + ";\n" + "\n" + "import javax.ejb.Remote;\n" + "\n" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+ + "@Remote\n" + "public interface " + remoteInterfaceName + " {\n" + "\n" + "}\n"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- return remoteInterfacePackageFragment.createCompilationUnit(remoteInterfaceName + ".java", source, true, monitor);
+ return remoteInterfacePackageFragment.createCompilationUnit(remoteInterfaceName + ".java", source, true, monitor); //$NON-NLS-1$
// AST ast = new AST();
// CompilationUnit unit = ast.newCompilationUnit();
// PackageDeclaration packageDeclaration = ast.newPackageDeclaration();
@@ -398,7 +398,7 @@
else if (fieldName.equals(BEAN_NAME))
{
remoteInterfaceName = beanNameText.getText();
- beanClass = beanNameText.getText() + "Bean";
+ beanClass = beanNameText.getText() + "Bean"; //$NON-NLS-1$
}
}
catch (CoreException e)
@@ -423,19 +423,19 @@
if (val.getSeverity() == IStatus.ERROR)
{
status.setError(NewWizardMessages.bind(NewWizardMessages.NewTypeWizardPage_error_InvalidPackageName, val
- .getMessage())); //$NON-NLS-1$
+ .getMessage()));
throw new CoreException(status);
}
else if (val.getSeverity() == IStatus.WARNING)
{
status.setWarning(NewWizardMessages.bind(
- NewWizardMessages.NewTypeWizardPage_warning_DiscouragedPackageName, val.getMessage())); //$NON-NLS-1$
+ NewWizardMessages.NewTypeWizardPage_warning_DiscouragedPackageName, val.getMessage()));
// continue
}
}
else
{
- status.setWarning(NewWizardMessages.NewTypeWizardPage_warning_DefaultPackageDiscouraged); //$NON-NLS-1$
+ status.setWarning(NewWizardMessages.NewTypeWizardPage_warning_DefaultPackageDiscouraged);
}
IPackageFragmentRoot root = getPackageFragmentRoot();
@@ -454,7 +454,7 @@
IPath packagePath = rootPath.append(packageName.replace('.', '/'));
if (outputPath.isPrefixOf(packagePath))
{
- status.setError(NewWizardMessages.NewTypeWizardPage_error_ClashOutputLocation); //$NON-NLS-1$
+ status.setError(NewWizardMessages.NewTypeWizardPage_error_ClashOutputLocation);
throw new CoreException(status);
}
}
@@ -490,20 +490,20 @@
public TypeNameGetter()
{
- typeName = "";
+ typeName = ""; //$NON-NLS-1$
}
public void run()
{
if (beanNameText == null)
{
- typeName = "";
+ typeName = ""; //$NON-NLS-1$
return;
}
if (!beanNameText.isDisposed())
{
- typeName = beanNameText.getText() + "Bean";
+ typeName = beanNameText.getText() + "Bean"; //$NON-NLS-1$
}
}
}
@@ -522,7 +522,7 @@
{
if (pkg != null && pkg.length() > 0)
{
- return pkg + "." + clazz;
+ return pkg + "." + clazz; //$NON-NLS-1$
}
else
return clazz;
@@ -544,7 +544,7 @@
String beanName = beanNameText.getText();
beanClassName.setText(getClassName(packageName, beanName)
- + (beanName != null && beanName.length() > 0 ? "Bean" : ""));
+ + (beanName != null && beanName.length() > 0 ? "Bean" : "")); //$NON-NLS-1$ //$NON-NLS-2$
remoteInterfaceNameLabel.setText(getClassName(interfacePackageName, beanName));
updateRemoteInterfaceValues();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/PackageTypeSearcher.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -57,7 +57,7 @@
private ResultFilter filter;
public PackageTypeSearcher(String string) {
fullString = string;
- int lastDot = string.lastIndexOf(".");
+ int lastDot = string.lastIndexOf("."); //$NON-NLS-1$
if( lastDot == -1 ) {
packageName = string;
remainder = null;
@@ -178,7 +178,7 @@
for (int i = 0; i < classFiles.length; i++) {
String typeName = classFiles[i].getType().getElementName();
- if (typeName.equals(""))
+ if (typeName.equals("")) //$NON-NLS-1$
continue;
if (typeName.toLowerCase().startsWith(remainder.toLowerCase()) && (filter == null || filter.accept(classFiles[i].getType())))
returnList.add(classFiles[i].getType());
@@ -201,7 +201,7 @@
}
public ICompletionProposal[] generateProposals(int beginIndex) {
- return generateProposals(beginIndex, "", "");
+ return generateProposals(beginIndex, "", ""); //$NON-NLS-1$//$NON-NLS-2$
}
public ICompletionProposal[] generateProposals(int beginIndex,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/ServiceXMLEditorUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/ServiceXMLEditorUtil.java 2009-05-25 04:47:33 UTC (rev 15476)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/util/ServiceXMLEditorUtil.java 2009-05-25 05:22:00 UTC (rev 15477)
@@ -75,13 +75,13 @@
public static String[] findAttributesFromMethods(IMethod[] methods, String attributeCurrentValue) {
ArrayList attributeNames = new ArrayList();
- String getterPrefix = "get" + attributeCurrentValue;
+ String getterPrefix = "get" + attributeCurrentValue; //$NON-NLS-1$
for( int i = 0; i < methods.length; i++ ) {
if( methods[i].getElementName().startsWith(getterPrefix)) {
String atName = methods[i].getElementName().substring(3);
- String setterName = "set" + atName;
+ String setterName = "set" + atName; //$NON-NLS-1$
for( int j = 0; j < methods.length; j++ ) {
if( methods[j].getElementName().equals(setterName)) {
// there's a getter and a setter...
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15476 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:47:33 -0400 (Mon, 25 May 2009)
New Revision: 15476
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java 2009-05-25 04:47:15 UTC (rev 15475)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/Messages.java 2009-05-25 04:47:33 UTC (rev 15476)
@@ -23,7 +23,7 @@
import org.eclipse.osgi.util.NLS;
-public class Messages {
+public class Messages extends NLS {
/* XML service editor */
public static String ServiceXMLAddAttributeTags;
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15475 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:47:15 -0400 (Mon, 25 May 2009)
New Revision: 15475
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/WTPOveridePlugin.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/WTPOveridePlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/WTPOveridePlugin.java 2009-05-25 04:46:05 UTC (rev 15474)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.override.ui/src/org/jboss/ide/eclipse/as/wtp/override/WTPOveridePlugin.java 2009-05-25 04:47:15 UTC (rev 15475)
@@ -11,7 +11,7 @@
public class WTPOveridePlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.ui";
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.wtp.override.ui"; //$NON-NLS-1$
// The shared instance
private static WTPOveridePlugin plugin;
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15474 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:46:05 -0400 (Mon, 25 May 2009)
New Revision: 15474
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:46:05 UTC (rev 15474)
@@ -6,3 +6,4 @@
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/IPreferenceKeys.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -2,7 +2,7 @@
public interface IPreferenceKeys {
- public static final String ENABLED_DECORATORS = "org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.1";
- public static final String DISABLE_SHOW_SERVER_VIEW = "org.jboss.ide.eclipse.as.ui.preferences.disabled.automatic.server.view";
- public static final String RUNTIME_HOME_PREF_KEY_PREFIX = "org.jboss.ide.eclipse.as.ui.preferences.runtime.last.type.";
+ public static final String ENABLED_DECORATORS = "org.jboss.ide.eclipse.as.ui.preferences.enabledDecorators.1"; //$NON-NLS-1$
+ public static final String DISABLE_SHOW_SERVER_VIEW = "org.jboss.ide.eclipse.as.ui.preferences.disabled.automatic.server.view"; //$NON-NLS-1$
+ public static final String RUNTIME_HOME_PREF_KEY_PREFIX = "org.jboss.ide.eclipse.as.ui.preferences.runtime.last.type."; //$NON-NLS-1$
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -69,8 +69,8 @@
if( !prefs.getBoolean(IPreferenceKeys.ENABLED_DECORATORS)) {
IDecoratorManager manager = WorkbenchPlugin.getDefault().getDecoratorManager();
- manager.setEnabled("org.jboss.tools.as.wst.server.ui.navigatorDecorator", true);
- manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator", true);
+ manager.setEnabled("org.jboss.tools.as.wst.server.ui.navigatorDecorator", true); //$NON-NLS-1$
+ manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator", true); //$NON-NLS-1$
prefs.setValue(IPreferenceKeys.ENABLED_DECORATORS, true);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -36,25 +36,25 @@
*/
public class JBossServerUISharedImages {
- public static final String IMG_JBOSS = "jboss";
- public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration";
+ public static final String IMG_JBOSS = "jboss"; //$NON-NLS-1$
+ public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo";
- public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo";
- public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo";
- public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo";
- public static final String WIZBAN_JBOSS_EAP_LOGO = "jbossEAPlogo";
- public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo";
- public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE";
- public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE";
- public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
- public static final String PUBLISH_IMAGE = "PUBLISH_IMAGE";
- public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE";
- public static final String JMX_IMAGE = "JMX_IMAGE";
- public static final String EXPLORE_IMAGE = "EXPLORE_IMAGE";
- public static final String XPATH_LEVEL_1 = "xpath_level_1";
- public static final String XPATH_LEVEL_2 = "xpath_level_2";
- public static final String XPATH_LEVEL_3 = "xpath_level_3";
+ public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS_EAP_LOGO = "jbossEAPlogo"; //$NON-NLS-1$
+ public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo"; //$NON-NLS-1$
+ public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; //$NON-NLS-1$
+ public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE"; //$NON-NLS-1$
+ public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE"; //$NON-NLS-1$
+ public static final String PUBLISH_IMAGE = "PUBLISH_IMAGE"; //$NON-NLS-1$
+ public static final String UNPUBLISH_IMAGE = "UNPUBLISH_IMAGE"; //$NON-NLS-1$
+ public static final String JMX_IMAGE = "JMX_IMAGE"; //$NON-NLS-1$
+ public static final String EXPLORE_IMAGE = "EXPLORE_IMAGE"; //$NON-NLS-1$
+ public static final String XPATH_LEVEL_1 = "xpath_level_1"; //$NON-NLS-1$
+ public static final String XPATH_LEVEL_2 = "xpath_level_2"; //$NON-NLS-1$
+ public static final String XPATH_LEVEL_3 = "xpath_level_3"; //$NON-NLS-1$
@@ -68,24 +68,24 @@
descriptors = new Hashtable<String, Object>();
Bundle pluginBundle = JBossServerUIPlugin.getDefault().getBundle();
- descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle, "/icons/jboss.gif"));
- descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle, "/icons/jboss-configuration.gif"));
+ descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle, "/icons/jboss.gif")); //$NON-NLS-1$
+ descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle, "/icons/jboss-configuration.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif"));
- descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif"));
- descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif"));
- descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif"));
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle, "/icons/logoEAP.gif"));
- descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif"));
- descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif"));
- descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif"));
- descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif"));
- descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/unpublish.gif"));
- descriptors.put(JMX_IMAGE, createImageDescriptor(pluginBundle, "/icons/jmeth_obj.gif"));
- descriptors.put(EXPLORE_IMAGE, createImageDescriptor(pluginBundle, "/icons/actions/xpl/explore.gif"));
- descriptors.put(XPATH_LEVEL_1, createImageDescriptor(pluginBundle, "icons/xpath_level_1.gif"));
- descriptors.put(XPATH_LEVEL_2, createImageDescriptor(pluginBundle, "icons/xpath_level_2.gif"));
- descriptors.put(XPATH_LEVEL_3, createImageDescriptor(pluginBundle, "icons/xpath_level_3.gif"));
+ descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle, "/icons/logoEAP.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif")); //$NON-NLS-1$
+ descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif")); //$NON-NLS-1$
+ descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif")); //$NON-NLS-1$
+ descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif")); //$NON-NLS-1$
+ descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/unpublish.gif")); //$NON-NLS-1$
+ descriptors.put(JMX_IMAGE, createImageDescriptor(pluginBundle, "/icons/jmeth_obj.gif")); //$NON-NLS-1$
+ descriptors.put(EXPLORE_IMAGE, createImageDescriptor(pluginBundle, "/icons/actions/xpl/explore.gif")); //$NON-NLS-1$
+ descriptors.put(XPATH_LEVEL_1, createImageDescriptor(pluginBundle, "icons/xpath_level_1.gif")); //$NON-NLS-1$
+ descriptors.put(XPATH_LEVEL_2, createImageDescriptor(pluginBundle, "icons/xpath_level_2.gif")); //$NON-NLS-1$
+ descriptors.put(XPATH_LEVEL_3, createImageDescriptor(pluginBundle, "icons/xpath_level_3.gif")); //$NON-NLS-1$
Iterator<String> iter = descriptors.keySet().iterator();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ChangeTimeStampActionDelegate.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -118,7 +118,7 @@
if(isEar) {
IVirtualComponent component = ComponentCore.createComponent(project);
IPath path = component.getRootFolder().getProjectRelativePath();
- IFile f = project.getFile(path.append("META-INF").append("application.xml"));
+ IFile f = project.getFile(path.append("META-INF").append("application.xml")); //$NON-NLS-1$ //$NON-NLS-2$
if(f != null && f.exists()) {
fs.add(f);
}
@@ -126,7 +126,7 @@
if(isWar && !isReferencedByEar) {
IVirtualComponent component = ComponentCore.createComponent(project);
IPath path = component.getRootFolder().getProjectRelativePath();
- IFile f = project.getFile(path.append("WEB-INF").append("web.xml"));
+ IFile f = project.getFile(path.append("WEB-INF").append("web.xml")); //$NON-NLS-1$ //$NON-NLS-2$
if(f != null && f.exists()) {
fs.add(f);
}
@@ -134,7 +134,7 @@
if(isESBProject(project)) {
IVirtualComponent component = ComponentCore.createComponent(project);
IPath path = component.getRootFolder().getProjectRelativePath();
- IFile f = project.getFile(path.append("META-INF").append("jboss-esb.xml"));
+ IFile f = project.getFile(path.append("META-INF").append("jboss-esb.xml")); //$NON-NLS-1$ //$NON-NLS-2$
if(f != null && f.exists()) {
fs.add(f);
}
@@ -143,7 +143,7 @@
return fs;
}
- private final static String ESB_PROJECT_FACET = "jst.jboss.esb";
+ private final static String ESB_PROJECT_FACET = "jst.jboss.esb"; //$NON-NLS-1$
private static boolean isESBProject(IProject project) {
IFacetedProject facetedProject = null;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DebugServerActionDelegate.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -26,7 +26,7 @@
String name = selected == null ? "" : selected.getName(); //$NON-NLS-1$
if( selected != null && selected.getServerState() == IServer.STATE_STARTED)
return NLS.bind(ServerActionMessages.RESTART_IN_DEBUG_MODE, name);
- return NLS.bind(ServerActionMessages.START_IN_DEBUG_MODE, name); //$NON-NLS-2$
+ return NLS.bind(ServerActionMessages.START_IN_DEBUG_MODE, name);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -23,6 +23,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
+import org.jboss.ide.eclipse.as.ui.Messages;
/**
* @author snjeza
@@ -31,9 +32,9 @@
public class ExploreUtils {
- public final static String PATH = "{%}";
- public final static String EXPLORE = "Explore";
- public final static String EXPLORE_DESCRIPTION = "Explore deploy directory";
+ public final static String PATH = "{%}"; //$NON-NLS-1$
+ public final static String EXPLORE = Messages.ExploreUtils_Action_Text;
+ public final static String EXPLORE_DESCRIPTION = Messages.ExploreUtils_Description;
private static String exploreFolderCommand;
private static String[] exploreFolderCommandArray;
private static String exploreFileCommand;
@@ -52,27 +53,28 @@
return exploreFileCommand;
}
+ @SuppressWarnings("nls")
private static void setExploreCommands() {
if (Platform.OS_MACOSX.equals(Platform.getOS())) {
- exploreFolderCommand = "/usr/bin/open -a /System/Library/CoreServices/Finder.app \""
- + PATH + "\"";
+ exploreFolderCommand = "/usr/bin/open -a /System/Library/CoreServices/Finder.app \"" //$NON-NLS-1$
+ + PATH + "\""; //$NON-NLS-1$
exploreFileCommand = exploreFolderCommand;
} else if (Platform.OS_WIN32.equals(Platform.getOS())) {
- exploreFolderCommand = "cmd /C start explorer /root,/e,\""
- + PATH + "\"";
- exploreFileCommand = "cmd /C start explorer /select,/e,\""
- + PATH + "\"";
+ exploreFolderCommand = "cmd /C start explorer /root,/e,\"" //$NON-NLS-1$
+ + PATH + "\""; //$NON-NLS-1$
+ exploreFileCommand = "cmd /C start explorer /select,/e,\"" //$NON-NLS-1$
+ + PATH + "\""; //$NON-NLS-1$
} else if (Platform.OS_LINUX.equals(Platform.getOS())) {
- if (new File("/usr/bin/nautilus").exists()) {
+ if (new File("/usr/bin/nautilus").exists()) { //$NON-NLS-1$
exploreFolderCommandArray = new String[3];
- exploreFolderCommandArray[0]="/usr/bin/nautilus";
- exploreFolderCommandArray[1]="--no-desktop";
- exploreFolderCommand = "";
- } else if (new File("/usr/bin/konqueror").exists()) {
+ exploreFolderCommandArray[0]="/usr/bin/nautilus"; //$NON-NLS-1$
+ exploreFolderCommandArray[1]="--no-desktop"; //$NON-NLS-1$
+ exploreFolderCommand = ""; //$NON-NLS-1$
+ } else if (new File("/usr/bin/konqueror").exists()) { //$NON-NLS-1$
exploreFolderCommandArray = new String[2];
- exploreFolderCommandArray[0]="/usr/bin/konqueror";
- exploreFolderCommand = "";
+ exploreFolderCommandArray[0]="/usr/bin/konqueror"; //$NON-NLS-1$
+ exploreFolderCommand = ""; //$NON-NLS-1$
}
exploreFileCommand = exploreFolderCommand;
}
@@ -87,7 +89,7 @@
ServerAttributeHelper helper = new ServerAttributeHelper(swc
.getOriginal(), swc);
String deployDirectory = helper.getAttribute(
- IDeployableServer.DEPLOY_DIRECTORY, "");
+ IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
return deployDirectory.trim();
}
@@ -130,6 +132,7 @@
}
}
+ @SuppressWarnings("nls")
public static IPath getDeployPath(IDeployableServer server,IModule[] moduleTree) {
IPath root = new Path( server.getDeployFolder() );
String type, name;
@@ -139,18 +142,18 @@
if( new Path(name).segmentCount() > 1 )
// we strongly suspect this is a binary object and not a project
return root.append(new Path(name).lastSegment());
- if( "jst.ear".equals(type))
- root = root.append(name + ".ear");
- else if( "jst.web".equals(type))
- root = root.append(name + ".war");
- else if( "jst.utility".equals(type) && i >= 1 && "jst.web".equals(moduleTree[i-1].getModuleType().getId()))
- root = root.append("WEB-INF").append("lib").append(name + ".jar");
- else if( "jst.connector".equals(type)) {
- root = root.append(name + ".rar");
- } else if( "jst.jboss.esb".equals(type)){
- root = root.append(name + ".esb");
+ if( "jst.ear".equals(type)) //$NON-NLS-1$
+ root = root.append(name + ".ear"); //$NON-NLS-1$
+ else if( "jst.web".equals(type)) //$NON-NLS-1$
+ root = root.append(name + ".war"); //$NON-NLS-1$
+ else if( "jst.utility".equals(type) && i >= 1 && "jst.web".equals(moduleTree[i-1].getModuleType().getId())) //$NON-NLS-1$ //$NON-NLS-2$
+ root = root.append("WEB-INF").append("lib").append(name + ".jar"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ else if( "jst.connector".equals(type)) { //$NON-NLS-1$
+ root = root.append(name + ".rar"); //$NON-NLS-1$
+ } else if( "jst.jboss.esb".equals(type)){ //$NON-NLS-1$
+ root = root.append(name + ".esb"); //$NON-NLS-1$
}else
- root = root.append(name + ".jar");
+ root = root.append(name + ".jar"); //$NON-NLS-1$
}
return root;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/SelectServerActionDelegate.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -118,7 +118,7 @@
private void createNewServerItem(Menu menu) {
MenuItem item = new MenuItem(menu, SWT.PUSH);
- item.setText("New server...");
+ item.setText(ServerActionMessages.SelectServerActionDelegate_NewServerMenuItem);
item.setImage(JBossServerUISharedImages.getImage(JBossServerUISharedImages.GENERIC_SERVER_IMAGE));
item.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerManager.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -110,7 +110,7 @@
public String getSelectedServerId() {
String result = getDefaultWebServer();
- return result == null ? "" : result;
+ return result == null ? "" : result; //$NON-NLS-1$
}
public IServer getSelectedServer() {
@@ -156,7 +156,7 @@
}
}
- static String DEFAULT_WEB_SERVER = JBossServerUIPlugin.PLUGIN_ID + ".defaultWebServer";
+ static String DEFAULT_WEB_SERVER = JBossServerUIPlugin.PLUGIN_ID + ".defaultWebServer"; //$NON-NLS-1$
static String getDefaultWebServer() {
String result = getInstancePreference(DEFAULT_WEB_SERVER);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ChangePortDialog.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -169,7 +169,7 @@
dialog.run(true, false, new IRunnableWithProgress() {
public void run(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
- monitor.beginTask("Loading...", items.length);
+ monitor.beginTask(Messages.ChangePortDialog_LoadingTaskName, items.length);
for( int i = 0; i < items.length; i++ ) {
countMatches(currentQuery);
monitor.worked(1);
@@ -218,7 +218,7 @@
return new Integer(count).toString();
}
private String safeString(String s) {
- return s == null ? "" : s;
+ return s == null ? "" : s; //$NON-NLS-1$
}
public String getSelection() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/ConvertNodeToXPathDialog.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -69,12 +69,12 @@
private Node node;
private ArrayList keyRows;
- private static final String NO_ATTRIBUTE = "NONE";
+ private static final String NO_ATTRIBUTE = "NONE"; //$NON-NLS-1$
protected ConvertNodeToXPathDialog(Shell parentShell, Node node, String attributeName) {
super(parentShell);
this.node = node;
- setAttribute(attributeName == null ? "" : attributeName);
+ setAttribute(attributeName == null ? "" : attributeName); //$NON-NLS-1$
}
protected void configureShell(Shell shell) {
@@ -117,9 +117,9 @@
main.setLayout(new GridLayout(2, false));
keyRows = new ArrayList();
Node localNode = node;
- String pathText = "";
+ String pathText = ""; //$NON-NLS-1$
while( localNode != null && !(localNode instanceof IDOMDocument)) {
- if( !localNode.getNodeName().equals("#text")) {
+ if( !localNode.getNodeName().equals("#text")) { //$NON-NLS-1$
keyRows.add(0, new NameComboPair(main, localNode));
}
localNode = localNode.getParentNode();
@@ -129,7 +129,7 @@
((NameComboPair)keyRows.get(i)).create();
}
- main.setText("Keyed Attributes");
+ main.setText(Messages.ConvertNodeToXPathDialog_KeyedAttributes);
// The very last row should not key off the same attribute name that they wish to change
@@ -148,15 +148,15 @@
ArrayList errors = super.getErrors();
NameComboPair pair = (NameComboPair)keyRows.get(keyRows.size()-1);
String val = pair.combo.getItem(pair.combo.getSelectionIndex());
- if(attribute != null && val.startsWith(attribute + "=")) {
- errors.add("You should not key off the value you wish to change");
+ if(attribute != null && val.startsWith(attribute + "=")) { //$NON-NLS-1$
+ errors.add(Messages.ConvertNodeToXPathDialog_ErrorMessage);
}
return errors;
}
public void refreshXPath() {
- String finalString = "";
+ String finalString = ""; //$NON-NLS-1$
for( int i = 0; i < keyRows.size(); i++ ) {
finalString += ((NameComboPair)keyRows.get(i)).toString();
}
@@ -189,8 +189,8 @@
Node attr = map.item(i);
if( attr instanceof AttrImpl ) {
AttrImpl impl = ((AttrImpl)attr);
- list.add(impl.getName() + "='" + impl.getValue() + "'");
- if( impl.getName().equals("name") && !attribute.equals("name"))
+ list.add(impl.getName() + "='" + impl.getValue() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+ if( impl.getName().equals("name") && !attribute.equals("name")) //$NON-NLS-1$ //$NON-NLS-2$
selectedIndex = i+1;
}
}
@@ -210,10 +210,10 @@
}
public String toString() {
- String ret = "/" + node.getNodeName();
+ String ret = "/" + node.getNodeName(); //$NON-NLS-1$
String comboSelection = combo.getItem(combo.getSelectionIndex());
if( !comboSelection.equals(NO_ATTRIBUTE))
- ret += "[@" + comboSelection + "]";
+ ret += "[@" + comboSelection + "]"; //$NON-NLS-1$ //$NON-NLS-2$
return ret;
}
}
@@ -239,7 +239,7 @@
}
public String getDisplayString() {
- return "Add to XPaths";
+ return Messages.ConvertNodeToXPathDialog_DisplayString;
}
public Image getImage() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/RequiredCredentialsDialog.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -58,7 +58,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("Server Credentials Required");
+ newShell.setText(Messages.RequiredCredentialsDialog_ShellText);
}
protected Control createDialogArea(Composite parent) {
@@ -124,7 +124,7 @@
// create OK and Cancel buttons by default
createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
true);
- createButton(parent, IDialogConstants.CANCEL_ID, "Ignore", false);
+ createButton(parent, IDialogConstants.CANCEL_ID, Messages.RequiredCredentialsDialog_IgnoreButton, false);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/TwiddleDialog.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -124,7 +124,7 @@
} );
}
} catch( Exception e ) {
- IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "Unexpected error in TwiddleDialog", e);
+ IStatus status = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, Messages.TwiddleDialog_UnexpectedError, e);
JBossServerUIPlugin.getDefault().getLog().log(status);
}
@@ -150,7 +150,7 @@
queryLabel.setLayoutData(queryLabelData);
Workbench.getInstance().getHelpSystem().setHelp(getShell(),
- "org.jboss.ide.eclipse.as.ui.twiddle_usage_tutorial_help");
+ "org.jboss.ide.eclipse.as.ui.twiddle_usage_tutorial_help"); //$NON-NLS-1$
query = new Text(main, SWT.BORDER);
FormData queryData = new FormData();
@@ -169,7 +169,7 @@
resultsData.bottom = new FormAttachment(100,-5);
resultsData.top = new FormAttachment(query, 5);
results.setLayoutData(resultsData);
- results.setFont(new Font(null, "Courier New", 8, SWT.NONE));
+ results.setFont(new Font(null, "Courier New", 8, SWT.NONE)); //$NON-NLS-1$
// set the default text
try {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -216,7 +216,7 @@
protected void createButtonsForButtonBar(Composite parent) {
// create OK and Cancel buttons by default
super.createButtonsForButtonBar(parent);
- previewButton = createButton(parent, previewId, "Preview", true);
+ previewButton = createButton(parent, previewId, Messages.XPathDialogs_PreviewButton, true);
if( name == null ) getButton(IDialogConstants.OK_ID).setEnabled(false);
addListeners();
checkErrors();
@@ -351,13 +351,13 @@
}
protected String getServerError() {
- if( server == null ) return "Please Select a Server";
+ if( server == null ) return Messages.XPathDialogs_SelectServer;
return null;
}
protected String getCategoryError() {
- if( "".equals(category)) {
- return "Category must not be blank";
+ if( "".equals(category)) { //$NON-NLS-1$
+ return Messages.XPathDialogs_BlankCategoryError;
}
return null;
}
@@ -366,7 +366,7 @@
if( message == null ) {
errorImage.setVisible(false);
errorLabel.setVisible(false);
- errorLabel.setText("");
+ errorLabel.setText(""); //$NON-NLS-1$
} else {
errorImage.setVisible(true);
errorLabel.setVisible(true);
@@ -375,7 +375,7 @@
}
protected String getNameError() {
- if( nameText.getText().equals("")) {
+ if( nameText.getText().equals("")) { //$NON-NLS-1$
return Messages.XPathNameEmpty;
}
if( server == null ) return null;
@@ -428,7 +428,7 @@
final String attText = attributeText.getText();
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- XPathQuery tmp = new XPathQuery("", getConfigFolder(server), null, xpText, attText);
+ XPathQuery tmp = new XPathQuery("", getConfigFolder(server), null, xpText, attText); //$NON-NLS-1$
tmp.setRepository(repository);
final ArrayList<XPathFileResult> list = new ArrayList<XPathFileResult>();
list.addAll(Arrays.asList(tmp.getResults()));
@@ -437,7 +437,7 @@
previewTreeViewer.setInput(list);
if( list.size() == 0 ) {
errorImage.setVisible(true);
- errorLabel.setText("No XML elements matched your search.");
+ errorLabel.setText(Messages.XPathDialogs_NoElementsMatched);
errorLabel.setVisible(true);
previewTreeViewer.getTree().setEnabled(false);
} else {
@@ -458,9 +458,7 @@
protected void layoutWidgets(Composite c) {
// create widgets
descriptionLabel = new Label(c, SWT.WRAP);
- descriptionLabel.setText("An XPath is a way to find a specific XML element inside an xml file. \n" +
- "This dialog will help you create one. These XPaths' values can then be modified\n"
- + "by using the JBoss Servers View with the Properties View.");
+ descriptionLabel.setText(Messages.XPathDialogs_XPathDescriptionLabel);
descriptionLabel.setVisible(true);
errorLabel = new Label(c, SWT.NONE);
errorImage = new Label(c, SWT.NONE);
@@ -604,8 +602,8 @@
// set some text
nameLabel.setText(Messages.XPathName);
- if( serverLabel != null ) serverLabel.setText("Server: ");
- if( categoryLabel != null ) categoryLabel.setText("Category: ");
+ if( serverLabel != null ) serverLabel.setText(Messages.XPathDialogs_ServerLabel);
+ if( categoryLabel != null ) categoryLabel.setText(Messages.XPathDialogs_CategoryLabel);
xpathLabel.setText(Messages.XPathPattern);
attributeLabel.setText(Messages.XPathAttribute);
return gridComposite;
@@ -699,16 +697,16 @@
}
public IContentProposal[] getProposals(String contents, int position) {
- if( contents.equals("") || contents.equals("/") || contents.equals(" ")) {
- return new IContentProposal[] { new XPathContentProposal("/server/", "/server/".length(), null, null)};
+ if( contents.equals("") || contents.equals("/") || contents.equals(" ")) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return new IContentProposal[] { new XPathContentProposal("/server/", "/server/".length(), null, null)}; //$NON-NLS-1$ //$NON-NLS-2$
}
int type = getType(contents);
- if( type == NEW_ELEMENT ) return getElementProposals(contents, "");
+ if( type == NEW_ELEMENT ) return getElementProposals(contents, ""); //$NON-NLS-1$
if( type == IN_ELEMENT ) return getElementProposals(contents);
- if( type == NEW_ATTRIBUTE ) return getAttributeNameProposals(contents.substring(0, contents.length()-1), "");
+ if( type == NEW_ATTRIBUTE ) return getAttributeNameProposals(contents.substring(0, contents.length()-1), ""); //$NON-NLS-1$
if( type == IN_ATTRIBUTE ) return getAttributeNameProposals(contents);
- if( type == NEW_ATTRIBUTE_VALUE ) return getAttributeValueProposals(contents, "");
+ if( type == NEW_ATTRIBUTE_VALUE ) return getAttributeValueProposals(contents, ""); //$NON-NLS-1$
if( type == IN_ATTRIBUTE_VALUE ) return getAttributeValueProposals(contents);
return new IContentProposal[]{};
}
@@ -721,7 +719,7 @@
ArrayList list = xpathCache.get(xpath);
return (XPathResultNode[]) list.toArray(new XPathResultNode[list.size()]);
}
- XPathQuery tmp = new XPathQuery("", path, "**/*.xml", xpath, null);
+ XPathQuery tmp = new XPathQuery("", path, "**/*.xml", xpath, null); //$NON-NLS-1$ //$NON-NLS-2$
tmp.setRepository(repository);
ArrayList<XPathResultNode> list = new ArrayList<XPathResultNode>();
XPathFileResult[] items = tmp.getResults();
@@ -749,11 +747,11 @@
public String[] getElementProposalStrings(String parentPath, String elementPrefix) {
TreeSet<String> set = new TreeSet<String>();
- XPathResultNode[] items = getXPath(parentPath + "*");
+ XPathResultNode[] items = getXPath(parentPath + "*"); //$NON-NLS-1$
for( int i = 0; i < items.length; i++ ) {
if( items[i].getElementName().startsWith(elementPrefix)) {
if( items[i].getElementName().equals(elementPrefix)) {
- set.addAll(Arrays.asList(getAttributeNameProposalStrings(parentPath + elementPrefix, "")));
+ set.addAll(Arrays.asList(getAttributeNameProposalStrings(parentPath + elementPrefix, ""))); //$NON-NLS-1$
} else {
set.add(parentPath + items[i].getElementName());
}
@@ -787,7 +785,7 @@
String[] results = new String[names.size()];
for( int i = 0; i < results.length; i++ ) {
- results[i] = parentPath + "[@" + names.get(i) + "=";
+ results[i] = parentPath + "[@" + names.get(i) + "="; //$NON-NLS-1$ //$NON-NLS-2$
}
return results;
}
@@ -803,7 +801,7 @@
if( eqIndex < brackIndex ) eqIndex = parentPath.length();
String attName = parentPath.substring(brackIndex+2, eqIndex);
- if( remainder.startsWith("'")) remainder = remainder.substring(1);
+ if( remainder.startsWith("'")) remainder = remainder.substring(1); //$NON-NLS-1$
ArrayList<String> values = new ArrayList<String>();
XPathResultNode[] items = getXPath(parentElementPath);
String[] attributes;
@@ -816,9 +814,9 @@
}
String[] results = new String[values.size()];
- String prefix = parentElementPath + "[@" + attName + "='";
+ String prefix = parentElementPath + "[@" + attName + "='"; //$NON-NLS-1$ //$NON-NLS-2$
for( int i = 0; i < results.length; i++ ) {
- results[i] = prefix + values.get(i) + "']/";
+ results[i] = prefix + values.get(i) + "']/"; //$NON-NLS-1$
}
Arrays.sort(results);
return convertProposals(results);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -265,10 +265,10 @@
}
private String getDeployDir() {
- return server.getRuntime() == null ? "" : makeRelative(getServer().getDeployFolder());
+ return server.getRuntime() == null ? "" : makeRelative(getServer().getDeployFolder()); //$NON-NLS-1$
}
private String getTempDeployDir() {
- return server.getRuntime() == null ? "" : makeRelative(getServer().getTempDeployFolder());
+ return server.getRuntime() == null ? "" : makeRelative(getServer().getTempDeployFolder()); //$NON-NLS-1$
}
private IDeployableServer getServer() {
@@ -276,25 +276,25 @@
}
public IStatus[] getSaveStatus() {
- String error = "";
+ String error = ""; //$NON-NLS-1$
List<Status> status = new ArrayList<Status>();
if( getRuntime() == null ) {
String msg = Messages.EditorNoRuntimeSelected;
status.add(new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, msg));
- error = error + msg + "\n";
+ error = error + msg + "\n"; //$NON-NLS-1$
}
if(!new File(makeGlobal(deployText.getText())).exists()) {
String msg = NLS.bind(Messages.EditorDeployDNE, deployText.getText());
status.add(new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, msg));
- error = error + msg + "\n";
+ error = error + msg + "\n"; //$NON-NLS-1$
}
if(!new File(makeGlobal(tempDeployText.getText())).exists()) {
String msg = NLS.bind(Messages.EditorTempDeployDNE, tempDeployText.getText());
status.add(new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, msg));
- error = error + msg + "\n";
+ error = error + msg + "\n"; //$NON-NLS-1$
}
- setErrorMessage(error.equals("") ? null : error);
+ setErrorMessage(error.equals("") ? null : error); //$NON-NLS-1$
return status.size() == 0 ? null : status.toArray(new IStatus[status.size()]);
}
@@ -310,7 +310,7 @@
this.text = deployText;
this.newDir = deployText.getText();
this.listener = deployListener;
- this.oldDir = helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
+ this.oldDir = helper.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
}
public void execute() {
helper.setAttribute(IDeployableServer.DEPLOY_DIRECTORY, newDir);
@@ -357,7 +357,7 @@
text = tempDeployText;
newDir = tempDeployText.getText();
listener = tempDeployListener;
- oldDir = helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, "");
+ oldDir = helper.getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
}
public void execute() {
helper.setAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -53,7 +53,7 @@
FormToolkit toolkit = new FormToolkit(parent.getDisplay());
Section section = toolkit.createSection(parent, ExpandableComposite.TWISTIE|ExpandableComposite.EXPANDED|ExpandableComposite.TITLE_BAR);
- section.setText("Server Polling");
+ section.setText(Messages.PollerSection_ServerPollingSection);
section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL));
Composite composite = toolkit.createComposite(section);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -60,10 +60,10 @@
if (sectionList.size() <= 0) {
IExtensionRegistry registry = Platform.getExtensionRegistry();
IConfigurationElement[] cf = registry.getConfigurationElementsFor(
- JBossServerUIPlugin.PLUGIN_ID, "ServerEditorPortSection");
+ JBossServerUIPlugin.PLUGIN_ID, "ServerEditorPortSection"); //$NON-NLS-1$
for (int i = 0; i < cf.length; i++) {
try {
- Object o = cf[i].createExecutableExtension("class");
+ Object o = cf[i].createExecutableExtension("class"); //$NON-NLS-1$
if (o != null && o instanceof IPortEditorExtension)
sectionList.add((IPortEditorExtension) o);
} catch (CoreException ce) { /* ignore */
@@ -190,7 +190,7 @@
label.setText(labelText);
detect.setText(Messages.EditorAutomaticallyDetectPort);
- link.setText("<a href=\"\">" + Messages.Configure + "</a>");
+ link.setText("<a href=\"\">" + Messages.Configure + "</a>"); //$NON-NLS-1$ //$NON-NLS-2$
return child;
}
protected void initialize() {
@@ -203,7 +203,7 @@
if( shouldDetect )
text.setText(findPort(helper.getServer(), new Path(currentXPath)));
else
- text.setText(helper.getAttribute(IJBossServerConstants.JNDI_PORT, ""));
+ text.setText(helper.getAttribute(IJBossServerConstants.JNDI_PORT, "")); //$NON-NLS-1$
}
protected void addListeners() {
listener = new Listener() {
@@ -366,7 +366,7 @@
button.removeListener(SWT.Selection, listener);
button.setSelection(preOverride);
- text.setText(preText == null ? "" : preText);
+ text.setText(preText == null ? "" : preText); //$NON-NLS-1$
text.setEnabled(!preOverride);
text.setEditable(!preOverride);
button.addListener(SWT.Selection, listener);
@@ -378,12 +378,12 @@
protected static String findPort(IServer server, IPath path) {
XPathQuery query = XPathModel.getDefault().getQuery(server, path);
- String result = "";
+ String result = ""; //$NON-NLS-1$
if(query!=null) {
try {
query.refresh();
result = query.getFirstResult();
- result = result == null ? "" : result;
+ result = result == null ? "" : result; //$NON-NLS-1$
return new Integer(Integer.parseInt(result)).toString();
} catch(NumberFormatException nfe) {
} catch( IllegalStateException ise ) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -73,8 +73,8 @@
Label username = toolkit.createLabel(composite, Messages.swf_Username);
username.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
- String n = helper.getAttribute(JBossServer.SERVER_USERNAME, "");
- String p = helper.getAttribute(JBossServer.SERVER_PASSWORD, "");
+ String n = helper.getAttribute(JBossServer.SERVER_USERNAME, ""); //$NON-NLS-1$
+ String p = helper.getAttribute(JBossServer.SERVER_PASSWORD, ""); //$NON-NLS-1$
nameText = toolkit.createText(composite, n);
Label password = toolkit.createLabel(composite, Messages.swf_Password);
password.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
@@ -133,7 +133,7 @@
this.key = attributeKey;
this.newVal = newVal;
this.listener = listener;
- this.oldVal = helper.getAttribute(attributeKey, "");
+ this.oldVal = helper.getAttribute(attributeKey, ""); //$NON-NLS-1$
}
public void execute() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -73,8 +73,8 @@
super.initializeFrom(configuration);
try {
String startArgs = configuration.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
- originalHost = ArgsUtil.getValue(startArgs, "-b", "--host");
- originalConf = ArgsUtil.getValue(startArgs, "-c", "--configuration");
+ originalHost = ArgsUtil.getValue(startArgs, "-b", "--host"); //$NON-NLS-1$ //$NON-NLS-2$
+ originalConf = ArgsUtil.getValue(startArgs, "-c", "--configuration"); //$NON-NLS-1$ //$NON-NLS-2$
} catch( CoreException ce ) { }
}
public boolean isValid(ILaunchConfiguration config) {
@@ -82,8 +82,8 @@
return false;
try {
String startArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, (String)null);
- String newHost = ArgsUtil.getValue(startArgs, "-b", "--host");
- String newConf = ArgsUtil.getValue(startArgs, "-c", "--configuration");
+ String newHost = ArgsUtil.getValue(startArgs, "-b", "--host"); //$NON-NLS-1$ //$NON-NLS-2$
+ String newConf = ArgsUtil.getValue(startArgs, "-c", "--configuration"); //$NON-NLS-1$ //$NON-NLS-2$
if( newConf == null || !newConf.equals(originalConf))
return false;
if( newHost == null || !newHost.equals(originalHost))
@@ -95,8 +95,8 @@
String m = super.getErrorMessage();
if (m == null) {
String startArgs = getAttributeValueFrom(fPrgmArgumentsText);
- String newHost = ArgsUtil.getValue(startArgs, "-b", "--host");
- String newConf = ArgsUtil.getValue(startArgs, "-c", "--configuration");
+ String newHost = ArgsUtil.getValue(startArgs, "-b", "--host"); //$NON-NLS-1$ //$NON-NLS-2$
+ String newConf = ArgsUtil.getValue(startArgs, "-c", "--configuration"); //$NON-NLS-1$ //$NON-NLS-2$
if( newConf == null || !newConf.equals(originalConf))
return Messages.LaunchInvalidConfigChanged;
if( newHost == null || !newHost.equals(originalHost))
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/marker/ConfigureRuntimeMarkerResolution.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -7,12 +7,13 @@
import org.eclipse.ui.IMarkerResolution2;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.dialogs.PropertyDialog;
+import org.jboss.ide.eclipse.as.ui.Messages;
public class ConfigureRuntimeMarkerResolution implements IMarkerResolution2 {
- private static final String RUNTIME_PROPERTY_PAGE = "org.eclipse.wst.common.project.facet.ui.internal.RuntimesPropertyPage";
+ private static final String RUNTIME_PROPERTY_PAGE = "org.eclipse.wst.common.project.facet.ui.internal.RuntimesPropertyPage"; //$NON-NLS-1$
public String getDescription() {
- return "Configure Targeted Runtimes";
+ return Messages.ConfigureRuntimeMarkerResolution_Description;
}
public Image getImage() {
@@ -21,7 +22,7 @@
}
public String getLabel() {
- return "Configure Targeted Runtimes";
+ return Messages.ConfigureRuntimeMarkerResolution_Description;
}
public void run(IMarker marker) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/LogLabelProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.as.ui.views;
+import java.text.MessageFormat;
import java.util.Date;
import org.eclipse.core.runtime.IStatus;
@@ -15,6 +16,7 @@
import org.jboss.ide.eclipse.as.core.extensions.polling.JMXPoller;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.views.ServerLogView.EventCategory;
public class LogLabelProvider extends LabelProvider implements ITableLabelProvider {
@@ -82,11 +84,11 @@
if( element instanceof EventCategory ) {
int type = ((EventCategory)element).getType();
if( type == 0 )
- return "Unknown Event Type";
+ return Messages.LogLabelProvider_UnknownEventType;
if( type == IEventCodes.POLLING_CODE)
- return "Server Startup / Shutdown";
+ return Messages.LogLabelProvider_StartupShutdownEventType;
if( type == IEventCodes.PUBLISHING_CODE)
- return "Publishing";
+ return Messages.LogLabelProvider_PublishingEventType;
}
if( element instanceof LogEntry ) {
@@ -109,14 +111,16 @@
sec -= (hours * 60 * 60);
}
if( hours > 0 ) {
- return hours + " hours, " + minutes + " minutes ago";
+ return MessageFormat.format(Messages.LogLabelProvider_HoursMinutesAgo, hours,
+ minutes);
} else if( minutes > 0 ) {
- return minutes + " minutes, " + sec + " seconds ago";
+ return MessageFormat.format(Messages.LogLabelProvider_MinutesSecondsAgo, minutes,
+ sec);
} else {
- return sec + " seconds ago";
+ return MessageFormat.format(Messages.LogLabelProvider_SecondsAgo, sec);
}
}
- return "";
+ return ""; //$NON-NLS-1$
}
public Image getColumnImage(Object element, int columnIndex) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/ServerLogView.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -71,7 +71,7 @@
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
public class ServerLogView extends ViewPart implements IServerLogListener {
- public static final String VIEW_ID = "org.jboss.ide.eclipse.as.ui.view.serverLogView";
+ public static final String VIEW_ID = "org.jboss.ide.eclipse.as.ui.view.serverLogView"; //$NON-NLS-1$
public final static byte MESSAGE = 0x0;
public final static byte DATE = 0x1;
public static int ASCENDING = 1;
@@ -240,7 +240,7 @@
protected void reloadLog() {
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) {
- monitor.beginTask("Importing Server Log", IProgressMonitor.UNKNOWN);
+ monitor.beginTask(org.jboss.ide.eclipse.as.ui.Messages.ServerLogView_ImportingLogTaskName, IProgressMonitor.UNKNOWN);
List<AbstractEntry> entries = new ArrayList<AbstractEntry>();
LogReader.parseLogFile(fInputFile, entries, fMemento);
elements.addAll(entries);
@@ -273,7 +273,7 @@
display.asyncExec(new Runnable() {
public void run() {
IServer selected = ServerLogger.findServerForFile(fInputFile);
- setContentDescription(selected == null ? "No Log Selected" : selected.getName());
+ setContentDescription(selected == null ? org.jboss.ide.eclipse.as.ui.Messages.ServerLogView_NoLogSelected : selected.getName());
if (!viewer.getTree().isDisposed()) {
viewer.refresh();
viewer.expandToLevel(2);
@@ -463,7 +463,7 @@
fileStore);
IEditorDescriptor desc = PlatformUI.getWorkbench()
.getEditorRegistry().getDefaultEditor(
- "dummy.txt");
+ "dummy.txt"); //$NON-NLS-1$
if (desc != null)
page.openEditor(input, desc.getId());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/JMXProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -73,7 +73,7 @@
.getSelection();
}
- IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu");
+ IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
if( quick != null && selection != null && selection.toArray().length == 1 ) {
if( selection.getFirstElement() instanceof IServer ) {
if( menu instanceof MenuManager ) {
@@ -178,7 +178,7 @@
public String getText(Object element) {
if( element instanceof IConnectionWrapper ) {
- return "JMX";
+ return "JMX"; //$NON-NLS-1$
}
return delegate.getText(element);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ServerLogActionProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -57,7 +57,7 @@
selection = (IStructuredSelection) wsSite.getSelectionProvider()
.getSelection();
}
- IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu");
+ IContributionItem quick = menu.find("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
if( quick != null && selection != null && selection.toArray().length == 1 ) {
if( selection.getFirstElement() instanceof IServer ) {
if( menu instanceof MenuManager ) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -74,7 +74,7 @@
}
}
};
- newXPathCategoryAction.setText("New Category");
+ newXPathCategoryAction.setText(Messages.XPathActionProvider_NewCategoryAction);
deleteXPathCategoryAction = new Action() {
public void run() {
@@ -82,7 +82,7 @@
MessageBox messageBox = new MessageBox(Display.getCurrent()
.getActiveShell(), style);
messageBox
- .setText(Messages.DescriptorXPathRemoveCategory + "?");
+ .setText(Messages.XPathActionProvider_RemoveCategoryQuestion);
messageBox
.setMessage(Messages.DescriptorXPathRemoveCategoryDesc);
if (messageBox.open() == SWT.YES) {
@@ -198,12 +198,12 @@
}
}
} catch (Exception exc) {
- JBossServerUIPlugin.log("Error running edit file action",
+ JBossServerUIPlugin.log(Messages.XPathActionProvider_ErrorRunningAction,
exc);
}
}
};
- editFileAction.setText("Edit File");
+ editFileAction.setText(Messages.XPathActionProvider_EditFileAction);
xpathChangeValueAction = new XPathChangeValueAction(shell, tableViewer, provider);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathChangeValueAction.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -31,6 +31,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.ui.Messages;
/**
* Action to rename a server.
*/
@@ -48,7 +49,7 @@
protected boolean saving = false;
public XPathChangeValueAction(Shell shell, TreeViewer viewer, ISelectionProvider selectionProvider) {
- super(selectionProvider, "Change Value");
+ super(selectionProvider, Messages.XPathChangeValueAction_ActionText);
this.shell = shell;
this.viewer = viewer;
this.tree = viewer.getTree();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathDecorator.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -20,18 +20,18 @@
if( element instanceof XPathQuery) {
XPathResultNode[] nodes = XPathModel.getResultNodes((XPathQuery)element);
if(nodes.length == 1 ) {
- return " " + nodes[0].getText();
+ return " " + nodes[0].getText(); //$NON-NLS-1$
}
}
if( element instanceof XPathFileResult ) {
XPathResultNode[] nodes = ((XPathFileResult)element).getChildren();
if( nodes.length == 1 )
- return " " + nodes[0].getText();
+ return " " + nodes[0].getText(); //$NON-NLS-1$
}
if( element instanceof XPathResultNode ) {
- return " " + ((XPathResultNode)element).getText();
+ return " " + ((XPathResultNode)element).getText(); //$NON-NLS-1$
}
return null;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeContentProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -16,6 +16,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
+import org.jboss.ide.eclipse.as.ui.Messages;
public class XPathTreeContentProvider implements ITreeContentProvider {
@@ -91,7 +92,7 @@
}
protected void launchLoad(final XPathCategory cat) {
- new Job("Loading XPaths") {
+ new Job(Messages.XPathTreeContentProvider_JobName) {
protected IStatus run(IProgressMonitor monitor) {
loading.add(cat);
XPathQuery[] queries = cat.getQueries();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathTreeLabelProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -1,5 +1,6 @@
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -14,13 +15,14 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
+import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.views.server.extensions.XPathTreeContentProvider.ServerWrapper;
public class XPathTreeLabelProvider extends LabelProvider {
private Image rootImage;
public XPathTreeLabelProvider() {
super();
- ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif"));
+ ImageDescriptor des = ImageDescriptor.createFromURL(JBossServerUIPlugin.getDefault().getBundle().getEntry("icons/XMLFile.gif")); //$NON-NLS-1$
rootImage = des.createImage();
}
@@ -46,9 +48,9 @@
public String getText(Object element) {
if( element instanceof ServerWrapper )
- return "XML Configuration";
+ return Messages.XPathTreeLabelProvider_XMLConfigLabel;
if( element == XPathTreeContentProvider.LOADING )
- return "Loading...";
+ return Messages.XPathTreeLabelProvider_LoadingLabel;
if (element instanceof XPathCategory)
return ((XPathCategory) element).getName();
@@ -60,9 +62,9 @@
return ((XPathFileResult)element).getFileLocation();
if( element instanceof XPathResultNode )
- return "Match " + ((XPathResultNode)element).getIndex();
+ return MessageFormat.format(Messages.XPathTreeLabelProvider_MatchIndexLabel, ((XPathResultNode)element).getIndex());
- return "";
+ return ""; //$NON-NLS-1$
}
public XPathResultNode[] getResultNodes(XPathQuery query) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -40,7 +40,7 @@
int size = serverTypes.length;
for (int i = 0; i < size; i++) {
- if( serverTypes[i].getId().equals("org.jboss.ide.eclipse.as.42"))
+ if( serverTypes[i].getId().equals("org.jboss.ide.eclipse.as.42")) //$NON-NLS-1$
return serverTypes[i];
}
return serverTypes[0];
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -121,9 +121,9 @@
File serviceDescriptor = new File(types[i]
.getAbsolutePath()
+ File.separator
- + "conf"
+ + "conf" //$NON-NLS-1$
+ File.separator
- + "jboss-service.xml");
+ + "jboss-service.xml"); //$NON-NLS-1$
if (types[i].isDirectory() && serviceDescriptor.exists()) {
String configuration = types[i].getName();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -150,14 +150,14 @@
version);
handle.setImageDescriptor(getImageDescriptor());
handle.setDescription(description);
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.jboss.ide.eclipse.as.doc.user.new_server_runtime");
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, "org.jboss.ide.eclipse.as.doc.user.new_server_runtime"); //$NON-NLS-1$
return main;
}
protected boolean isEAP() {
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
- return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
+ return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$
}
protected ImageDescriptor getImageDescriptor() {
@@ -231,7 +231,7 @@
.getObject(TaskModel.TASK_RUNTIME);
String oldName = r.getName();
if( r.isWorkingCopy() ) {
- String newName = oldName.replace("Enterprise Application Platform", "EAP");
+ String newName = oldName.replace("Enterprise Application Platform", "EAP"); //$NON-NLS-1$ //$NON-NLS-2$
newName = LocalJBossServerRuntime.getNextRuntimeName(newName);
((IRuntimeWorkingCopy)r).setName(newName);
}
@@ -537,8 +537,8 @@
}
protected void configDeletePressed() {
MessageDialog dialog = new MessageDialog(configBrowse.getShell(),
- "Delete Configuration?", null,
- "Are you sure you want to delete this folder? This cannot be undone.",
+ Messages.JBossRuntimeWizardFragment_DeleteConfigTitle, null,
+ Messages.JBossRuntimeWizardFragment_DeleteConfigConfirmation,
MessageDialog.WARNING, new String[] { IDialogConstants.YES_LABEL,
IDialogConstants.NO_LABEL }, 0); // yes is the default
if(dialog.open() == 0) {
@@ -608,17 +608,17 @@
if (!isHomeValid())
return Messages.rwf_homeMissingFiles;
- if (name == null || name.equals(""))
+ if (name == null || name.equals("")) //$NON-NLS-1$
return Messages.rwf_nameTextBlank;
- if (homeDir == null || homeDir.equals(""))
+ if (homeDir == null || homeDir.equals("")) //$NON-NLS-1$
return Messages.rwf_homeDirBlank;
if (jreComboIndex < 0)
return Messages.rwf_NoVMSelected;
if( configurations.getSelection().isEmpty())
- return "User must select a valid configuration";
+ return Messages.JBossRuntimeWizardFragment_MustSelectValidConfig;
return null;
}
@@ -631,7 +631,7 @@
protected boolean isHomeValid() {
if( homeDir == null || !(new File(homeDir).exists())) return false;
- return new Path(homeDir).append("bin").append("run.jar").toFile().exists();
+ return new Path(homeDir).append("bin").append("run.jar").toFile().exists(); //$NON-NLS-1$ //$NON-NLS-2$
}
protected String getHomeVersionWarning() {
@@ -676,9 +676,9 @@
PreferenceManager manager = PlatformUI.getWorkbench()
.getPreferenceManager();
IPreferenceNode node = manager
- .find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage")
+ .find("org.eclipse.jdt.ui.preferences.JavaBasePreferencePage") //$NON-NLS-1$
.findSubNode(
- "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage");
+ "org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"); //$NON-NLS-1$
PreferenceManager manager2 = new PreferenceManager();
manager2.addToRoot(node);
final PreferenceDialog dialog = new PreferenceDialog(jreButton
@@ -711,7 +711,7 @@
// get names
size = installedJREs.size();
jreNames = new String[size+1];
- jreNames[0] = "Default JRE";
+ jreNames[0] = "Default JRE"; //$NON-NLS-1$
for (int i = 0; i < size; i++) {
IVMInstall vmInstall = installedJREs.get(i);
jreNames[i+1] = vmInstall.getName();
@@ -863,7 +863,8 @@
destText.setText(origDest);
- nameText.setText(findNewest(origConfig + "_copy")); // TODO increment
+ // we could localize the string _copy, but it would probably cause more trouble than it's worth
+ nameText.setText(findNewest(origConfig + "_copy")); // TODO increment //$NON-NLS-1$
return c;
}
@@ -880,9 +881,9 @@
}
if( !valid ) {
if( newDest == null || newConfig == null ) {
- setMessage("All fields must be completed.", IMessageProvider.ERROR);
+ setMessage(Messages.JBossRuntimeWizardFragment_AllFieldsRequired, IMessageProvider.ERROR);
} else {
- setMessage("The output folder already exists: " + p.append(newConfig).toString(), IMessageProvider.ERROR);
+ setMessage(Messages.JBossRuntimeWizardFragment_OutputFolderExists + p.append(newConfig).toString(), IMessageProvider.ERROR);
}
} else {
setCleanMessage();
@@ -914,7 +915,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("Copy a Configuration");
+ newShell.setText(Messages.JBossRuntimeWizardFragment_CopyAConfigShellText);
}
public String getNewDest() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -92,18 +92,18 @@
protected boolean isEAP() {
IRuntime rt = (IRuntime) getTaskModel().getObject(
TaskModel.TASK_RUNTIME);
- return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap.");
+ return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$
}
public ImageDescriptor getImageDescriptor() {
IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
String id = rt.getRuntimeType().getId();
- String imageKey = "";
- if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
+ String imageKey = ""; //$NON-NLS-1$
+ if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO; //$NON-NLS-1$
+ else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO; //$NON-NLS-1$
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
@@ -181,7 +181,7 @@
IJBossServerRuntime srt = getRuntime();
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
configValLabel.setText(srt.getJBossConfiguration());
- jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + " (" + srt.getVM().getName() + ")");
+ jreValLabel.setText(srt.getVM().getInstallLocation().getAbsolutePath() + " (" + srt.getVM().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
configLocValLabel.setText(srt.getConfigLocation());
runtimeGroup.layout();
updateErrorMessage();
@@ -194,8 +194,8 @@
public void performFinish(IProgressMonitor monitor) throws CoreException {
IServerWorkingCopy serverWC = (IServerWorkingCopy) getTaskModel().getObject(TaskModel.TASK_SERVER);
JBossServer jbs = (JBossServer)serverWC.loadAdapter(JBossServer.class, new NullProgressMonitor());
- jbs.setUsername("admin");
- jbs.setPassword("admin");
+ jbs.setUsername("admin"); //$NON-NLS-1$
+ jbs.setPassword("admin"); //$NON-NLS-1$
jbs.setDeployLocationType(isAS5() ? IDeployableServer.DEPLOY_SERVER : IDeployableServer.DEPLOY_METADATA);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
serverWC.setServerConfiguration(null); // no inside jboss folder
@@ -218,7 +218,7 @@
protected boolean isAS5() {
return getRuntime().getRuntime().getRuntimeType().
- getVersion().equals("5.0");
+ getVersion().equals("5.0"); //$NON-NLS-1$
}
public boolean isComplete() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -182,7 +182,7 @@
deployLoc = deployText.getText();
tempDeployLoc = tempDeployText.getText();
name = nameText.getText();
- handle.setMessage("", IStatus.OK);
+ handle.setMessage("", IStatus.OK); //$NON-NLS-1$
handle.update();
} else {
handle.setMessage(status.getMessage(), IStatus.WARNING);
@@ -191,17 +191,17 @@
protected IStatus checkErrors() {
if( findServer(nameText.getText()) != null ) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "Name in use", null);
+ return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, Messages.StrippedServerWizardFragment_NameInUseStatusMessage, null);
}
File f = new File(deployText.getText());
if( !f.exists() || !f.isDirectory() ) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "Deploy Folder does not exist", null);
+ return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, Messages.StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage, null);
}
f = new File(tempDeployText.getText());
if( !f.exists() || !f.isDirectory() ) {
- return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "Temporary Deploy Folder does not exist", null);
+ return new Status(IStatus.WARNING, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, Messages.StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage, null);
}
- return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "", null);
+ return new Status(IStatus.OK, JBossServerUIPlugin.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
}
public void enter() {
@@ -217,7 +217,7 @@
ServerWorkingCopy swcInternal;
if( swc instanceof ServerWorkingCopy ) {
swcInternal = (ServerWorkingCopy)swc;
- deployText.setText(swcInternal.getAttribute(DeployableServer.DEPLOY_DIRECTORY, ""));
+ deployText.setText(swcInternal.getAttribute(DeployableServer.DEPLOY_DIRECTORY, "")); //$NON-NLS-1$
}
}
public void exit() {
@@ -264,9 +264,9 @@
String base = Messages.sswf_BaseName;
if( findServer(base) == null ) return base;
int i = 1;
- while( ServerCore.findServer(base + " (" + i + ")") != null )
+ while( ServerCore.findServer(base + " (" + i + ")") != null ) //$NON-NLS-1$ //$NON-NLS-2$
i++;
- return base + " (" + i + ")";
+ return base + " (" + i + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
private IServer findServer(String name) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/J2EEModuleExportOperation.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
+import java.text.MessageFormat;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -72,6 +73,7 @@
import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
+import org.jboss.ide.eclipse.as.ui.Messages;
public abstract class J2EEModuleExportOperation extends AbstractDataModelOperation {
@@ -135,7 +137,7 @@
export();
} catch (Exception e) {
monitor.worked(CLOSE_WORK);
- throw new ExecutionException("Error Exporting " + archiveString(), e);
+ throw new ExecutionException(MessageFormat.format(Messages.J2EEModuleExportOperation_ErrorExportingArchive, archiveString()), e);
}
final IDataModel dm = getDataModel();
@@ -314,7 +316,9 @@
/* Prepare the streams */
if (dest.exists() && dest.isDirectory()) {
- throw new IOException("The specified file: " + dest.getAbsolutePath() + " exists and is a directory");
+ throw new IOException(MessageFormat.format(
+ Messages.J2EEModuleExportOperation_DestinationFileIsDirectoryError,
+ dest.getAbsolutePath()));
}
if (parent != null)
parent.mkdirs();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerActionProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -70,18 +70,18 @@
import org.jboss.ide.eclipse.as.ui.actions.ExploreAction;
public class ServerActionProvider extends CommonActionProvider {
- public static final String NEW_MENU_ID = "org.jboss.tools.as.wst.server.ui.internal.cnf.newMenuId";
- public static final String SHOW_IN_MENU_ID = "org.jboss.tools.as.wst.server.ui.internal.cnf.showInMenuId";
- public static final String TOP_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionStart";
- public static final String TOP_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionEnd";
- public static final String EDIT_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnfeditSectionStart";
- public static final String EDIT_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.editSectionEnd";
- public static final String CONTROL_SERVER_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionStart";
- public static final String CONTROL_SERVER_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionEnd";
- public static final String SERVER_ERATA_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionStart";
- public static final String SERVER_ERATA_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionEnd";
- public static final String CONTROL_MODULE_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionStart";
- public static final String CONTROL_MODULE_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionEnd";
+ public static final String NEW_MENU_ID = "org.jboss.tools.as.wst.server.ui.internal.cnf.newMenuId"; //$NON-NLS-1$
+ public static final String SHOW_IN_MENU_ID = "org.jboss.tools.as.wst.server.ui.internal.cnf.showInMenuId"; //$NON-NLS-1$
+ public static final String TOP_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionStart"; //$NON-NLS-1$
+ public static final String TOP_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.topSectionEnd"; //$NON-NLS-1$
+ public static final String EDIT_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnfeditSectionStart"; //$NON-NLS-1$
+ public static final String EDIT_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.editSectionEnd"; //$NON-NLS-1$
+ public static final String CONTROL_SERVER_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionStart"; //$NON-NLS-1$
+ public static final String CONTROL_SERVER_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlServerSectionEnd"; //$NON-NLS-1$
+ public static final String SERVER_ERATA_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionStart"; //$NON-NLS-1$
+ public static final String SERVER_ERATA_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.serverErataSectionEnd"; //$NON-NLS-1$
+ public static final String CONTROL_MODULE_SECTION_START_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionStart"; //$NON-NLS-1$
+ public static final String CONTROL_MODULE_SECTION_END_SEPARATOR = "org.jboss.tools.as.wst.server.ui.internal.cnf.controlModuleSectionEnd"; //$NON-NLS-1$
private ICommonActionExtensionSite actionSite;
private Clipboard clipboard;
@@ -125,7 +125,7 @@
IServer server = (IServer) data;
ServerUIPlugin.editServer(server);
} catch (Exception e) {
- Trace.trace(Trace.SEVERE, "Could not open server", e);
+ Trace.trace(Trace.SEVERE, org.jboss.ide.eclipse.as.ui.Messages.ServerActionProvider_CouldNotOpenServerError, e);
}
}
});
@@ -164,15 +164,15 @@
// create the properties action
propertiesAction = new PropertiesAction(shell, provider);
- monitorPropertiesAction = new PropertiesAction(shell, "org.eclipse.wst.server.ui.properties.monitor", provider);
+ monitorPropertiesAction = new PropertiesAction(shell, "org.eclipse.wst.server.ui.properties.monitor", provider); //$NON-NLS-1$
}
public void fillActionBars(IActionBars actionBars) {
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.debug", actions[0]);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.stop", actions[3]);
- actionBars.setGlobalActionHandler("org.eclipse.wst.server.publish", actions[4]);
- actionBars.setGlobalActionHandler("org.eclipse.ui.navigator.Open", openAction);
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.debug", actions[0]); //$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.run", actions[1]); //$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.stop", actions[3]); //$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.wst.server.publish", actions[4]); //$NON-NLS-1$
+ actionBars.setGlobalActionHandler("org.eclipse.ui.navigator.Open", openAction); //$NON-NLS-1$
actionBars.setGlobalActionHandler(ActionFactory.PROPERTIES.getId(), propertiesAction);
actionBars.updateActionBars();
actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copyAction);
@@ -256,7 +256,7 @@
}
menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
- menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end"));
+ menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS+"-end")); //$NON-NLS-1$
}
protected void addTopSection(IMenuManager menu, IServer server, IModule[] module) {
@@ -275,12 +275,12 @@
final IBindingService bindingService = (IBindingService) workbench
.getAdapter(IBindingService.class);
final TriggerSequence[] activeBindings = bindingService
- .getActiveBindingsFor("org.eclipse.ui.navigate.showInQuickMenu");
+ .getActiveBindingsFor("org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
if (activeBindings.length > 0) {
- text += "\t" + activeBindings[0].format();
+ text += "\t" + activeBindings[0].format(); //$NON-NLS-1$
}
- MenuManager showInMenu = new MenuManager(text, "org.eclipse.ui.navigate.showInQuickMenu");
+ MenuManager showInMenu = new MenuManager(text, "org.eclipse.ui.navigate.showInQuickMenu"); //$NON-NLS-1$
showInMenu.add(showInConsoleAction);
showInMenu.add(showInDebugAction);
menu.add(showInMenu);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -35,10 +35,10 @@
import org.eclipse.wst.server.core.internal.Server;
import org.eclipse.wst.server.core.internal.UpdateServerJob;
import org.eclipse.wst.server.core.util.PublishAdapter;
-import org.eclipse.wst.server.ui.internal.Messages;
import org.eclipse.wst.server.ui.internal.Trace;
import org.eclipse.wst.server.ui.internal.view.servers.ModuleServer;
import org.eclipse.wst.server.ui.internal.viewers.BaseContentProvider;
+import org.jboss.ide.eclipse.as.ui.Messages;
public class ServerContentProvider extends BaseContentProvider implements ITreeContentProvider {
public static Object INITIALIZING = new Object();
@@ -246,7 +246,7 @@
}
protected void deferInitialization() {
- Job job = new Job(Messages.jobInitializingServersView) {
+ Job job = new Job(org.eclipse.wst.server.ui.internal.Messages.jobInitializingServersView) {
public IStatus run(IProgressMonitor monitor) {
IServer[] servers = ServerCore.getServers();
int size = servers.length;
@@ -346,7 +346,7 @@
}
}
} catch (Exception e) {
- Trace.trace(Trace.FINEST, "Error in Servers view animation", e);
+ Trace.trace(Trace.FINEST, Messages.ServerContentProvider_ErrorInServersViewAnimation, e);
}
display.timerExec(SLEEP, animator[0]);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java 2009-05-25 04:43:26 UTC (rev 15473)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ServerLabelProvider.java 2009-05-25 04:46:05 UTC (rev 15474)
@@ -35,7 +35,7 @@
if (element instanceof ModuleServer) {
ModuleServer ms = (ModuleServer) element;
if (ms.module == null)
- return "";
+ return ""; //$NON-NLS-1$
int size = ms.module.length;
String name = ms.module[size - 1].getName();
return name;
@@ -69,7 +69,7 @@
protected String notNull(String s) {
if (s == null)
- return "";
+ return ""; //$NON-NLS-1$
return s;
}
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15473 - in trunk/as/plugins: org.jboss.ide.eclipse.as.classpath.ui/.settings and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:43:26 -0400 (Mon, 25 May 2009)
New Revision: 15473
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/.settings/
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/.settings/org.eclipse.jdt.core.prefs
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.settings/
trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.settings/org.eclipse.jdt.core.prefs
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossEJB3LibrariesPage.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossSelectionPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:43:26 UTC (rev 15473)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java 2009-05-25 04:42:59 UTC (rev 15472)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ClasspathUIPlugin.java 2009-05-25 04:43:26 UTC (rev 15473)
@@ -74,9 +74,9 @@
public static void alert(String string) {
MessageDialog dialog = new MessageDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- "EJB3 Tools - Alert", Display.getDefault().getSystemImage(SWT.ICON_INFORMATION), string,
+ Messages.ClasspathUIPlugin_ALERT, Display.getDefault().getSystemImage(SWT.ICON_INFORMATION), string,
MessageDialog.INFORMATION, new String[]
- {"OK",}, 0);
+ {Messages.ClasspathUIPlugin_OK,}, 0);
dialog.setBlockOnOpen(true);
dialog.open();
@@ -84,9 +84,9 @@
public static void error(String string) {
MessageDialog dialog = new MessageDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- "EJB3 Tools - Error", Display.getDefault().getSystemImage(SWT.ICON_ERROR), string, MessageDialog.ERROR,
+ Messages.ClasspathUIPlugin_ERROR, Display.getDefault().getSystemImage(SWT.ICON_ERROR), string, MessageDialog.ERROR,
new String[]
- {"OK",}, 0);
+ {Messages.ClasspathUIPlugin_OK,}, 0);
dialog.setBlockOnOpen(true);
dialog.open();
@@ -94,9 +94,9 @@
public static void warn(String string) {
MessageDialog dialog = new MessageDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
- "EJB3 Tools - Warning", Display.getDefault().getSystemImage(SWT.ICON_WARNING), string,
+ Messages.ClasspathUIPlugin_WARNING, Display.getDefault().getSystemImage(SWT.ICON_WARNING), string,
MessageDialog.WARNING, new String[]
- {"OK",}, 0);
+ {Messages.ClasspathUIPlugin_OK,}, 0);
dialog.setBlockOnOpen(true);
dialog.open();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java 2009-05-25 04:42:59 UTC (rev 15472)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/DirectoryLibraryPage.java 2009-05-25 04:43:26 UTC (rev 15473)
@@ -26,8 +26,8 @@
public DirectoryLibraryPage() {
super("DirectoryLibrariesContainerPage"); //$NON-NLS-1$
- setTitle("Directory library");
- setDescription("A classpath container that automatically adds all .jar and .zip files found in a directory to the classpath.");
+ setTitle(Messages.DirectoryLibraryPage_Title);
+ setDescription(Messages.DirectoryLibraryPage_Description);
}
public IClasspathEntry getSelection() {
@@ -61,7 +61,7 @@
composite.setLayout(new GridLayout(2, false));
final Label label = new Label(composite, SWT.NONE);
- label.setText("Project:");
+ label.setText(Messages.DirectoryLibraryPage_LabelProject);
final String[] webProjects = getWebProjects();
@@ -103,7 +103,7 @@
}
private static String[] getWebProjects() {
- return new String[] { "test" };
+ return new String[] { Messages.DirectoryLibraryPage_WebProjects };
}
private static int indexOf(final String[] array, final String str) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossEJB3LibrariesPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossEJB3LibrariesPage.java 2009-05-25 04:42:59 UTC (rev 15472)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossEJB3LibrariesPage.java 2009-05-25 04:43:26 UTC (rev 15473)
@@ -21,6 +21,7 @@
*/
package org.jboss.ide.eclipse.as.classpath.ui.ejb3;
+import java.text.MessageFormat;
import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.JavaCore;
@@ -61,10 +62,10 @@
return true;
} else {
ClasspathUIPlugin
- .error("The selected configuration (\""
- + jbossServer.getServer().getName()
- + "\")"
- + " does not contain the expected EJB3 libraries. Please install JBoss with EJB3 enabled, or try another configuration. ");
+ .error(MessageFormat
+ .format(
+ Messages.JBossEJB3LibrariesPage_ConfigurationDoesNotContainEJB3Libraries,
+ jbossServer.getServer().getName()));
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossSelectionPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossSelectionPage.java 2009-05-25 04:42:59 UTC (rev 15472)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/ejb3/JBossSelectionPage.java 2009-05-25 04:43:26 UTC (rev 15473)
@@ -41,6 +41,7 @@
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.ui.ServerUICore;
import org.eclipse.wst.server.ui.internal.actions.NewServerAction;
+import org.jboss.ide.eclipse.as.classpath.ui.Messages;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -56,7 +57,7 @@
protected Button newServer;
public JBossSelectionPage() {
- super("JBoss Server Selection");
+ super(Messages.JBossSelectionPage_Name);
}
public void createControl(Composite parent) {
@@ -83,7 +84,7 @@
links.setLayout(new RowLayout());
newServer = new Button(links, SWT.NONE);
- newServer.setText("Create a JBoss Server");
+ newServer.setText(Messages.JBossSelectionPage_ButtonText);
newServer.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
widgetSelected(e);
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:43:26 UTC (rev 15473)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15472 - in trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core: ejb3 and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:42:59 -0400 (Mon, 25 May 2009)
New Revision: 15472
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/DirectoryLibraryContainerInitializer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.classpath.core;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -105,7 +106,9 @@
}
public String getDescription() {
- return "Libraries found in " + ((file==null)?"[No directory specified]":file.getProjectRelativePath().toString());
+ return file == null ?
+ Messages.DirectoryLibraryContainerInitializer_libraries_found_no_dir :
+ MessageFormat.format(Messages.DirectoryLibraryContainerInitializer_libraries_found_in_dir, file.getProjectRelativePath().toString());
}
public int getKind() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB30SupportVerifier.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -30,8 +30,8 @@
if( ajbsr == null ) return true;
// one of ours. verify
- IPath path = new Path("org.jboss.ide.eclipse.as.core.runtime.ProjectInitializer");
- path = path.append(rt.getId()).append("jst.ejb").append("3.0");
+ IPath path = new Path("org.jboss.ide.eclipse.as.core.runtime.ProjectInitializer"); //$NON-NLS-1$
+ path = path.append(rt.getId()).append("jst.ejb").append("3.0"); //$NON-NLS-1$ //$NON-NLS-2$
WebtoolsProjectJBossClasspathContainer container =
new WebtoolsProjectJBossClasspathContainer(path);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -25,6 +25,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
/**
@@ -34,7 +35,7 @@
public class EJB3ClasspathContainer implements IClasspathContainer, ClasspathConstants {
public static final String CONTAINER_ID = "org.jboss.ide.eclipse.as.classpath.core.ejb3.classpathContainer"; //$NON-NLS-1$
- public static final String DESCRIPTION = "JBoss EJB3 Libraries";
+ public static final String DESCRIPTION = Messages.EJB3ClasspathContainer_ejb3_description;
public static final QualifiedName JBOSS_EJB3_CONFIGURATION = new QualifiedName(
"org.jboss.ide.eclipse.ejb3.wizards.core.classpath", "jboss-ejb3-configuration"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -80,7 +81,7 @@
}
public String getDescription() {
- return "JBoss EJB 3.0 Libraries";
+ return Messages.EJB3ClasspathContainer_ejb30_description;
}
public JBossServer getJBossServer() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/AbstractClasspathContainer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -30,6 +30,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorations;
import org.jboss.ide.eclipse.as.classpath.core.xpl.ClasspathDecorationsManager;
@@ -148,7 +149,7 @@
return installURL.getFile().toString();
} catch (IOException ioe) {
// LOG THE ERROR (one day)
- IStatus status = new Status(IStatus.ERROR, ClasspathCorePlugin.PLUGIN_ID, "Error loading classpath container", ioe);
+ IStatus status = new Status(IStatus.ERROR, ClasspathCorePlugin.PLUGIN_ID, Messages.AbstractClasspathContainer_error_loading_container, ioe);
ClasspathCorePlugin.getDefault().getLog().log(status);
}
return null;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE13ClasspathContainerInitializer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
/**
*
@@ -38,7 +39,7 @@
public final static String SUFFIX = "j2ee-1.3";//$NON-NLS-1$
public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX
+ "." + J2EE13ClasspathContainer.SUFFIX;//$NON-NLS-1$
- public final static String DESCRIPTION = "J2EE 1.3 Libraries (JBoss Tools)";
+ public final static String DESCRIPTION = Messages.J2EE13ClasspathContainerInitializer_description;
public J2EE13ClasspathContainer(IPath path, IJavaProject javaProject) {
super(path, DESCRIPTION, SUFFIX, javaProject);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE14ClasspathContainerInitializer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -12,6 +12,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer.J2EE13ClasspathContainer;
/**
@@ -38,7 +39,7 @@
public final static String SUFFIX = "j2ee-1.4";//$NON-NLS-1$
public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX
+ "." + J2EE14ClasspathContainer.SUFFIX;//$NON-NLS-1$
- public final static String DESCRIPTION = "J2EE 1.4 Libraries (JBoss Tools)";
+ public final static String DESCRIPTION = Messages.J2EE14ClasspathContainerInitializer_description;
public J2EE14ClasspathContainer(IPath path, IJavaProject javaProject) {
super(path, DESCRIPTION, SUFFIX, javaProject);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/jee/J2EE50ClasspathContainerInitializer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.core.IJavaProject;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.classpath.core.jee.J2EE13ClasspathContainerInitializer.J2EE13ClasspathContainer;
/**
@@ -39,7 +40,7 @@
public final static String SUFFIX = "javaee-5.0";//$NON-NLS-1$
public final static String CLASSPATH_CONTAINER = CLASSPATH_CONTAINER_PREFIX
+ "." + J2EE50ClasspathContainer.SUFFIX;//$NON-NLS-1$
- public final static String DESCRIPTION = "J2EE 5.0 Libraries (JBoss Tools)";
+ public final static String DESCRIPTION = Messages.J2EE50ClasspathContainerInitializer_description;
public J2EE50ClasspathContainer(IPath path, IJavaProject javaProject) {
super(path, DESCRIPTION, SUFFIX, javaProject);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ClientAllRuntimeClasspathProvider.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -12,6 +12,7 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
import java.io.File;
+import java.text.MessageFormat;
import java.util.ArrayList;
import org.eclipse.core.resources.IProject;
@@ -26,6 +27,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
/**
@@ -51,7 +53,8 @@
IJBossServerRuntime jbsrt = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
if( jbsrt == null ) {
// log error
- IStatus status = new Status(IStatus.WARNING, ClasspathCorePlugin.PLUGIN_ID, "Runtime " + runtime.getName() + "is not of the proper type");
+ IStatus status = new Status(IStatus.WARNING, ClasspathCorePlugin.PLUGIN_ID, MessageFormat.format(Messages.ClientAllRuntimeClasspathProvider_wrong_runtime_type,
+ runtime.getName()));
ClasspathCorePlugin.getDefault().getLog().log(status);
return new IClasspathEntry[0];
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/ProjectRuntimeClasspathProvider.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
+import java.text.MessageFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -33,6 +34,7 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.classpath.core.runtime.WebtoolsProjectJBossClasspathContainerInitializer.WebtoolsProjectJBossClasspathContainer;
/**
@@ -108,7 +110,10 @@
if( rt == null )
throw new CoreException(
new Status( IStatus.ERROR, ClasspathCorePlugin.PLUGIN_ID,
- "Runtime " + path.segment(1) + " does not exist. This classpath container cannot be initialized. "));
+ MessageFormat
+ .format(
+ Messages.ProjectRuntimeClasspathProvider_runtime_does_not_exist,
+ path.segment(1))));
}
public IClasspathEntry[] getClasspathEntries() {
@@ -116,7 +121,7 @@
}
public String getDescription() {
- return "All JBoss Libraries [" + (rt == null ? "null" : rt.getName()) + "]";
+ return MessageFormat.format(Messages.ProjectRuntimeClasspathProvider_all_jboss_libraries_description, (rt == null ? "null" : rt.getName())); //$NON-NLS-1$
}
public int getKind() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/runtime/WebtoolsProjectJBossClasspathContainerInitializer.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.classpath.core.runtime;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,6 +30,7 @@
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathConstants;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
/**
@@ -83,8 +85,9 @@
}
public String getDescription() {
- if( path.segmentCount() < 4 ) return "JBoss Runtimes";
- return "JBoss Runtimes (" + path.segment(2) + " : " + path.segment(3) + ")";
+ if( path.segmentCount() < 4 ) return Messages.WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes;
+ String pathSegments = path.segment(2) + " : " + path.segment(3); //$NON-NLS-1$
+ return MessageFormat.format(Messages.WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes_path, pathSegments);
}
public int getKind() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java 2009-05-25 04:41:24 UTC (rev 15471)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/xpl/ClasspathDecorationsManager.java 2009-05-25 04:42:59 UTC (rev 15472)
@@ -25,6 +25,7 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jdt.core.IClasspathAttribute;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
+import org.jboss.ide.eclipse.as.classpath.core.Messages;
import org.osgi.service.prefs.BackingStoreException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -151,7 +152,7 @@
try {
ep.flush();
} catch (BackingStoreException e) {
- String msg = "Encountered an unexpected exception.";
+ String msg = Messages.ClasspathDecorationsManager_unexpected_exception;
ClasspathCorePlugin.log(msg, e);
}
}
@@ -173,7 +174,7 @@
InputSource source = new InputSource(reader);
root = docbuilder.parse(source).getDocumentElement();
} catch (Exception e) {
- String msg = "Encountered an unexpected exception.";
+ String msg = Messages.ClasspathDecorationsManager_unexpected_exception;
ClasspathCorePlugin.log(msg, e);
return map;
}
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15471 - in trunk/as/plugins: org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:41:24 -0400 (Mon, 25 May 2009)
New Revision: 15471
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/Messages.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/Messages.java 2009-05-25 04:41:24 UTC (rev 15471)
@@ -0,0 +1,28 @@
+package org.jboss.ide.eclipse.as.classpath.core;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.classpath.core.messages"; //$NON-NLS-1$
+ public static String AbstractClasspathContainer_error_loading_container;
+ public static String ClasspathDecorationsManager_unexpected_exception;
+ public static String ClientAllRuntimeClasspathProvider_wrong_runtime_type;
+ public static String DirectoryLibraryContainerInitializer_libraries_found_in_dir;
+ public static String DirectoryLibraryContainerInitializer_libraries_found_no_dir;
+ public static String EJB3ClasspathContainer_ejb3_description;
+ public static String EJB3ClasspathContainer_ejb30_description;
+ public static String J2EE13ClasspathContainerInitializer_description;
+ public static String J2EE14ClasspathContainerInitializer_description;
+ public static String J2EE50ClasspathContainerInitializer_description;
+ public static String ProjectRuntimeClasspathProvider_all_jboss_libraries_description;
+ public static String ProjectRuntimeClasspathProvider_runtime_does_not_exist;
+ public static String WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes;
+ public static String WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes_path;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/messages.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/messages.properties 2009-05-25 04:41:24 UTC (rev 15471)
@@ -0,0 +1,14 @@
+AbstractClasspathContainer_error_loading_container=Error loading classpath container
+ClasspathDecorationsManager_unexpected_exception=Encountered an unexpected exception.
+ClientAllRuntimeClasspathProvider_wrong_runtime_type=Runtime {0} is not of the proper type
+DirectoryLibraryContainerInitializer_libraries_found_no_dir=Libraries found in [No directory specified]
+DirectoryLibraryContainerInitializer_libraries_found_in_dir=Libraries found in {0}
+EJB3ClasspathContainer_ejb3_description=JBoss EJB3 Libraries
+EJB3ClasspathContainer_ejb30_description=JBoss EJB 3.0 Libraries
+J2EE13ClasspathContainerInitializer_description=J2EE 1.3 Libraries (JBoss Tools)
+J2EE14ClasspathContainerInitializer_description=J2EE 1.4 Libraries (JBoss Tools)
+J2EE50ClasspathContainerInitializer_description=J2EE 5.0 Libraries (JBoss Tools)
+ProjectRuntimeClasspathProvider_all_jboss_libraries_description=All JBoss Libraries [{0}]
+ProjectRuntimeClasspathProvider_runtime_does_not_exist=Runtime {0} does not exist. This classpath container cannot be initialized.
+WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes=JBoss Runtimes
+WebtoolsProjectJBossClasspathContainerInitializer_jboss_runtimes_path=JBoss Runtimes ({0})
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java 2009-05-25 04:39:55 UTC (rev 15470)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.java 2009-05-25 04:41:24 UTC (rev 15471)
@@ -23,13 +23,27 @@
import org.eclipse.osgi.util.NLS;
-public class Messages {
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.classpath.ui.Messages"; //$NON-NLS-1$
+ public static String ClasspathUIPlugin_ALERT;
+ public static String ClasspathUIPlugin_ERROR;
+ public static String ClasspathUIPlugin_OK;
+ public static String ClasspathUIPlugin_WARNING;
+ public static String DirectoryLibraryPage_Description;
+ public static String DirectoryLibraryPage_LabelProject;
+ public static String DirectoryLibraryPage_WebProjects;
+ public static String DirectoryLibraryPage_Title;
public static String jeeClasspathAdding;
public static String jeeClasspathBody;
public static String jeeClasspathDescription;
public static String ejb3ClasspathPageTitle;
public static String ejb3ClasspathPageDescription;
+ public static String JBossEJB3LibrariesPage_ConfigurationDoesNotContainEJB3Libraries;
+ public static String JBossSelectionPage_ButtonText;
+ public static String JBossSelectionPage_Name;
static {
- NLS.initializeMessages("org.jboss.ide.eclipse.as.classpath.ui.Messages", Messages.class); //$NON-NLS-1$
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
+ private Messages() {
+ }
}
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties 2009-05-25 04:39:55 UTC (rev 15470)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties 2009-05-25 04:41:24 UTC (rev 15471)
@@ -1,5 +0,0 @@
-jeeClasspathAdding=Adding {0}
-jeeClasspathBody=Click finish to continue adding {0} to your project's classpath.
-jeeClasspathDescription=These libraries include the API and Source for the chosen JEE version.
-ejb3ClasspathPageTitle=JBoss EJB 3.0 Libraries
-ejb3ClasspathPageDescription=Add EJB 3.0 Libraries from one of the declared servers.
\ No newline at end of file
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/src/org/jboss/ide/eclipse/as/classpath/ui/Messages.properties 2009-05-25 04:41:24 UTC (rev 15471)
@@ -0,0 +1,16 @@
+ClasspathUIPlugin_ALERT=EJB3 Tools - Alert
+ClasspathUIPlugin_ERROR=EJB3 Tools - Error
+ClasspathUIPlugin_OK=OK
+ClasspathUIPlugin_WARNING=EJB3 Tools - Warning
+DirectoryLibraryPage_Description=A classpath container that automatically adds all .jar and .zip files found in a directory to the classpath.
+DirectoryLibraryPage_LabelProject=Project:
+DirectoryLibraryPage_WebProjects=test
+DirectoryLibraryPage_Title=Directory library
+jeeClasspathAdding=Adding {0}
+jeeClasspathBody=Click finish to continue adding {0} to your project's classpath.
+jeeClasspathDescription=These libraries include the API and Source for the chosen JEE version.
+ejb3ClasspathPageTitle=JBoss EJB 3.0 Libraries
+ejb3ClasspathPageDescription=Add EJB 3.0 Libraries from one of the declared servers.
+JBossEJB3LibrariesPage_ConfigurationDoesNotContainEJB3Libraries=The selected configuration ("{0}") does not contain the expected EJB3 libraries. Please install JBoss with EJB3 enabled, or try another configuration.
+JBossSelectionPage_ButtonText=Create a JBoss Server
+JBossSelectionPage_Name=JBoss Server Selection
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-05-25 04:39:55 UTC (rev 15470)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-05-25 04:41:24 UTC (rev 15471)
@@ -23,7 +23,8 @@
import org.eclipse.osgi.util.NLS;
-public class Messages {
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.ui.Messages"; //$NON-NLS-1$
/* Standard and re-usable */
public static String browse;
public static String serverName;
@@ -38,8 +39,16 @@
public static String wf_JRELabel;
public static String wf_ConfigLabel;
+ public static String J2EEModuleExportOperation_DestinationFileIsDirectoryError;
+ public static String J2EEModuleExportOperation_ErrorExportingArchive;
public static String JBAS_version;
public static String JBEAP_version;
+ public static String JBossRuntimeWizardFragment_AllFieldsRequired;
+ public static String JBossRuntimeWizardFragment_CopyAConfigShellText;
+ public static String JBossRuntimeWizardFragment_DeleteConfigConfirmation;
+ public static String JBossRuntimeWizardFragment_DeleteConfigTitle;
+ public static String JBossRuntimeWizardFragment_MustSelectValidConfig;
+ public static String JBossRuntimeWizardFragment_OutputFolderExists;
public static String rwf_CopyConfigLabel;
public static String rwf_DestinationLabel;
public static String rwf_TitleCreate;
@@ -70,7 +79,11 @@
public static String sswf_Title;
public static String sswf_BaseName;
+ public static String ServerActionProvider_CouldNotOpenServerError;
+ public static String ServerContentProvider_ErrorInServersViewAnimation;
public static String ServerDialogHeading;
+ public static String ServerLogView_ImportingLogTaskName;
+ public static String ServerLogView_NoLogSelected;
public static String credentials_warning;
public static String credentials_save;
@@ -82,6 +95,7 @@
public static String IncrementalPublishModuleText;
public static String FullPublishModuleText;
public static String DeleteModuleDescription;
+ public static String PollerSection_ServerPollingSection;
public static String PublishModuleDescription;
public static String DeleteModuleConfirm;
@@ -97,6 +111,7 @@
public static String ActionDelegateFileResourcesOnly;
public static String ActionDelegateSelectServer;
+ public static String ChangePortDialog_LoadingTaskName;
/* Console */
public static String ConsoleResourceNotFound;
public static String ConsoleCouldNotLocateInWorkspace;
@@ -104,6 +119,7 @@
/* Twiddle Dialog */
public static String TwiddleDialog;
+ public static String TwiddleDialog_UnexpectedError;
public static String TwiddleDialogExecute;
public static String TwiddleDialogDone;
public static String TwiddleDialogArguments;
@@ -112,6 +128,7 @@
public static String XPathNewCategory;
public static String XPathNewCategoryNameInUse;
public static String XPathCategoryName;
+ public static String XPathChangeValueAction_ActionText;
public static String XPathNewXpath;
public static String XPathNameEmpty;
public static String XPathNameInUse;
@@ -120,9 +137,24 @@
public static String XPathName;
public static String XPathPattern;
+ public static String XPathActionProvider_EditFileAction;
+ public static String XPathActionProvider_ErrorRunningAction;
+ public static String XPathActionProvider_NewCategoryAction;
+ public static String XPathActionProvider_RemoveCategoryQuestion;
public static String XPathAttribute;
+ public static String XPathDialogs_BlankCategoryError;
+ public static String XPathDialogs_CategoryLabel;
+ public static String XPathDialogs_NoElementsMatched;
+ public static String XPathDialogs_PreviewButton;
+ public static String XPathDialogs_SelectServer;
+ public static String XPathDialogs_ServerLabel;
+ public static String XPathDialogs_XPathDescriptionLabel;
+ public static String XPathTreeContentProvider_JobName;
+ public static String XPathTreeLabelProvider_LoadingLabel;
+ public static String XPathTreeLabelProvider_MatchIndexLabel;
+ public static String XPathTreeLabelProvider_XMLConfigLabel;
public static String DescriptorXPathRemoveCategory;
public static String DescriptorXPathRemoveCategoryDesc;
public static String DescriptorXPathNewXPath;
@@ -161,19 +193,40 @@
public static String EditorCPD_DefaultDescription;
public static String EditorCPD_RestoreDefault;
public static String EditorNoRuntimeSelected;
+ public static String ExploreUtils_Action_Text;
+ public static String ExploreUtils_Description;
public static String Configure;
+ public static String ConfigureRuntimeMarkerResolution_Description;
+ public static String ConvertNodeToXPathDialog_DisplayString;
+ public static String ConvertNodeToXPathDialog_ErrorMessage;
+ public static String ConvertNodeToXPathDialog_KeyedAttributes;
// misc
public static String ServerSaveFailed;
+ public static String StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage;
+ public static String StrippedServerWizardFragment_NameInUseStatusMessage;
+ public static String StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage;
// Launch Config
public static String LaunchInvalidConfigChanged;
public static String LaunchInvalidHostChanged;
+ public static String LogLabelProvider_HoursMinutesAgo;
+ public static String LogLabelProvider_MinutesSecondsAgo;
+ public static String LogLabelProvider_PublishingEventType;
+ public static String LogLabelProvider_SecondsAgo;
+ public static String LogLabelProvider_StartupShutdownEventType;
+ public static String LogLabelProvider_UnknownEventType;
+ public static String RequiredCredentialsDialog_IgnoreButton;
+ public static String RequiredCredentialsDialog_ShellText;
+
static {
- NLS.initializeMessages("org.jboss.ide.eclipse.as.ui.Messages",
+ NLS.initializeMessages(BUNDLE_NAME,
Messages.class);
}
+
+ private Messages() {
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-05-25 04:39:55 UTC (rev 15470)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-05-25 04:41:24 UTC (rev 15471)
@@ -19,8 +19,16 @@
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
rwf_NoVMSelected=No VM selected
+J2EEModuleExportOperation_DestinationFileIsDirectoryError=The specified file: {0} exists and is a directory
+J2EEModuleExportOperation_ErrorExportingArchive=Error Exporting {0}
JBAS_version=JBoss Application Server {0}
JBEAP_version=JBoss Enterprise Application Platform {0}
+JBossRuntimeWizardFragment_AllFieldsRequired=All fields must be completed.
+JBossRuntimeWizardFragment_CopyAConfigShellText=Copy a Configuration
+JBossRuntimeWizardFragment_DeleteConfigConfirmation=Are you sure you want to delete this folder? This cannot be undone.
+JBossRuntimeWizardFragment_DeleteConfigTitle=Delete Configuration?
+JBossRuntimeWizardFragment_MustSelectValidConfig=User must select a valid configuration
+JBossRuntimeWizardFragment_OutputFolderExists=The output folder already exists:
swf_Title=Create a new JBoss Server
swf_RuntimeInformation=Runtime Information
swf_Explanation=A JBoss Server manages starting and stopping instances of JBoss. \nIt manages command line arguments and keeps track of which modules have been deployed.
@@ -48,13 +56,18 @@
value=Value
#Server View Dialog Heading
+ServerActionProvider_CouldNotOpenServerError=Could not open server
+ServerContentProvider_ErrorInServersViewAnimation=Error in Servers view animation
ServerDialogHeading=JBoss Server
+ServerLogView_ImportingLogTaskName=Importing Server Log
+ServerLogView_NoLogSelected=No Log Selected
#View's Module extension
DeleteModuleText=Remove
FullPublishModuleText=Full Publish
IncrementalPublishModuleText=Incremental Publish
DeleteModuleDescription=Remove this module from the server.
+PollerSection_ServerPollingSection=Server Polling
PublishModuleDescription=Force a republish action on this module.
DeleteModuleConfirm=Are you sure you want to remove the module from the server?
@@ -70,11 +83,13 @@
ActionDelegateSelectServer=Select a server to publish to
# Console
+ChangePortDialog_LoadingTaskName=Loading...
ConsoleResourceNotFound=Resource not found
ConsoleCouldNotLocateInWorkspace=Could not locate {0} in workspace.
#Twiddle Dialog
TwiddleDialog=Twiddle Dialog
+TwiddleDialog_UnexpectedError=Unexpected error in TwiddleDialog
TwiddleDialogExecute=Execute Twiddle
TwiddleDialogDone=Done
TwiddleDialogArguments=Twiddle Arguments\:
@@ -84,6 +99,7 @@
XPathNewCategory=New Category
XPathNewCategoryNameInUse=Category Name In use.
XPathCategoryName=Category Name
+XPathChangeValueAction_ActionText=Change Value
XPathNewXpath=New XPath
XPathNameEmpty=Name must be set.
XPathNameInUse=Name already in use.
@@ -91,7 +107,24 @@
XPathColumnAttributeVals=Value
XPathName=Name\:
XPathPattern=XPath Pattern\:
+XPathActionProvider_EditFileAction=Edit File
+XPathActionProvider_ErrorRunningAction=Error running edit file action
+XPathActionProvider_NewCategoryAction=New Category
+XPathActionProvider_RemoveCategoryQuestion=Remove Category?
XPathAttribute=Attribute Name\:
+XPathDialogs_BlankCategoryError=Category must not be blank
+XPathDialogs_CategoryLabel=Category:
+XPathDialogs_NoElementsMatched=No XML elements matched your search.
+XPathDialogs_PreviewButton=Preview
+XPathDialogs_SelectServer=Please Select a Server
+XPathDialogs_ServerLabel=Server:
+XPathDialogs_XPathDescriptionLabel=An XPath is a way to find a specific XML element inside an xml file. \n\
+This dialog will help you create one. These XPaths' values can then be modified\n\
+by using the JBoss Servers View with the Properties View.
+XPathTreeContentProvider_JobName=Loading XPaths
+XPathTreeLabelProvider_LoadingLabel=Loading...
+XPathTreeLabelProvider_MatchIndexLabel=Match {0}
+XPathTreeLabelProvider_XMLConfigLabel=XML Configuration
#preference page
@@ -137,11 +170,28 @@
EditorCPD_DefaultDescription=This wizard allows you to edit which xpath is used to locate a port used by the tooling.\nThis will not change any server files, only what ports are used to interact with it.
EditorCPD_RestoreDefault=Restore Default
EditorNoRuntimeSelected=No Runtime Selected. Please select a runtime and refresh your deployment options.
+ExploreUtils_Action_Text=Explore
+ExploreUtils_Description=Explore deploy directory
Configure=Configure...
+ConfigureRuntimeMarkerResolution_Description=Configure Targeted Runtimes
+ConvertNodeToXPathDialog_DisplayString=Add to XPaths
+ConvertNodeToXPathDialog_ErrorMessage=You should not key off the value you wish to change
+ConvertNodeToXPathDialog_KeyedAttributes=Keyed Attributes
# misc
ServerSaveFailed=Server save failed
+StrippedServerWizardFragment_DeployFolderDoesNotExistStatusMessage=Deploy Folder does not exist
+StrippedServerWizardFragment_NameInUseStatusMessage=Name in use
+StrippedServerWizardFragment_TemporaryDeployFolderDoesNotExistStatusMessage=Temporary Deploy Folder does not exist
#Launch Config
LaunchInvalidConfigChanged=Configuration can only be changed by modifying the server's runtime.
LaunchInvalidHostChanged=The Host can only be changed in the Server Editor.
+LogLabelProvider_HoursMinutesAgo={0} hours, {1} minutes ago
+LogLabelProvider_MinutesSecondsAgo={0} minutes, {1} seconds ago
+LogLabelProvider_PublishingEventType=Publishing
+LogLabelProvider_SecondsAgo={0} seconds ago
+LogLabelProvider_StartupShutdownEventType=Server Startup / Shutdown
+LogLabelProvider_UnknownEventType=Unknown Event Type
+RequiredCredentialsDialog_IgnoreButton=Ignore
+RequiredCredentialsDialog_ShellText=Server Credentials Required
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java 2009-05-25 04:39:55 UTC (rev 15470)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ServerActionMessages.java 2009-05-25 04:41:24 UTC (rev 15471)
@@ -3,7 +3,7 @@
import org.eclipse.osgi.util.NLS;
public class ServerActionMessages extends NLS {
- private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.ui.actions.messages";
+ private static final String BUNDLE_NAME = "org.jboss.ide.eclipse.as.ui.actions.messages"; //$NON-NLS-1$
static {
// load message values from bundle file
@@ -14,6 +14,7 @@
public static String START_IN_RUN_MODE;
public static String RESTART_IN_RUN_MODE;
public static String SELECT_A_SERVER;
+ public static String SelectServerActionDelegate_NewServerMenuItem;
public static String STOP_SERVER;
public static String CHANGE_TIME_STAMP;
public static String CHANGE_TIME_STAMP_DEFAULT;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties 2009-05-25 04:39:55 UTC (rev 15470)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/messages.properties 2009-05-25 04:41:24 UTC (rev 15471)
@@ -3,6 +3,7 @@
START_IN_RUN_MODE=Start {0}
RESTART_IN_RUN_MODE=Restart {0}
SELECT_A_SERVER=Select a default server
+SelectServerActionDelegate_NewServerMenuItem=New server...
STOP_SERVER=Shutdown {0}
CHANGE_TIME_STAMP=Change Timestamp of {0}
CHANGE_TIME_STAMP_DEFAULT=Touch descriptors
\ No newline at end of file
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15470 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration: src/org/jboss/ide/eclipse/archives/jdt/integration and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:39:55 -0400 (Mon, 25 May 2009)
New Revision: 15470
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/.settings/org.eclipse.jdt.core.prefs
trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ArchiveJDTIntegrationPlugin.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:39:55 UTC (rev 15470)
@@ -4,4 +4,5 @@
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
org.eclipse.jdt.core.compiler.source=1.5
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ArchiveJDTIntegrationPlugin.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ArchiveJDTIntegrationPlugin.java 2009-05-25 04:38:33 UTC (rev 15469)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ArchiveJDTIntegrationPlugin.java 2009-05-25 04:39:55 UTC (rev 15470)
@@ -15,7 +15,7 @@
public class ArchiveJDTIntegrationPlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.archives.jdt.integration";
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.archives.jdt.integration"; //$NON-NLS-1$
// The shared instance
private static ArchiveJDTIntegrationPlugin plugin;
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15469 - in trunk/hibernatetools/plugins: org.hibernate.eclipse/.settings and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sflanigan
Date: 2009-05-25 00:38:33 -0400 (Mon, 25 May 2009)
New Revision: 15469
Added:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.hibernate.eclipse.help/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/.settings/
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/.settings/org.eclipse.jdt.core.prefs
trunk/hibernatetools/plugins/org.hibernate.eclipse/.settings/
trunk/hibernatetools/plugins/org.hibernate.eclipse/.settings/org.eclipse.jdt.core.prefs
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings/org.eclipse.jdt.core.prefs
Log:
https://jira.jboss.org/jira/browse/JBIDE-3557 Externalise English Strings
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-05-23 22:09:46 UTC (rev 15468)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-05-25 04:38:33 UTC (rev 15469)
@@ -195,15 +195,21 @@
public static String NewHibernateMappingElementsSelectionPage_select;
public static String NewHibernateMappingFilePage_browse;
+ public static String NewHibernateMappingFilePage_class_name_column;
+
public static String NewHibernateMappingFilePage_class_to_map;
public static String NewHibernateMappingFilePage_container;
public static String NewHibernateMappingFilePage_file_container_must_be_specified;
public static String NewHibernateMappingFilePage_file_container_must_exist;
public static String NewHibernateMappingFilePage_file_name;
+ public static String NewHibernateMappingFilePage_file_name_column;
public static String NewHibernateMappingFilePage_file_name_must_be_specified;
public static String NewHibernateMappingFilePage_file_name_must_be_valid;
public static String NewHibernateMappingFilePage_hibernate_xml_mapping_file;
public static String NewHibernateMappingFilePage_project_must_be_writable;
+
+ public static String NewHibernateMappingFilePage_project_name_column;
+
public static String NewHibernateMappingFilePage_select_class_to_map;
public static String NewHibernateMappingFilePage_select_new_file_container;
public static String NewHibernateMappingFilePage_the_class_will_be_used_when;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-05-23 22:09:46 UTC (rev 15468)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-05-25 04:38:33 UTC (rev 15469)
@@ -190,15 +190,18 @@
NewConfigurationWizardPage_user_name=User&name:
NewHibernateMappingElementsSelectionPage_select=Select compilation units or containers.
NewHibernateMappingFilePage_browse=Browse...
+NewHibernateMappingFilePage_class_name_column=Class name
NewHibernateMappingFilePage_class_to_map=Class to &map:
NewHibernateMappingFilePage_container=&Container:
NewHibernateMappingFilePage_file_container_must_be_specified=File container must be specified
NewHibernateMappingFilePage_file_container_must_exist=File container must exist
NewHibernateMappingFilePage_file_name=&File name:
+NewHibernateMappingFilePage_file_name_column=File name
NewHibernateMappingFilePage_file_name_must_be_specified=File name must be specified
NewHibernateMappingFilePage_file_name_must_be_valid=File name must be valid
NewHibernateMappingFilePage_hibernate_xml_mapping_file=Hibernate XML Mapping file
NewHibernateMappingFilePage_project_must_be_writable=Project must be writable
+NewHibernateMappingFilePage_project_name_column=Project name
NewHibernateMappingFilePage_select_class_to_map=Select class to map
NewHibernateMappingFilePage_select_new_file_container=Select new file container
NewHibernateMappingFilePage_the_class_will_be_used_when=The class will be used when generating the hbm.xml file
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
@@ -0,0 +1 @@
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-05-23 22:09:46 UTC (rev 15468)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2009-05-25 04:38:33 UTC (rev 15469)
@@ -420,12 +420,12 @@
@Override
public boolean visit(ParameterizedType type) {
- Assert.isNotNull(type, "Type object cannot be null");
- Assert.isNotNull(entityInfo, "EntityInfo object cannot be null");
+ Assert.isNotNull(type, "Type object cannot be null"); //$NON-NLS-1$
+ Assert.isNotNull(entityInfo, "EntityInfo object cannot be null"); //$NON-NLS-1$
ITypeBinding tb = type.resolveBinding();
- Assert.isNotNull(tb, "Type binding not resolved.");
+ Assert.isNotNull(tb, "Type binding not resolved."); //$NON-NLS-1$
rootClass = rootClasses.get(entityInfo.getFullyQualifiedName());
- Assert.isNotNull(rootClass, "RootClass not found.");
+ Assert.isNotNull(rootClass, "RootClass not found."); //$NON-NLS-1$
Value value = null;
if (ref != null && rootClasses.get(ref.fullyQualifiedName) != null){
@@ -491,7 +491,7 @@
} else if (value instanceof org.hibernate.mapping.Map){
SimpleValue map_key = new SimpleValue();
//FIXME: how to detect key-type here
- map_key.setTypeName("String");
+ map_key.setTypeName("String"); //$NON-NLS-1$
((IndexedCollection)value).setIndex(map_key);
}
prop.setCascade("none");//$NON-NLS-1$
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-05-23 22:09:46 UTC (rev 15468)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFilePage.java 2009-05-25 04:38:33 UTC (rev 15469)
@@ -93,22 +93,22 @@
private void createTableColumns(Table table){
int coulmnIndex = 0;
TableColumn column = new TableColumn(table, SWT.CENTER, coulmnIndex++);
- column.setText("!");
+ column.setText("!"); //$NON-NLS-1$
column.setWidth(20);
column.setResizable(false);
//if (project_infos.keySet().size() > 1){
column = new TableColumn(table, SWT.LEFT, coulmnIndex++);
- column.setText("Project name");
+ column.setText(HibernateConsoleMessages.NewHibernateMappingFilePage_project_name_column);
column.setWidth(120);
//}
column = new TableColumn(table, SWT.LEFT, coulmnIndex++);
- column.setText("Class name");
+ column.setText(HibernateConsoleMessages.NewHibernateMappingFilePage_class_name_column);
column.setWidth(150);
column = new TableColumn(table, SWT.LEFT, coulmnIndex++);
- column.setText("File name");
+ column.setText(HibernateConsoleMessages.NewHibernateMappingFilePage_file_name_column);
column.setWidth(150);
}
@@ -143,7 +143,7 @@
public Boolean isCreate = true;
public TableLine(String projectName, String className){
- this(projectName, className, className + ".hbm.xml",true);
+ this(projectName, className, className + ".hbm.xml",true); //$NON-NLS-1$
}
public TableLine(String projectName, String className, String fileName, boolean isCreate){
@@ -233,13 +233,13 @@
}
public Object getValue(Object element, String property) {
- if (Columns.CLASS.toString().equals(property)){//$NON-NLS-1$
+ if (Columns.CLASS.toString().equals(property)){
return ((TableLine)element).className;
- } else if (Columns.PROJECT.toString().equals(property)){//$NON-NLS-1$
+ } else if (Columns.PROJECT.toString().equals(property)){
return ((TableLine)element).projectName;
- } else if (Columns.FILE.toString().equals(property)){//$NON-NLS-1$
+ } else if (Columns.FILE.toString().equals(property)){
return ((TableLine)element).fileName;
- } else if (Columns.CREATE.toString().equals(property)){//$NON-NLS-1$
+ } else if (Columns.CREATE.toString().equals(property)){
return ((TableLine)element).isCreate;
}
return null;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings/org.eclipse.jdt.core.prefs 2009-05-23 22:09:46 UTC (rev 15468)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings/org.eclipse.jdt.core.prefs 2009-05-25 04:38:33 UTC (rev 15469)
@@ -9,4 +9,5 @@
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
org.eclipse.jdt.core.compiler.source=1.3
15 years, 4 months
- 1
- 0
JBoss Tools SVN: r15468 - workspace/snjeza/seam-examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-05-23 18:09:46 -0400 (Sat, 23 May 2009)
New Revision: 15468
Modified:
workspace/snjeza/seam-examples/booking-mavenized-2.1.1.zip
workspace/snjeza/seam-examples/booking-mavenized.zip
Log:
https://jira.jboss.org/jira/browse/JBIDE-4368 Seam components autocompletion is broken in mavenized projects
Modified: workspace/snjeza/seam-examples/booking-mavenized-2.1.1.zip
===================================================================
(Binary files differ)
Modified: workspace/snjeza/seam-examples/booking-mavenized.zip
===================================================================
(Binary files differ)
15 years, 4 months
- 1
- 0