Author: adietish
Date: 2011-02-01 11:02:24 -0500 (Tue, 01 Feb 2011)
New Revision: 28829
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
Log:
[JBIDE-8292] Server Adapter and RSE now use instance alias as name
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog 2011-02-01
15:46:25 UTC (rev 28828)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/ChangeLog 2011-02-01
16:02:24 UTC (rev 28829)
@@ -1,3 +1,11 @@
+2011-02-01 André Dietisheim <André Dietisheim@adietisheim-thinkpad>
+
+ * src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
+ (createServerCheckRemoteDetails):
+ (createServerSetDetailsNow):
+ * src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
(createConnectionName):
+ [JBIDE-8292] Server Adapter and RSE now use instance alias as name
+
2010-12-27 adietisheim <adietisheim@adietisheim-thinkpad>
* META-INF/MANIFEST.MF:
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-01
15:46:25 UTC (rev 28828)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-01
16:02:24 UTC (rev 28829)
@@ -15,7 +15,6 @@
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.Job;
@@ -29,7 +28,6 @@
import org.eclipse.rse.core.model.ISystemRegistry;
import org.eclipse.rse.core.model.SystemStartHere;
import org.eclipse.rse.core.subsystems.IConnectorService;
-import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFileSubSystem;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.PartInitException;
@@ -66,7 +64,7 @@
public static String createConnectionName(DeltaCloudInstance instance) {
Assert.isLegal(instance != null, "Cannot create connection name: instance is not
defined");
- return instance.getName() + " [" + instance.getId() + "]";
//$NON-NLS-1$ //$NON-NLS-2$
+ return instance.getAlias();
}
public static String createHostName(DeltaCloudInstance instance) {
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-02-01
15:46:25 UTC (rev 28828)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-02-01
16:02:24 UTC (rev 28829)
@@ -219,7 +219,7 @@
String rtId = data[1];
IRuntime runtime = ServerCore.findRuntime(rtId);
IServer newServer = null;
- newServer = ServerCreationUtils.createServer2(imageId, runtime);
+ newServer = ServerCreationUtils.createServer2(instance.getAlias(), runtime);
newServer = RSEUtils.setServerToRSEMode(newServer, host, home, config);
return newServer;
}
@@ -271,7 +271,7 @@
String config = data[1];
String rtId = data[2];
IRuntime runtime = ServerCore.findRuntime(rtId);
- IServer newServer = ServerCreationUtils.createServer2(imageId, runtime);
+ IServer newServer = ServerCreationUtils.createServer2(instance.getAlias(), runtime);
newServer = RSEUtils.setServerToRSEMode(newServer, host, home, config);
return newServer;
}