Author: adietish Date: 2011-02-01 11:15:06 -0500 (Tue, 01 Feb 2011) New Revision: 28831 Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java branches/jbosstools-3.2.x/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: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-01 16:06:59 UTC (rev 28830) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/rse/util/RSEUtils.java 2011-02-01 16:15:06 UTC (rev 28831) @@ -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: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java =================================================================== --- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-02-01 16:06:59 UTC (rev 28830) +++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2011-02-01 16:15:06 UTC (rev 28831) @@ -218,7 +218,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; } @@ -270,7 +270,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; }