diff options
Diffstat (limited to 'plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy')
10 files changed, 93 insertions, 77 deletions
diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java index 6ddc519b4..202c87395 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/DebugModeHelper.java @@ -10,7 +10,7 @@ *******************************************************************************/ /* * $RCSfile: DebugModeHelper.java,v $ - * $Revision: 1.8 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.9 $ $Date: 2005/06/21 20:35:07 $ */ package org.eclipse.jem.internal.proxy.remote; @@ -357,7 +357,7 @@ class DebugModeHelper { protected void displayErrorMessageAWT(String title, String msg) { try { - fDoit.invoke(null, new Object[] {title, msg, ProxyRemoteMessages.getString("OK_7"), null}); //$NON-NLS-1$ + fDoit.invoke(null, new Object[] {title, msg, ProxyRemoteMessages.OK_7, null}); } catch (InvocationTargetException e) { } catch (IllegalAccessException e) { } diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java index 04f317b46..bba9c080c 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/LocalProxyLaunchDelegate.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ /* - * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.27 $ $Date: 2005/06/21 20:27:52 $ + * $RCSfile: LocalProxyLaunchDelegate.java,v $ $Revision: 1.28 $ $Date: 2005/06/21 20:35:07 $ */ package org.eclipse.jem.internal.proxy.remote; @@ -54,7 +54,7 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel String launchKey = configuration.getAttribute(IProxyConstants.ATTRIBUTE_LAUNCH_KEY, (String) null); if (launchKey == null) - abort(ProxyRemoteMessages.getString("ProxyRemoteNoLaunchKey"), null, 0); //$NON-NLS-1$ + abort(ProxyRemoteMessages.ProxyRemoteNoLaunchKey, null, 0); // In Eclipse, even if private, a launch will show up in the debug process tree and in the console viewer. // To be absolutely private, we need to remove the launch which has already been added. @@ -67,9 +67,9 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel IJavaProject project = getJavaProject(configuration); String name = configuration.getAttribute(IProxyConstants.ATTRIBUTE_VM_TITLE, (String) null); if (name == null) - name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMName"), new Object[] { project != null ? project.getProject().getName() : "" }); //$NON-NLS-1$ //$NON-NLS-2$ + name = MessageFormat.format(ProxyRemoteMessages.ProxyRemoteVMName, new Object[] { project != null ? project.getProject().getName() : "" }); else - name = MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteVMNameWithComment"), new Object[] { project != null ? project.getProject().getName() : "", name }); //$NON-NLS-1$ //$NON-NLS-2$ + name = MessageFormat.format(ProxyRemoteMessages.ProxyRemoteVMNameWithComment, new Object[] { project != null ? project.getProject().getName() : "", name }); String stepId = "Launch VM ( " + name + " )"; //$NON-NLS-1$ //$NON-NLS-2$ TimerTests.basicTest.startStep(stepId); @@ -78,7 +78,7 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel name = name.replace('"', '\''); pm.beginTask("", 500); //$NON-NLS-1$ - pm.subTask(MessageFormat.format(ProxyRemoteMessages.getString("ProxyRemoteLaunchVM"), new Object[] { name })); //$NON-NLS-1$ + pm.subTask(MessageFormat.format(ProxyRemoteMessages.ProxyRemoteLaunchVM, new Object[] { name })); // check for cancellation if (pm.isCanceled()) return; @@ -87,7 +87,7 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel IVMRunner runner = vm.getVMRunner(mode); if (runner == null) { - abort(MessageFormat.format(ProxyRemoteMessages.getString("Proxy_NoRunner_ERROR_"), new Object[] { name }), null, 0); //$NON-NLS-1$ + abort(MessageFormat.format(ProxyRemoteMessages.Proxy_NoRunner_ERROR_, new Object[] { name }), null, 0); } File workingDir = verifyWorkingDirectory(configuration); @@ -309,16 +309,16 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel java.io.StringWriter s = new java.io.StringWriter(); java.io.PrintWriter w = new java.io.PrintWriter(s); - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_INFO_")); //$NON-NLS-1$ - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_LINE1")); //$NON-NLS-1$ + w.println(ProxyRemoteMessages.VM_TERMINATED_INFO_); + w.println(ProxyRemoteMessages.VM_TERMINATED_LINE1); w.println(stProxy.getErrorStreamMonitor().getContents()); - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_LINE2")); //$NON-NLS-1$ + w.println(ProxyRemoteMessages.VM_TERMINATED_LINE2); w.println(stProxy.getOutputStreamMonitor().getContents()); - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_LINE3")); //$NON-NLS-1$ + w.println(ProxyRemoteMessages.VM_TERMINATED_LINE3); w.close(); - String msg = MessageFormat.format(ProxyRemoteMessages.getString("Proxy_Terminated_too_soon_ERROR_"), new Object[] { name }); //$NON-NLS-1$ - dh.displayErrorMessage(ProxyRemoteMessages.getString("Proxy_Error_Title"), msg); //$NON-NLS-1$ + String msg = MessageFormat.format(ProxyRemoteMessages.Proxy_Terminated_too_soon_ERROR_, new Object[] { name }); + dh.displayErrorMessage(ProxyRemoteMessages.Proxy_Error_Title, msg); throw new CoreException( new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null)); } else { @@ -341,7 +341,7 @@ public class LocalProxyLaunchDelegate extends AbstractJavaLaunchConfigurationDel printJob = new Job("") { //$NON-NLS-1$ protected IStatus run(IProgressMonitor monitor) { - monitor.beginTask(ProxyRemoteMessages.getString("LocalProxyLaunchDelegate.Monitor.PrintRemoteTrace.Text"), 1); //$NON-NLS-1$ + monitor.beginTask(ProxyRemoteMessages.LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text, 1); while(true) { String output = null; synchronized (gatheredText) { diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java index b301594cc..f2bf8d484 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/ProxyRemoteMessages.java @@ -1,37 +1,54 @@ -package org.eclipse.jem.internal.proxy.remote; /******************************************************************************* - * Copyright (c) 2001, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials + * Copyright (c) 2000, 2005 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html - * + * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -/* - * $RCSfile: ProxyRemoteMessages.java,v $ - * $Revision: 1.5 $ $Date: 2005/06/21 20:27:52 $ - */ +package org.eclipse.jem.internal.proxy.remote; -import java.util.MissingResourceException; -import java.util.ResourceBundle; +import org.eclipse.osgi.util.NLS; -public class ProxyRemoteMessages { +public final class ProxyRemoteMessages extends NLS { - private static final String BUNDLE_NAME = - "org.eclipse.jem.internal.proxy.remote.messages"; //$NON-NLS-1$ - private static final ResourceBundle RESOURCE_BUNDLE = - ResourceBundle.getBundle(BUNDLE_NAME); + private static final String BUNDLE_NAME = "org.eclipse.jem.internal.proxy.remote.messages";//$NON-NLS-1$ private ProxyRemoteMessages() { + // Do not instantiate } - public static String getString(String key) { - try { - return RESOURCE_BUNDLE.getString(key); - } catch (MissingResourceException e) { - return '!' + key + '!'; - } + public static String NO_OUTPUT_FOLDER_EXC_; + public static String VM_TERMINATED_INFO_; + public static String VM_TERMINATED_LINE1; + public static String VM_TERMINATED_LINE2; + public static String VM_TERMINATED_LINE3; + public static String REMOTE_VM_TRACE_INFO_; + public static String REMOTE_VM_LOCAL_TRACE_INFO_; + public static String Classcast_EXC_; + public static String Instantiate_EXC_; + public static String RemoteCmd_EXC_; + public static String ExceptionErrorMsg_EXC_; + public static String OK_7; + public static String Proxy_NoRunner_ERROR_; + public static String Proxy_Error_Title; + public static String Proxy_Terminated_too_soon_ERROR_; + public static String ProxyRemoteVMName; + public static String ProxyRemoteVMNameWithComment; + public static String ProxyRemoteNoLaunchKey; + public static String ProxyRemoteLaunchVM; + public static String CleanupJob_title; + public static String REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_; + public static String REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_; + public static String REMProxyFactoryRegistry_Job_TerminateProcess_Title; + public static String REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_; + public static String REMExpression_IOExceptionSeeLog_INFO_; + public static String REMExpression_CommandExceptionSeeLog_INFO_; + public static String LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text; + + static { + NLS.initializeMessages(BUNDLE_NAME, ProxyRemoteMessages.class); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java index 4e72457eb..a70aa8677 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMExpression.java @@ -10,7 +10,7 @@ *******************************************************************************/ /* * $RCSfile: REMExpression.java,v $ - * $Revision: 1.15 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.16 $ $Date: 2005/06/21 20:35:07 $ */ package org.eclipse.jem.internal.proxy.remote; @@ -176,9 +176,9 @@ public class REMExpression extends Expression { /** * General IOException occurred msg. */ - protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.IOExceptionSeeLog_INFO_"); //$NON-NLS-1$ + protected static final String IO_EXCEPTION_MSG = ProxyRemoteMessages.REMExpression_IOExceptionSeeLog_INFO_; - protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.getString("REMExpression.CommandExceptionSeeLog_INFO_"); //$NON-NLS-1$ + protected static final String COMMAND_EXCEPTION_MSG = ProxyRemoteMessages.REMExpression_CommandExceptionSeeLog_INFO_; /** * Throw an an illegal state exception if some general error, in particular an I/O or Command Exception diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java index d23e57d9b..50fc4b850 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMProxyFactoryRegistry.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.remote; /* * $RCSfile: REMProxyFactoryRegistry.java,v $ - * $Revision: 1.22 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.23 $ $Date: 2005/06/21 20:35:07 $ */ @@ -160,18 +160,18 @@ public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry { java.io.StringWriter s = new java.io.StringWriter(); java.io.PrintWriter w = new java.io.PrintWriter(s); - String msg = MessageFormat.format(ProxyRemoteMessages.getString("Proxy_Terminated_too_soon_ERROR_"), new Object[] {fName}); //$NON-NLS-1$ + String msg = MessageFormat.format(ProxyRemoteMessages.Proxy_Terminated_too_soon_ERROR_, new Object[] {fName}); w.println(msg); - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_INFO_")); //$NON-NLS-1$ - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_LINE1")); //$NON-NLS-1$ + w.println(ProxyRemoteMessages.VM_TERMINATED_INFO_); + w.println(ProxyRemoteMessages.VM_TERMINATED_LINE1); w.println(stProxy.getErrorStreamMonitor().getContents()); - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_LINE2")); //$NON-NLS-1$ + w.println(ProxyRemoteMessages.VM_TERMINATED_LINE2); w.println(stProxy.getOutputStreamMonitor().getContents()); - w.println(ProxyRemoteMessages.getString("VM_TERMINATED_LINE3")); //$NON-NLS-1$ + w.println(ProxyRemoteMessages.VM_TERMINATED_LINE3); w.close(); DebugModeHelper dh = new DebugModeHelper(); - dh.displayErrorMessage(ProxyRemoteMessages.getString("Proxy_Error_Title"), msg); //$NON-NLS-1$ + dh.displayErrorMessage(ProxyRemoteMessages.Proxy_Error_Title, msg); ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null)); processListener = null; DebugPlugin.getDefault().removeDebugEventListener(this); @@ -218,7 +218,7 @@ public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry { private IProcess process; public TerminateProcess(IProcess process) { - super(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.Job.TerminateProcess.Title")); //$NON-NLS-1$ + super(ProxyRemoteMessages.REMProxyFactoryRegistry_Job_TerminateProcess_Title); this.process = process; } @@ -365,7 +365,7 @@ public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry { if (c.isConnected()) return c; else - throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_")); //$NON-NLS-1$ + throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_); } } synchronized(fConnectionPool) { @@ -421,8 +421,8 @@ public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry { if (scArray[0] == null) { // Log where we are at so we can know where it was we down. - ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_")))); //$NON-NLS-1$ //$NON-NLS-2$ - throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_")); // Couldn't get one, probably server is down. //$NON-NLS-1$ + ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_))); + throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_); // Couldn't get one, probably server is down. //$NON-NLS-1$ } REMConnection connection = new REMConnection(scArray[0], fNoTimeouts); @@ -437,7 +437,7 @@ public class REMProxyFactoryRegistry extends BaseProxyFactoryRegistry { } else ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "No Server to retrieve a connection.", null)); ///$NON-NLS-1$ - throw new IllegalStateException(ProxyRemoteMessages.getString("REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_")); //$NON-NLS-1$ + throw new IllegalStateException(ProxyRemoteMessages.REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_); } /** diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java index a9e18aba1..a753b72b4 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMRegistryController.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.remote; /* * $RCSfile: REMRegistryController.java,v $ - * $Revision: 1.10 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.11 $ $Date: 2005/06/21 20:35:08 $ */ import java.util.HashMap; @@ -36,7 +36,7 @@ public class REMRegistryController { protected boolean inShutdown; // Are we in shutdown mode. Terminate registries runs differently in shutdown mode. // Thread to clean up GC'd proxies. Runs as a daemon at the lowest priority - private Job processQueueJob= new Job(ProxyRemoteMessages.getString("CleanupJob.title")) { //$NON-NLS-1$ + private Job processQueueJob= new Job(ProxyRemoteMessages.CleanupJob_title) { public IStatus run(IProgressMonitor m) { REMProxyFactoryRegistry[] registries = null; synchronized (REMRegistryController.this) { diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java index a46983126..2e41b24d4 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanProxyFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.remote; /* * $RCSfile: REMStandardBeanProxyFactory.java,v $ - * $Revision: 1.13 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.14 $ $Date: 2005/06/21 20:35:07 $ */ @@ -251,7 +251,7 @@ IBeanProxy createBeanProxy(IREMBeanTypeProxy aTypeProxy, String initializationSt case Commands.CLASS_CAST_EXCEPTION: // The result was not of the correct type. throw new ClassCastException( - MessageFormat.format(ProxyRemoteMessages.getString("Classcast_EXC_"), new Object[] {extractFirstLine(initializationString), aTypeProxy.getTypeName()})); //$NON-NLS-1$ + MessageFormat.format(ProxyRemoteMessages.Classcast_EXC_, new Object[] {extractFirstLine(initializationString), aTypeProxy.getTypeName()})); case Commands.CANNOT_EVALUATE_STRING: // Want to log the exception that caused it to not evaluate. // Don't need to log this side, just log the RemoteVM side of the trace. @@ -260,7 +260,7 @@ IBeanProxy createBeanProxy(IREMBeanTypeProxy aTypeProxy, String initializationSt ((ThrowableProxy) e.getErrorObject()).printProxyStackTrace(w); ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, s.toString(), null)); throw new InstantiationException( - MessageFormat.format(ProxyRemoteMessages.getString("Instantiate_EXC_"), new Object[] {extractFirstLine(initializationString)})); //$NON-NLS-1$ + MessageFormat.format(ProxyRemoteMessages.Instantiate_EXC_, new Object[] {extractFirstLine(initializationString)})); default: throw e; //$NON-NLS-1$ } @@ -511,7 +511,7 @@ public void processErrorReturn(CommandErrorException e) throws CommandException, data = t; } } - throw new CommandErrorException(MessageFormat.format(ProxyRemoteMessages.getString("RemoteCmd_EXC_"), new Object[] {new Integer(code)}), code, e.getValue(), data); // Create a new one and throw it containing the proxied data. //$NON-NLS-1$ + throw new CommandErrorException(MessageFormat.format(ProxyRemoteMessages.RemoteCmd_EXC_, new Object[] {new Integer(code)}), code, e.getValue(), data); // Create a new one and throw it containing the proxied data. //$NON-NLS-1$ } diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java index a6d9e184e..1c66df271 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMStandardBeanTypeProxyFactory.java @@ -12,7 +12,7 @@ package org.eclipse.jem.internal.proxy.remote; /* * $RCSfile: REMStandardBeanTypeProxyFactory.java,v $ - * $Revision: 1.14 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.15 $ $Date: 2005/06/21 20:35:07 $ */ import java.text.MessageFormat; @@ -203,8 +203,7 @@ public final class REMStandardBeanTypeProxyFactory implements IStandardBeanTypeP } catch (ThrowableProxy ep) { // Print out the trace and return proxy with init error. ProxyPlugin.getPlugin().getLogger().log(new Status(IStatus.WARNING, ProxyPlugin.getPlugin().getBundle().getSymbolicName(), 0, "", ep)); //$NON-NLS-1$ - IREMBeanTypeProxy proxy = new REMInitErrorBeanTypeProxy(fFactoryRegistry, MessageFormat.format(ProxyRemoteMessages - .getString("ExceptionErrorMsg_EXC_"), new Object[] { ep.getTypeProxy().getTypeName(), ep.getProxyLocalizedMessage()}), typeName); //$NON-NLS-1$ + IREMBeanTypeProxy proxy = new REMInitErrorBeanTypeProxy(fFactoryRegistry, MessageFormat.format(ProxyRemoteMessages.ExceptionErrorMsg_EXC_, new Object[] { ep.getTypeProxy().getTypeName(), ep.getProxyLocalizedMessage()}), typeName); //$NON-NLS-1$ registerBeanTypeProxy(proxy, false); return proxy; } diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java index e27a566d7..40a12cbfb 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/REMThrowableBeanProxy.java @@ -11,7 +11,7 @@ package org.eclipse.jem.internal.proxy.remote; /* * $RCSfile: REMThrowableBeanProxy.java,v $ - * $Revision: 1.10 $ $Date: 2005/06/21 20:27:52 $ + * $Revision: 1.11 $ $Date: 2005/06/21 20:35:07 $ */ @@ -167,27 +167,27 @@ public class REMThrowableBeanProxy extends ThrowableProxy implements IREMBeanPro */ public void printStackTrace() { synchronized (System.err) { - System.err.println(ProxyRemoteMessages.getString("REMOTE_VM_TRACE_INFO_")); //$NON-NLS-1$ + System.err.println(ProxyRemoteMessages.REMOTE_VM_TRACE_INFO_); printProxyStackTrace(); - System.err.println(ProxyRemoteMessages.getString("REMOTE_VM_LOCAL_TRACE_INFO_")); //$NON-NLS-1$ + System.err.println(ProxyRemoteMessages.REMOTE_VM_LOCAL_TRACE_INFO_); super.printStackTrace(); } } public void printStackTrace(java.io.PrintWriter s) { synchronized (s) { - s.println(ProxyRemoteMessages.getString("REMOTE_VM_TRACE_INFO_")); //$NON-NLS-1$ + s.println(ProxyRemoteMessages.REMOTE_VM_TRACE_INFO_); printProxyStackTrace(s); - s.println(ProxyRemoteMessages.getString("REMOTE_VM_LOCAL_TRACE_INFO_")); //$NON-NLS-1$ + s.println(ProxyRemoteMessages.REMOTE_VM_LOCAL_TRACE_INFO_); super.printStackTrace(s); } } public void printStackTrace(java.io.PrintStream s) { synchronized (s) { - s.println(ProxyRemoteMessages.getString("REMOTE_VM_TRACE_INFO_")); //$NON-NLS-1$ + s.println(ProxyRemoteMessages.REMOTE_VM_TRACE_INFO_); printProxyStackTrace(s); - s.println(ProxyRemoteMessages.getString("REMOTE_VM_LOCAL_TRACE_INFO_")); //$NON-NLS-1$ + s.println(ProxyRemoteMessages.REMOTE_VM_LOCAL_TRACE_INFO_); super.printStackTrace(s); } } diff --git a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties index 9ba22e9e6..fa97e45be 100644 --- a/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties +++ b/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties @@ -4,13 +4,13 @@ # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html -# +# # Contributors: # IBM Corporation - initial API and implementation ############################################################################### # # $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.git/plugins/org.eclipse.jem.proxy/proxyRemote/org/eclipse/jem/internal/proxy/remote/messages.properties,v $ -# $Revision: 1.13 $ $Date: 2005/06/21 20:27:52 $ +# $Revision: 1.14 $ $Date: 2005/06/21 20:35:07 $ # @@ -55,12 +55,12 @@ ProxyRemoteNoLaunchKey = Cannot l # {0} is the appropriate VMName from the above two entries. ProxyRemoteLaunchVM = Launching remote vm "{0}" -CleanupJob.title = Remote VM Cleanup GC'd Proxies Job +CleanupJob_title = Remote VM Cleanup GC'd Proxies Job -REMProxyFactoryRegistry.CallbackConnectionNotWorking_EXC_ = IWAV0169E Callback connection is not working. -REMProxyFactoryRegistry.ConnectionCreationFailed_INFO_ = IWAV0170I Connection creation failed. -REMProxyFactoryRegistry.Job.TerminateProcess.Title=Terminate the remote vm process. -REMProxyFactoryRegistry.CouldNotCreateSocketConnectionToRemoteVM_EXC_ = IWAV0171E Could not create a socket connection to remote vm. -REMExpression.IOExceptionSeeLog_INFO_ = IWAV0172I I/O Exception occurred. See .log file for details. -REMExpression.CommandExceptionSeeLog_INFO_ = IWAV0173I Command Exception occurred. See .log file for details. -LocalProxyLaunchDelegate.Monitor.PrintRemoteTrace.Text=Print remote vm trace output +REMProxyFactoryRegistry_CallbackConnectionNotWorking_EXC_ = IWAV0169E Callback connection is not working. +REMProxyFactoryRegistry_ConnectionCreationFailed_INFO_ = IWAV0170I Connection creation failed. +REMProxyFactoryRegistry_Job_TerminateProcess_Title=Terminate the remote vm process. +REMProxyFactoryRegistry_CouldNotCreateSocketConnectionToRemoteVM_EXC_ = IWAV0171E Could not create a socket connection to remote vm. +REMExpression_IOExceptionSeeLog_INFO_ = IWAV0172I I/O Exception occurred. See .log file for details. +REMExpression_CommandExceptionSeeLog_INFO_ = IWAV0173I Command Exception occurred. See .log file for details. +LocalProxyLaunchDelegate_Monitor_PrintRemoteTrace_Text=Print remote vm trace output |