Skip to content

GitLab

Commit 5bb3c5eb authored by Adam Knapp's avatar Adam Knapp
Browse files

Improvements on launch shortcuts 



Change-Id: I9a724d6a747bd013f140b613b4d80be98a7a324c
Signed-off-by: default avatarAdam Knapp <adam.knapp@sigmatechnology.se>
parent c414654c
Hide whitespace changes
Inline Side-by-side
org.eclipse.titan.executor/src/org/eclipse/titan/executor/executors/LaunchShortcut.java
View file @ 5bb3c5eb
......@@ -16,7 +16,6 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
......@@ -58,7 +57,7 @@ public abstract class LaunchShortcut implements ILaunchShortcut {
/**
* Returns the launch configuration type:
* Single, Parallel, Parallel-JNI, Parallel-Java
* Single, Parallel, Parallel-JNI, MC-Java
* @return Type of launch configuration
*/
protected abstract String getLaunchConfigurationType();
......@@ -84,27 +83,38 @@ public abstract class LaunchShortcut implements ILaunchShortcut {
protected ILaunchConfigurationWorkingCopy getWorkingCopy(final IProject project, final IFile file, final String mode) {
try {
final ILaunchConfigurationType configurationType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(getConfigurationId());
final ILaunchConfiguration[] configurations = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configurationType);
final ILaunchConfigurationType configurationType = LaunchConfigurationUtil.getLaunchManager().getLaunchConfigurationType(getConfigurationId());
final ILaunchConfiguration[] configurations = LaunchConfigurationUtil.getLaunchManager().getLaunchConfigurations(configurationType);
final List<ILaunchConfiguration> candidateConfigurations = new ArrayList<ILaunchConfiguration>();
for (final ILaunchConfiguration configuration : configurations) {
final IResource[] resources = configuration.getMappedResources();
if (null != resources) {
boolean found = false;
if (resources == null || resources.length < 2) {
continue;
}
boolean found = false;
for (final IResource resource : resources) {
if (resource.equals(project)) {
found = true;
break;
}
}
if (found) {
found = false;
for (final IResource resource : resources) {
if (file.equals(resource)) {
found = true;
break;
}
}
if (found) {
candidateConfigurations.add(configuration);
}
}
if (found) {
candidateConfigurations.add(configuration);
}
}
if (1 == candidateConfigurations.size()) {
candidateConfigurations.get(0).launch(mode, null);
performLaunch(candidateConfigurations.get(0), mode);
return null;
} else if (candidateConfigurations.size() > 1) {
final ILabelProvider labelProvider = DebugUITools.newDebugModelPresentation();
......@@ -114,18 +124,25 @@ public abstract class LaunchShortcut implements ILaunchShortcut {
dialog.setElements(candidateConfigurations.toArray(new ILaunchConfiguration[candidateConfigurations.size()]));
if (dialog.open() == Window.OK) {
final ILaunchConfiguration result = (ILaunchConfiguration) dialog.getFirstResult();
result.launch(mode, null);
performLaunch(result, mode);
labelProvider.dispose();
return null ;
return null;
}
labelProvider.dispose();
}
// size() == 0 case: create new configuration
final String configurationName = file.getFullPath().toString().substring(1).replace("/", "-")
+ "-" + getLaunchConfigurationType();
final ILaunchConfigurationWorkingCopy wc = configurationType.newInstance(null, configurationName);
wc.setMappedResources(new IResource[] {project});
ILaunchConfiguration config = LaunchConfigurationUtil.findLaunchConfigurationByName(configurationName, configurationType);
ILaunchConfigurationWorkingCopy wc = null;
if (config != null) {
wc = config.getWorkingCopy();
} else {
wc = configurationType.newInstance(null,
LaunchConfigurationUtil.getLaunchManager().generateLaunchConfigurationName(configurationName));
}
wc.setMappedResources(new IResource[] {project, file});
wc.setAttribute(EXECUTECONFIGFILEONLAUNCH, true);
return wc;
......@@ -134,6 +151,13 @@ public abstract class LaunchShortcut implements ILaunchShortcut {
return null;
}
}
protected void performLaunch(ILaunchConfiguration configuration, final String mode) throws CoreException {
if (configuration.isWorkingCopy()) {
configuration = ((ILaunchConfigurationWorkingCopy)configuration).doSave();
}
configuration.launch(mode, null);
}
@Override
/** {@inheritDoc} */
......@@ -175,9 +199,8 @@ public abstract class LaunchShortcut implements ILaunchShortcut {
} else {
ErrorReporter.logError("Config file not found");
ErrorReporter.parallelErrorDisplayInMessageDialog(
"Error while creating the default launch configuration for project "
+ project.getName(),
"Config file not found in project " + project.getName());
"Error while creating the default launch configuration for project " + project.getName(),
"Config file not found in project " + project.getName());
return;
}
} else {
......@@ -200,8 +223,9 @@ public abstract class LaunchShortcut implements ILaunchShortcut {
}
try {
if (result) {
final ILaunchConfiguration conf = wc.doSave();
conf.launch(mode, null);
wc.setMappedResources(new IResource[] {project, cfgFile});
wc.setAttribute(EXECUTECONFIGFILEONLAUNCH, true);
performLaunch(wc, mode);
}
} catch (CoreException e) {
ErrorReporter.logExceptionStackTrace(e);
......
org.eclipse.titan.executor/src/org/eclipse/titan/executor/executors/LaunchShortcutConfig.java
View file @ 5bb3c5eb
......@@ -16,7 +16,6 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationType;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
......@@ -57,7 +56,7 @@ public abstract class LaunchShortcutConfig implements ILaunchShortcut {
/**
* Returns the launch configuration type:
* Single, Parallel, Parallel-JNI, Parallel-Java
* Single, Parallel, Parallel-JNI, MC-Java
* @return Type of launch configuration
*/
protected abstract String getLaunchConfigurationType();
......@@ -83,26 +82,37 @@ public abstract class LaunchShortcutConfig implements ILaunchShortcut {
protected ILaunchConfigurationWorkingCopy getWorkingCopy(final IProject project, final IFile file, final String mode) {
try {
final ILaunchConfigurationType configurationType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(getConfigurationId());
final ILaunchConfiguration[] configurations = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurations(configurationType);
final ILaunchConfigurationType configurationType = LaunchConfigurationUtil.getLaunchManager().getLaunchConfigurationType(getConfigurationId());
final ILaunchConfiguration[] configurations = LaunchConfigurationUtil.getLaunchManager().getLaunchConfigurations(configurationType);
final List<ILaunchConfiguration> candidateConfigurations = new ArrayList<ILaunchConfiguration>();
for (final ILaunchConfiguration configuration : configurations) {
final IResource[] resources = configuration.getMappedResources();
if (null != resources) {
boolean found = false;
if (resources == null || resources.length < 2) {
continue;
}
boolean found = false;
for (final IResource resource : resources) {
if (resource.equals(project)) {
found = true;
break;
}
}
if (found) {
found = false;
for (final IResource resource : resources) {
if (file.equals(resource)) {
found = true;
break;
}
}
if (found) {
candidateConfigurations.add(configuration);
}
}
if (found) {
candidateConfigurations.add(configuration);
}
}
if (1 == candidateConfigurations.size()) {
candidateConfigurations.get(0).launch(mode, null);
performLaunch(candidateConfigurations.get(0), mode);
return null;
} else if (candidateConfigurations.size() > 1) {
final ILabelProvider labelProvider = DebugUITools.newDebugModelPresentation();
......@@ -112,7 +122,7 @@ public abstract class LaunchShortcutConfig implements ILaunchShortcut {
dialog.setElements(candidateConfigurations.toArray(new ILaunchConfiguration[candidateConfigurations.size()]));
if (dialog.open() == Window.OK) {
final ILaunchConfiguration result = (ILaunchConfiguration) dialog.getFirstResult();
result.launch(mode, null);
performLaunch(result, mode);
labelProvider.dispose();
return null;
}
......@@ -122,7 +132,14 @@ public abstract class LaunchShortcutConfig implements ILaunchShortcut {
// size() == 0 case: create new configuration
final String configurationName = file.getFullPath().toString().substring(1).replace("/", "-")
+ "-" + getLaunchConfigurationType();
final ILaunchConfigurationWorkingCopy wc = configurationType.newInstance(null, configurationName);
ILaunchConfiguration config = LaunchConfigurationUtil.findLaunchConfigurationByName(configurationName, configurationType);
ILaunchConfigurationWorkingCopy wc = null;
if (config != null) {
wc = config.getWorkingCopy();
} else {
wc = configurationType.newInstance(null,
LaunchConfigurationUtil.getLaunchManager().generateLaunchConfigurationName(configurationName));
}
wc.setMappedResources(new IResource[] {project, file});
wc.setAttribute(EXECUTECONFIGFILEONLAUNCH, true);
......@@ -132,7 +149,13 @@ public abstract class LaunchShortcutConfig implements ILaunchShortcut {
return null;
}
}
protected void performLaunch(ILaunchConfiguration configuration, final String mode) throws CoreException {
if (configuration.isWorkingCopy()) {
configuration = ((ILaunchConfigurationWorkingCopy)configuration).doSave();
}
configuration.launch(mode, null);
}
@Override
/** {@inheritDoc} */
......@@ -165,23 +188,22 @@ public abstract class LaunchShortcutConfig implements ILaunchShortcut {
ErrorReporter.logError("Project file not found");
return;
}
try {
final ILaunchConfigurationWorkingCopy wc = getWorkingCopy(project, file, mode);
if (wc == null) {
return; //successful launch
}
boolean result = initLaunchConfiguration(wc, project,
PathUtil.getRelativePath(project.getLocation().toOSString(), file.getLocation().toOSString()));
if (result) {
result = HostControllersTab.initLaunchConfiguration(wc);
}
final ILaunchConfigurationWorkingCopy wc = getWorkingCopy(project, file, mode);
if (wc == null) {
return; //successful launch
}
boolean result = initLaunchConfiguration(wc, project,
PathUtil.getRelativePath(project.getLocation().toOSString(), file.getLocation().toOSString()));
if (result) {
result = HostControllersTab.initLaunchConfiguration(wc);
}
try {
if (result) {
wc.setMappedResources(new IResource[] {project, file});
wc.setAttribute(EXECUTECONFIGFILEONLAUNCH, true);
final ILaunchConfiguration conf = wc.doSave();
conf.launch(mode, null);
performLaunch(wc, mode);
}
} catch (CoreException e) {
ErrorReporter.logExceptionStackTrace(e);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent