diff options
| author | Pablo Torregrosa Paez | 2016-05-11 09:29:13 +0000 |
|---|---|---|
| committer | Pablo Torregrosa Paez | 2016-05-11 09:29:13 +0000 |
| commit | c54f26b7e07319b7ad309aab8c02b72be6d1afff (patch) | |
| tree | caed5dc71b2f526e7d1dbc88eafdcfd55791480a | |
| parent | b8e5ede0a119b029348849281c70ad22f7e8d132 (diff) | |
| download | org.eclipse.tcf-c54f26b7e07319b7ad309aab8c02b72be6d1afff.tar.gz org.eclipse.tcf-c54f26b7e07319b7ad309aab8c02b72be6d1afff.tar.xz org.eclipse.tcf-c54f26b7e07319b7ad309aab8c02b72be6d1afff.zip | |
Target Explorer: Fixed prerun template location helper
Change-Id: I11fd643073ca7bf1c78f5966e224ec7422c1f8d8
Signed-off-by: Pablo Torregrosa Paez <pablo.torregrosa@windriver.com>
2 files changed, 5 insertions, 5 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/interfaces/IRemoteLaunchDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/interfaces/IRemoteLaunchDelegate.java index 8ea748a5e..da42afeeb 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/interfaces/IRemoteLaunchDelegate.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/interfaces/IRemoteLaunchDelegate.java @@ -13,5 +13,5 @@ import org.eclipse.core.runtime.IPath; public interface IRemoteLaunchDelegate { - public IPath getPrerunTemplateRoot(); + public IPath getPrerunTemplatePath(); } diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java index b4ccf2094..88dcc6321 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.launch.cdt/src/org/eclipse/tcf/te/tcf/launch/cdt/utils/TEHelper.java @@ -380,7 +380,7 @@ public class TEHelper { BufferedReader reader = null; StringBuilder sb = new StringBuilder(); try { - IPath templateRoot = null; + IPath templatePath = null; IRemoteLaunchDelegate launchDelegate = null; IPeerNode peerNode = getPeerNode(peer.getID()); IService[] services = ServiceManager.getInstance().getServices(peerNode, IDelegateService.class, false); @@ -391,10 +391,10 @@ public class TEHelper { } } if (launchDelegate != null) { - templateRoot = launchDelegate.getPrerunTemplateRoot(); + templatePath = launchDelegate.getPrerunTemplatePath(); } - if (templateRoot != null) { - templateFile = new File(templateRoot.append(PRERUN_TEMPLATE_NAME).toOSString()); + if (templatePath != null) { + templateFile = new File(templatePath.toOSString()); } // Fallback - Use built-in template if (templateFile == null || !templateFile.exists()) { |