Bug 551925: [R-Console] Fix progress name during launch of R console
Backport-of: b3df6beb173570fc5d0b7b80c3b01ebe5ce93c40
Change-Id: Ib6fab9d72d67c865472a172f7d57191f3d573e49
diff --git a/r/org.eclipse.statet.ide.core/META-INF/MANIFEST.MF b/r/org.eclipse.statet.ide.core/META-INF/MANIFEST.MF
index e3c9df6..0ba9417 100644
--- a/r/org.eclipse.statet.ide.core/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.ide.core/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.statet.internal.ide.core.BaseCorePlugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.0";visibility:=reexport,
+Require-Bundle: org.eclipse.statet.ecommons.runtime.core;bundle-version="4.0.2";visibility:=reexport,
org.eclipse.core.runtime;bundle-version="3.15.0";visibility:=reexport,
org.eclipse.statet.ecommons.preferences.core;bundle-version="4.0.0",
org.eclipse.core.resources;visibility:=reexport,
diff --git a/r/org.eclipse.statet.ide.ui/META-INF/MANIFEST.MF b/r/org.eclipse.statet.ide.ui/META-INF/MANIFEST.MF
index 36549bc..d4515f1 100644
--- a/r/org.eclipse.statet.ide.ui/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.ide.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@
Require-Bundle: org.eclipse.platform;bundle-version="4.10.0",
org.eclipse.statet.ecommons.preferences.core,
org.eclipse.ui;visibility:=reexport,
- org.eclipse.statet.ide.core;bundle-version="[4.0.0,4.1.0)";visibility:=reexport,
+ org.eclipse.statet.ide.core;bundle-version="[4.0.2,4.1.0)";visibility:=reexport,
org.eclipse.statet.ecommons.uimisc;bundle-version="[4.0.0,4.1.0)";visibility:=reexport,
org.eclipse.statet.ltk.ui;bundle-version="[4.0.0,4.1.0)",
org.eclipse.core.variables,
diff --git a/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF b/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF
index ad88f96..3b4f87c 100644
--- a/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF
+++ b/r/org.eclipse.statet.r.console.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@
Bundle-Activator: org.eclipse.statet.internal.r.console.ui.RConsoleUIPlugin
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.statet.ide.ui;bundle-version="[4.0.0,4.1.0)",
+Require-Bundle: org.eclipse.statet.ide.ui;bundle-version="[4.0.2,4.1.0)",
org.eclipse.core.databinding.beans,
org.eclipse.help,
org.eclipse.statet.ltk.ui,
diff --git a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/Messages.properties b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/Messages.properties
index 9da3fc5..d4daf7a 100644
--- a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/Messages.properties
+++ b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/Messages.properties
@@ -39,8 +39,8 @@
RRemoteConsoleSelectionDialog_info_ListRestored_message = List restored.
RRemoteConsoleSelectionDialog_error_ConnectionFailed_message = Connection failed to:
-LaunchDelegate_CheckingRegistry_subtask = Checking service registry (RMI)...
-LaunchDelegate_StartREngine_subtask = Launching R engine...
+LaunchDelegate_CheckingRegistry_subtask = Checking service registry (RMI).
+LaunchDelegate_StartREngine_subtask = Launching R engine.
LaunchDelegate_WaitForR_subtask = Waiting for R...
LaunchDelegate_error_MissingAddress_message = Missing address for R engine
LaunchDelegate_error_InvalidAddress_message = Invalid address for R engine
diff --git a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java
index 0e5e1ea..b54d104 100644
--- a/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java
+++ b/r/org.eclipse.statet.r.console.ui/src/org/eclipse/statet/internal/r/console/ui/launching/RConsoleRJLaunchDelegate.java
@@ -261,6 +261,7 @@
int port= -1;
if (s != null && s.length() > 0) {
try {
+ m.subTask(Messages.LaunchDelegate_CheckingRegistry_subtask);
port= Integer.parseInt(s);
final RMIAddress registryAddress= new RMIAddress(InetAddress.getLoopbackAddress(), port, null);
registry= new RMIRegistry(registryAddress, true);
@@ -282,7 +283,7 @@
else {
try {
registry= RMIRegistryManager.INSTANCE.getEmbeddedPrivateRegistry(
- StatusUtils.convert(m.newChild(1), 1) );
+ StatusUtils.convertChild(m.newChild(1)) );
}
catch (final StatusException e) {
throw StatusUtils.convert(e);
@@ -290,10 +291,6 @@
requireCodebase= false;
}
}
- final RMIAddress rmiAddress= new RMIAddress(InetAddress.getLoopbackAddress(), registry.getAddress().getPort(),
- "rjs-local-" + System.currentTimeMillis() ); //$NON-NLS-1$
- final RJEngineLaunchDelegate engineLaunchDelegate= new RJEngineLaunchDelegate(
- rmiAddress.getAddress(), requireCodebase, rEnv);
m.worked(1);
if (m.isCanceled()) {
@@ -303,6 +300,11 @@
// start server
m.subTask(Messages.LaunchDelegate_StartREngine_subtask);
try {
+ final RMIAddress rmiAddress= new RMIAddress(InetAddress.getLoopbackAddress(), registry.getAddress().getPort(),
+ "rjs-local-" + System.currentTimeMillis() ); //$NON-NLS-1$
+ final RJEngineLaunchDelegate engineLaunchDelegate= new RJEngineLaunchDelegate(
+ rmiAddress.getAddress(), requireCodebase, rEnv);
+
RjsComConfig.setRMIClientSocketFactory(null);
engineLaunchDelegate.launch(configuration, mode, launch, m.newChild(10));
