Skip to content

Remove confusion AbstractDSLLaunchConfigurationDelegateUI classes #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove confusion AbstractDSLLaunchConfigurationDelegateUI classes #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f7ef65
Remove confusion AbstractDSLLaunchConfigurationDelegateUI classes
ebousse Jul 17, 2017
9e7eb0b
Rename AbstractDSLLaunchConfigurationDelegateUI2 to AbstractDSLLaunch…
ebousse Jul 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.eclipse.gemoc.trace.commons.model.launchconfiguration.LaunchConfiguration;


abstract public class AbstractGemocLauncher extends org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateUI {
abstract public class AbstractGemocLauncher extends org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateSiriusUI {

// warning this MODEL_ID must be the same as the one in the ModelLoader in order to enable correctly the breakpoints
public final static String MODEL_ID = org.eclipse.gemoc.executionframework.engine.ui.Activator.PLUGIN_ID+".debugModel";
Expand Down
4 changes: 2 additions & 2 deletions ...se/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
import org.osgi.framework.Bundle;

import org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate;
import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateUI;
import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch.AbstractDSLLaunchConfigurationDelegateSiriusUI;

/**
* Sequential engine launch configuration main tab
Expand Down Expand Up @@ -168,7 +168,7 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
AbstractDSLLaunchConfigurationDelegate.RESOURCE_URI,
this._modelLocationText.getText());
configuration.setAttribute(
AbstractDSLLaunchConfigurationDelegateUI.SIRIUS_RESOURCE_URI,
AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI,
this._siriusRepresentationLocationText.getText());
configuration.setAttribute(RunConfiguration.LAUNCH_DELAY,
Integer.parseInt(_delayText.getText()));
Expand Down
12 changes: 6 additions & 6 deletions ...ractDSLLaunchConfigurationDelegateUI.java → ...LLaunchConfigurationDelegateSiriusUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
*******************************************************************************/
package org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch;

import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener;
import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices;
import org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab;

import java.util.Arrays;
import java.util.List;

Expand All @@ -24,20 +20,24 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gemoc.dsl.debug.ide.adapter.IDSLCurrentInstructionListener;
import org.eclipse.gemoc.dsl.debug.ide.sirius.ui.services.AbstractDSLDebuggerServices;
import org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.sirius.business.api.helper.SiriusUtil;
import org.eclipse.sirius.business.api.session.Session;
import org.eclipse.sirius.business.api.session.SessionManager;
import org.eclipse.ui.PlatformUI;

/**
* A Sirius implementation of {@link org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate
* A Sirius implementation of
* {@link org.eclipse.gemoc.dsl.debug.ide.launch.AbstractDSLLaunchConfigurationDelegate
* AbstractDSLLaunchConfigurationDelegate} with {@link org.eclipse.debug.ui.ILaunchShortcut ILaunchShortcut}
* support.
*
* @author <a href="mailto:yvan.lussaud@obeo.fr">Yvan Lussaud</a>
*/
public abstract class AbstractDSLLaunchConfigurationDelegateUI extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI {
public abstract class AbstractDSLLaunchConfigurationDelegateSiriusUI extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI {

/**
* The Sirius {@link org.eclipse.emf.ecore.resource.Resource Resource}
Expand Down
8 changes: 4 additions & 4 deletions ...us.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
public class DSLLaunchConfigurationTab extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab {

/**
* The {@link Text} used for the {@link AbstractDSLLaunchConfigurationDelegateUI#SIRIUS_RESOURCE_URI}.
* The {@link Text} used for the {@link AbstractDSLLaunchConfigurationDelegateSiriusUI#SIRIUS_RESOURCE_URI}.
*/
private Text siriusResourceURIText;

Expand All @@ -67,7 +67,7 @@ public DSLLaunchConfigurationTab(String[] extensions) {
@Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
super.setDefaults(configuration);
configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateUI.SIRIUS_RESOURCE_URI, "");
configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI, "");
}

/**
Expand All @@ -94,7 +94,7 @@ public void initializeFrom(final ILaunchConfiguration configuration) {
@Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
super.performApply(configuration);
configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateUI.SIRIUS_RESOURCE_URI,
configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI,
siriusResourceURIText.getText());
}

Expand All @@ -106,7 +106,7 @@ public boolean isValid(ILaunchConfiguration launchConfig) {
try {
if (res) {
String siriusResourceURI = launchConfig.getAttribute(
AbstractDSLLaunchConfigurationDelegateUI.SIRIUS_RESOURCE_URI, "");
AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI, "");
IFile resourceFile = ResourcesPlugin.getWorkspace().getRoot().getFile(
new Path(siriusResourceURI));
Resource resource = null;
Expand Down