Author: rob.stryker(a)jboss.com
Date: 2008-06-04 16:51:29 -0400 (Wed, 04 Jun 2008)
New Revision: 8554
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/JBossServerUISharedImages.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/DeployAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ELExceptionsMatcher.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/SecurityFailureHandler.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java
Log:
Internationalization / string externalization
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -43,7 +43,7 @@
private ResourceBundle resourceBundle;
// UI plugin id
- public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui";
+ public static final String PLUGIN_ID = "org.jboss.ide.eclipse.as.ui";
//$NON-NLS-1$
/**
* The constructor.
@@ -52,7 +52,7 @@
super();
plugin = this;
try {
- resourceBundle =
ResourceBundle.getBundle("org.jboss.ide.eclipse.as.ui.ServerUiPluginResources");
+ resourceBundle =
ResourceBundle.getBundle("org.jboss.ide.eclipse.as.ui.ServerUiPluginResources");
//$NON-NLS-1$
} catch (MissingResourceException x) {
resourceBundle = null;
}
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -55,12 +55,12 @@
private static JBossServerUISharedImages instance;
- private Hashtable images, descriptors;
+ private Hashtable<String, Object> images, descriptors;
private JBossServerUISharedImages () {
instance = this;
- images = new Hashtable();
- descriptors = new Hashtable();
+ images = new Hashtable<String, Object>();
+ descriptors = new Hashtable<String, Object>();
Bundle pluginBundle = JBossServerUIPlugin.getDefault().getBundle();
descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle,
"/icons/jboss.gif"));
@@ -76,10 +76,10 @@
descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle,
"/icons/publish.gif"));
descriptors.put(UNPUBLISH_IMAGE, createImageDescriptor(pluginBundle,
"/icons/unpublish.gif"));
- Iterator iter = descriptors.keySet().iterator();
+ Iterator<String> iter = descriptors.keySet().iterator();
while (iter.hasNext()) {
- String key = (String) iter.next();
+ String key = iter.next();
ImageDescriptor descriptor = descriptor(key);
images.put(key, descriptor.createImage());
}
@@ -121,7 +121,7 @@
}
protected void finalize() throws Throwable {
- Iterator iter = images.keySet().iterator();
+ Iterator<String> iter = images.keySet().iterator();
while (iter.hasNext())
{
Image image = (Image) images.get(iter.next());
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -108,13 +108,20 @@
public static String ActionDelegateNew;
public static String ActionDelegateNewMBeanStubs;
public static String ActionDelegateNewServer;
+ public static String ActionDelegateMakeDeployable;
+ public static String ActionDelegateMakeUndeployable;
+ public static String ActionDelegateDeployableServersNotFoundTitle;
+ public static String ActionDelegateDeployableServersNotFoundDesc;
+ public static String ActionDelegateCannotPublish;
+ public static String ActionDelegatePublishFailed;
+ public static String ActionDelegateFileResourcesOnly;
+ public static String ActionDelegateSelectServer;
+
+ /* Console */
+ public static String ConsoleResourceNotFound;
+ public static String ConsoleCouldNotLocateInWorkspace;
+
- /* Launch Group */
- public static String LaunchGroupStartArgs;
- public static String LaunchGroupStopArgs;
- public static String LaunchGroupTwiddleArgs;
- public static String LaunchGroupConfigChanged;
-
/* Twiddle Dialog */
public static String TwiddleDialog;
public static String TwiddleDialogExecute;
@@ -208,8 +215,27 @@
/* Editor Strings */
-
+ public static String EditorSetDeployLabel;
+ public static String EditorSetTempDeployLabel;
+ public static String EditorDeployDNE;
+ public static String EditorTempDeployDNE;
+ public static String EditorStartupPollerLabel;
+ public static String EditorShutdownPollerLabel;
+ public static String EditorChangeStartPollerCommandName;
+ public static String EditorChangeStopPollerCommandName;
+ public static String EditorServerPorts;
+ public static String EditorServerPortsDescription;
+ public static String EditorJNDIPort;
+ public static String EditorWebPort;
+ public static String EditorAutomaticallyDetectPort;
+ public static String EditorChangeJNDICommandName;
+ public static String EditorChangeWebCommandName;
+ public static String EditorChangeUsernameCommandName;
+ public static String EditorChangePasswordCommandName;
+ // misc
+ public static String ServerSaveFailed;
+
static {
NLS.initializeMessages(JBossServerUIPlugin.PLUGIN_ID + ".Messages",
Messages.class);
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2008-06-04
20:51:29 UTC (rev 8554)
@@ -76,14 +76,19 @@
ActionDelegateNew=New
ActionDelegateNewMBeanStubs=New MBean Stubs
ActionDelegateNewServer=New Server
+ActionDelegateMakeDeployable=Make Deployable
+ActionDelegateMakeUndeployable=Make Undeployable
+ActionDelegateDeployableServersNotFoundTitle=No deployable servers found
+ActionDelegateDeployableServersNotFoundDesc=There are no servers that support deploying
single files.
+ActionDelegateCannotPublish=Cannot Publish To Server
+ActionDelegatePublishFailed=Publishing files to server failed
+ActionDelegateFileResourcesOnly=One or more selected objects are not Files.
+ActionDelegateSelectServer=Select a server to publish to
+# Console
+ConsoleResourceNotFound=Resource not found
+ConsoleCouldNotLocateInWorkspace=Could not locate {0} in workspace.
-#Launch Config Tab Group
-LaunchGroupStartArgs=Start Args
-LaunchGroupTwiddleArgs=Twiddle Args
-LaunchGroupStopArgs=Stop Args
-LaunchGroupConfigChanged=You may not change the configuration.
-
#Twiddle Dialog
TwiddleDialog=Twiddle Dialog
TwiddleDialogExecute=Execute Twiddle
@@ -186,4 +191,23 @@
FilesetsNewBrowse=Browse...
FilesetsNewIncludes=Includes:
FilesetsNewExcludes=Excludes:
-FilesetsNewPreview=Preview
\ No newline at end of file
+FilesetsNewPreview=Preview
+
+
+#Editor
+EditorSetDeployLabel=Set Deploy Directory
+EditorSetTempDeployLabel=Set Temporary Deploy Directory
+EditorDeployDNE=The deploy directory "{0}" does not exist.
+EditorTempDeployDNE=The temporary deploy directory "{0}" does not exist.
+EditorStartupPollerLabel=Startup Poller
+EditorShutdownPollerLabel=Shutdown Poller
+EditorChangeStartPollerCommandName=Change Startup Poller
+EditorChangeStopPollerCommandName=Change Shutdown Poller
+EditorJNDIPort=JNDI Port:
+EditorWebPort=Web Port:
+EditorAutomaticallyDetectPort=Automatically detect
+EditorChangeJNDICommandName=Change JNDI Port Details
+EditorChangeWebCommandName=Change Web Port Details
+
+# misc
+ServerSaveFailed=Server save failed
\ No newline at end of file
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/DeployAction.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -27,7 +27,6 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
@@ -49,7 +48,6 @@
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.MessageBox;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.ui.IObjectActionDelegate;
@@ -57,12 +55,12 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.internal.PublishServerJob;
import org.eclipse.wst.server.ui.internal.ImageResource;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
import
org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory.UndeployFromServerJob;
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;
/**
*
@@ -98,8 +96,8 @@
protected String getText(boolean type) {
if( type )
- return "Unmake Deployable";
- return "Make Deployable";
+ return Messages.ActionDelegateMakeUndeployable;
+ return Messages.ActionDelegateMakeDeployable;
}
// True if we want to unpublish, false if we wantt to publish
@@ -157,7 +155,9 @@
protected void tryToPublish() {
IServer[] deployableServersAsIServers =
ServerConverter.getDeployableServersAsIServers();
if(deployableServersAsIServers.length==0) {
- MessageDialog.openInformation(shell, "No deployable servers found",
"There are no servers that support deploying single files.");
+ MessageDialog.openInformation(shell,
+ Messages.ActionDelegateDeployableServersNotFoundTitle,
+ Messages.ActionDelegateDeployableServersNotFoundDesc);
}
IServer server = getServer(shell,deployableServersAsIServers);
if(server==null) { // User pressed cancel.
@@ -171,13 +171,13 @@
IStructuredSelection sel2 = (IStructuredSelection)selection;
Object[] objs = sel2.toArray();
if( server == null ) {
- errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "No
deployable servers located");
- errorTitle = "Cannot Publish To Server";
- errorMessage = "No deployable servers located";
+ errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
Messages.ActionDelegateDeployableServersNotFoundTitle);
+ errorTitle = Messages.ActionDelegateCannotPublish;
+ errorMessage = Messages.ActionDelegateDeployableServersNotFoundDesc;
} else if( objs == null || !allFiles(objs) ) {
- errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID, "One or
more selected objects are not Files");
- errorTitle = "Cannot Publish To Server";
- errorMessage = "Only File resources may be published.\nOne or more selected
objects are not Files.";
+ errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
Messages.ActionDelegateFileResourcesOnly);
+ errorTitle = Messages.ActionDelegateCannotPublish;
+ errorMessage = Messages.ActionDelegateFileResourcesOnly;
} else {
IModule[] modules = new IModule[objs.length];
for( int i = 0; i < objs.length; i++ ) {
@@ -189,9 +189,9 @@
IServer saved = copy.save(false, new NullProgressMonitor());
saved.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor());
} catch( CoreException ce ) {
- errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
"Publishing files to server failed", ce);
- errorTitle = "Cannot Publish to Server";
- errorMessage = "Publishing files to server failed";
+ errorStatus = new Status(IStatus.ERROR, JBossServerUIPlugin.PLUGIN_ID,
Messages.ActionDelegatePublishFailed, ce);
+ errorTitle = Messages.ActionDelegateCannotPublish;
+ errorMessage = Messages.ActionDelegatePublishFailed;
}
}
}
@@ -235,7 +235,7 @@
public String getText(Object element) {
if( element instanceof IServer )
return ((IServer)element).getName();
- return "unknown object type";
+ return ""; //$NON-NLS-1$
}
}
@@ -245,7 +245,7 @@
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText("Select a server to publish to");
+ newShell.setText(Messages.ActionDelegateSelectServer);
}
public IServer getSelectedServer() {
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ELExceptionsMatcher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ELExceptionsMatcher.java 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ELExceptionsMatcher.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -41,15 +41,14 @@
import org.eclipse.debug.core.sourcelookup.ISourceLookupDirector;
import org.eclipse.debug.ui.IDebugUIConstants;
import org.eclipse.debug.ui.console.FileLink;
-import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.console.IHyperlink;
import org.eclipse.ui.console.IPatternMatchListenerDelegate;
import org.eclipse.ui.console.PatternMatchEvent;
import org.eclipse.ui.console.TextConsole;
-import org.eclipse.ui.internal.WorkbenchPlugin;
import org.jboss.ide.eclipse.as.ui.Messages;
/**
@@ -64,7 +63,7 @@
private TextConsole console;
- static final Pattern resourceLocationPattern = Pattern.compile("Exception: (.*)
@(\\d+),(\\d+)");
+ static final Pattern resourceLocationPattern = Pattern.compile("Exception: (.*)
@(\\d+),(\\d+)"); //$NON-NLS-1$
public void connect(TextConsole console) {
this.console = console;
@@ -165,13 +164,16 @@
}
// Nothing found, lets inform the user about that.
- MessageDialog.openInformation(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
"Resource not found", "Could not locate '" + resource +
"' in workspace." );
+ MessageDialog.openInformation(
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+ Messages.ConsoleResourceNotFound,
+ NLS.bind(Messages.ConsoleCouldNotLocateInWorkspace, resource));
}
private FileLink findFileInWorkspace() {
final String simpleName = resource.substring(resource
- .lastIndexOf("/") + 1);
+ .lastIndexOf("/") + 1); //$NON-NLS-1$
IPath path = new Path(resource);
IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploySection.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -27,6 +27,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -196,13 +197,15 @@
String error = "";
List<Status> status = new ArrayList<Status>();
if(!new Path(deployText.getText()).toFile().exists()) {
- String msg = "The deploy directory \"" + deployText.getText() +
"\" does not exist.";
+ String msg = NLS.bind(Messages.EditorDeployDNE, deployText.getText());
+// "The deploy directory \"" + deployText.getText() + "\"
does not exist.";
status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg));
error = msg + "\n";
}
if(!new Path(tempDeployText.getText()).toFile().exists()) {
- String msg = "The temporary deploy directory \"" +
tempDeployText.getText() + "\" does not exist.";
+ String msg = NLS.bind(Messages.EditorTempDeployDNE, tempDeployText.getText());
+ //"The temporary deploy directory \"" + tempDeployText.getText() +
"\" does not exist.";
status.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, msg));
error = error + msg + "\n";
}
@@ -219,7 +222,7 @@
private Text text;
private ModifyListener listener;
public SetDeployDirCommand() {
- super(DeploySection.this.server, "Set Deploy Directory");
+ super(DeploySection.this.server, Messages.EditorSetDeployLabel);
this.text = deployText;
this.newDir = deployText.getText();
this.listener = deployListener;
@@ -242,7 +245,7 @@
private Text text;
private ModifyListener listener;
public SetTempDeployDirCommand() {
- super(DeploySection.this.server, "Set Temporary Deploy Directory");
+ super(DeploySection.this.server, Messages.EditorSetTempDeployLabel);
text = tempDeployText;
newDir = tempDeployText.getText();
listener = tempDeployListener;
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -21,6 +21,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+import org.jboss.ide.eclipse.as.ui.Messages;
/**
*
@@ -68,8 +69,8 @@
stop = new Label(pollers, SWT.NONE);
stopPollerCombo = new Combo(pollers, SWT.READ_ONLY);
- start.setText("Startup Poller");
- stop.setText("Shutdown Poller");
+ start.setText(Messages.EditorStartupPollerLabel);
+ stop.setText(Messages.EditorShutdownPollerLabel);
// set items
startPollerCombo.setItems(startupTypesStrings);
@@ -118,7 +119,7 @@
public class SetStartupPollerCommand extends SetPollerCommand {
public SetStartupPollerCommand(IServerWorkingCopy server) {
- super(server, "Change Start Poller",
IJBossServerConstants.STARTUP_POLLER_KEY,
+ super(server, Messages.EditorChangeStartPollerCommandName,
IJBossServerConstants.STARTUP_POLLER_KEY,
IJBossServerConstants.DEFAULT_STARTUP_POLLER,
startupTypes, startPollerCombo, startPollerListener);
}
@@ -126,7 +127,7 @@
public class SetStopPollerCommand extends SetPollerCommand {
public SetStopPollerCommand(IServerWorkingCopy server) {
- super(server, "Change Stop Poller",
IJBossServerConstants.SHUTDOWN_POLLER_KEY,
+ super(server, Messages.EditorChangeStartPollerCommandName,
IJBossServerConstants.SHUTDOWN_POLLER_KEY,
IJBossServerConstants.DEFAULT_SHUTDOWN_POLLER,
shutdownTypes, stopPollerCombo, stopPollerListener);
}
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -29,6 +29,7 @@
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
+import org.jboss.ide.eclipse.as.ui.Messages;
/**
*
@@ -158,8 +159,8 @@
data.top = new FormAttachment(0,5);
jndiDetectCombo.setLayoutData(data);
- jndiLabel.setText("JNDI Port: ");
- jndiDetect.setText("Automatically detect");
+ jndiLabel.setText(Messages.EditorJNDIPort);
+ jndiDetect.setText(Messages.EditorAutomaticallyDetectPort);
jndiDetectCombo.setItems(getXPathStrings());
return child;
}
@@ -193,8 +194,8 @@
data.top = new FormAttachment(0,5);
webDetectCombo.setLayoutData(data);
- webLabel.setText("web Port: ");
- webDetect.setText("Automatically detect");
+ webLabel.setText(Messages.EditorWebPort);
+ webDetect.setText(Messages.EditorAutomaticallyDetectPort);
webDetectCombo.setItems(getXPathStrings());
return child;
}
@@ -236,7 +237,7 @@
public class ChangeJNDICommand extends SetPortCommand {
public ChangeJNDICommand(IServerWorkingCopy server) {
- super(server, "Change JNDI Details",
+ super(server, Messages.EditorChangeJNDICommandName,
IJBossServerConstants.JNDI_PORT, IJBossServerConstants.JNDI_PORT_DETECT,
IJBossServerConstants.JNDI_PORT_DETECT_XPATH,
IJBossServerConstants.JNDI_PORT_DEFAULT_XPATH,
jndiText, jndiDetect, jndiDetectCombo, jndiListener);
@@ -245,7 +246,7 @@
public class ChangeWebCommand extends SetPortCommand {
public ChangeWebCommand(IServerWorkingCopy server) {
- super(server, "Change Web Port Details",
+ super(server, Messages.EditorChangeWebCommandName,
IJBossServerConstants.WEB_PORT, IJBossServerConstants.WEB_PORT_DETECT,
IJBossServerConstants.WEB_PORT_DETECT_XPATH,
IJBossServerConstants.WEB_PORT_DEFAULT_XPATH,
webText, webDetect, webDetectCombo, webListener);
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 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -103,14 +103,14 @@
public class SetUserCommand extends SetVarCommand {
public SetUserCommand(IServerWorkingCopy server) {
- super(server, "Change Username", nameText, nameText.getText(),
+ super(server, Messages.EditorChangeUsernameCommandName, nameText, nameText.getText(),
JBossServer.SERVER_USERNAME, nameModifyListener);
}
}
public class SetPassCommand extends SetVarCommand {
public SetPassCommand(IServerWorkingCopy server) {
- super(server, "Change Password", passText, passText.getText(),
+ super(server, Messages.EditorChangePasswordCommandName, passText, passText.getText(),
JBossServer.SERVER_PASSWORD, passModifyListener);
}
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/SecurityFailureHandler.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -14,6 +14,8 @@
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
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;
import org.jboss.ide.eclipse.as.ui.dialogs.RequiredCredentialsDialog;
/**
@@ -25,7 +27,7 @@
public boolean accepts(IServerStatePoller poller, String action,
List requiredProperties) {
- if(
poller.getPollerType().getId().equals("org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"))
+ if( poller.getPollerType().getId().equals(JMXPoller.POLLER_ID))
return true;
return false;
}
@@ -44,7 +46,7 @@
try {
copy.save(false, null);
} catch( CoreException ce ) {
- // TODO log
+ JBossServerUIPlugin.log(Messages.ServerSaveFailed, ce);
}
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/perspective/ASPerspective.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -42,7 +42,7 @@
IFolderLayout folder= layout.createFolder("left", IPageLayout.LEFT,
(float)0.25, editorArea); //$NON-NLS-1$
folder.addView(JavaUI.ID_PACKAGES);
- folder.addView("org.eclipse.ui.navigator.ProjectExplorer");
+ folder.addView("org.eclipse.ui.navigator.ProjectExplorer"); //$NON-NLS-1$
folder.addPlaceholder(IPageLayout.ID_RES_NAV);
@@ -51,16 +51,16 @@
outputfolder.addView(JavaUI.ID_JAVADOC_VIEW);
outputfolder.addView(JavaUI.ID_SOURCE_VIEW);
outputfolder.addView(IConsoleConstants.ID_CONSOLE_VIEW);
- outputfolder.addView("org.eclipse.ui.views.PropertySheet");
- outputfolder.addView("org.jboss.ide.eclipse.archives.ui.ProjectArchivesView");
+ outputfolder.addView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+ outputfolder.addView("org.jboss.ide.eclipse.archives.ui.ProjectArchivesView");
//$NON-NLS-1$
outputfolder.addPlaceholder(NewSearchUI.SEARCH_VIEW_ID);
outputfolder.addPlaceholder(IPageLayout.ID_BOOKMARKS);
outputfolder.addPlaceholder(IProgressConstants.PROGRESS_VIEW_ID);
layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.RIGHT, (float)0.75, editorArea);
- IFolderLayout serverFolder = layout.createFolder("leftBottom",
IPageLayout.BOTTOM, (float)0.60, "left"); //$NON-NLS-1$
- serverFolder.addView("org.jboss.ide.eclipse.as.ui.views.JBossServerView");
+ IFolderLayout serverFolder = layout.createFolder("leftBottom",
IPageLayout.BOTTOM, (float)0.60, "left"); //$NON-NLS-1$ //$NON-NLS-2$
+ serverFolder.addView("org.jboss.ide.eclipse.as.ui.views.JBossServerView");
//$NON-NLS-1$
layout.addActionSet(IDebugUIConstants.LAUNCH_ACTION_SET);
@@ -94,20 +94,20 @@
layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard");
//$NON-NLS-1$
layout.addNewWizardShortcut("org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard");
//$NON-NLS-1$
- layout.addNewWizardShortcut("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard");
- layout.addNewWizardShortcut("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
- layout.addNewWizardShortcut("org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard");
- layout.addNewWizardShortcut("org.jboss.ide.eclipse.ejb3.wizards.ui.NewSessionBeanWizard");
- layout.addNewWizardShortcut("org.jboss.ide.eclipse.ejb3.wizards.ui.NewMessageDrivenBeanWizard");
- layout.addNewWizardShortcut("org.jboss.ide.eclipse.as.ui.MBeanComponents");
+ layout.addNewWizardShortcut("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard");
//$NON-NLS-1$
+ layout.addNewWizardShortcut("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
//$NON-NLS-1$
+ layout.addNewWizardShortcut("org.eclipse.jst.servlet.ui.internal.wizard.AddServletWizard");
//$NON-NLS-1$
+ layout.addNewWizardShortcut("org.jboss.ide.eclipse.ejb3.wizards.ui.NewSessionBeanWizard");
//$NON-NLS-1$
+ layout.addNewWizardShortcut("org.jboss.ide.eclipse.ejb3.wizards.ui.NewMessageDrivenBeanWizard");
//$NON-NLS-1$
+ layout.addNewWizardShortcut("org.jboss.ide.eclipse.as.ui.MBeanComponents");
//$NON-NLS-1$
// perspectives
- layout.addPerspectiveShortcut("org.eclipse.debug.ui.DebugPerspective");
- layout.addPerspectiveShortcut("org.jboss.ide.eclipse.jbosscache.perspective2");
- layout.addPerspectiveShortcut("org.drools.ide.DroolsPerspective");
- layout.addPerspectiveShortcut("org.hibernate.eclipse.console.HibernateConsolePerspective");
+ layout.addPerspectiveShortcut("org.eclipse.debug.ui.DebugPerspective");
//$NON-NLS-1$
+ layout.addPerspectiveShortcut("org.jboss.ide.eclipse.jbosscache.perspective2");
//$NON-NLS-1$
+ layout.addPerspectiveShortcut("org.drools.ide.DroolsPerspective");
//$NON-NLS-1$
+ layout.addPerspectiveShortcut("org.hibernate.eclipse.console.HibernateConsolePerspective");
//$NON-NLS-1$
// Other JBoss perspectives
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java 2008-06-04
18:40:13 UTC (rev 8553)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/PropertySheetFactory.java 2008-06-04
20:51:29 UTC (rev 8554)
@@ -99,8 +99,6 @@
}
public void dispose() {
- // TODO Auto-generated method stub
-
}
public Control getControl() {