From 65685a42897fc14d3b67e1a8743e0efccc797245 Mon Sep 17 00:00:00 2001
From: Tobias Schwarz
Date: Tue, 14 Aug 2012 14:00:33 +0200
Subject: Target Explorer: add possibility to add parameters to refrenced steps
 in a step group

---
 .../core/lm/delegates/AttachLaunchManagerDelegate.java      | 13 ++-----------
 .../tcf/te/tcf/launch/core/steps/CheckServiceStep.java      |  1 +
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core')

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java
index a3541804b..c7849c621 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/lm/delegates/AttachLaunchManagerDelegate.java
@@ -35,9 +35,6 @@ import org.eclipse.tcf.te.launch.core.selection.interfaces.ISelectionContext;
 import org.eclipse.tcf.te.runtime.model.interfaces.IModelNode;
 import org.eclipse.tcf.te.runtime.persistence.PersistenceManager;
 import org.eclipse.tcf.te.runtime.persistence.interfaces.IPersistenceDelegate;
-import org.eclipse.tcf.te.runtime.services.ServiceManager;
-import org.eclipse.tcf.te.runtime.services.interfaces.IPropertiesAccessService;
-import org.eclipse.tcf.te.runtime.services.interfaces.constants.IPropertiesAccessServiceConstants;
 import org.eclipse.tcf.te.tcf.core.peers.Peer;
 import org.eclipse.tcf.te.tcf.launch.core.interfaces.IAttachLaunchAttributes;
 import org.eclipse.tcf.te.tcf.launch.core.interfaces.IPeerModelProperties;
@@ -162,16 +159,10 @@ public class AttachLaunchManagerDelegate extends DefaultLaunchManagerDelegate im
 	}
 
 	private String getDefaultLaunchName(IModelNode context) {
-		String name = ""; //$NON-NLS-1$
 		if (context != null) {
-			IPropertiesAccessService service = ServiceManager.getInstance().getService(context, IPropertiesAccessService.class);
-			Object dnsName = service != null ? service.getProperty(context, "dns.name.transient") : null; //$NON-NLS-1$
-			String ctxName = service != null ? (String)service.getTargetAddress(context).get(IPropertiesAccessServiceConstants.PROP_ADDRESS) : null;
-			ctxName = dnsName != null && dnsName.toString().trim().length() > 0 ? dnsName.toString().trim() : ctxName;
-
-			name = ctxName != null ? ctxName : ""; //$NON-NLS-1$
+			return context.getName();
 		}
-		return name.trim();
+		return ""; //$NON-NLS-1$
 	}
 
 	/* (non-Javadoc)
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/CheckServiceStep.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/CheckServiceStep.java
index 102a755aa..d88e8b855 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/CheckServiceStep.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.core/src/org/eclipse/tcf/te/tcf/launch/core/steps/CheckServiceStep.java
@@ -101,5 +101,6 @@ public class CheckServiceStep extends AbstractTcfLaunchStep {
 	@Override
 	public void execute(final IStepContext context, final IPropertiesContainer data, final IFullQualifiedId fullQualifiedId, final IProgressMonitor monitor, final ICallback callback) {
 		// nothing to do, check is done in validateExecute.
+		callback.done(this, Status.OK_STATUS);
 	}
 }
-- 
cgit v1.2.3