From 1f7ef6547f4c31c674613b7066ca915b844eb1de Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Mon, 17 Jul 2017 17:05:26 +0200 Subject: [PATCH 1/2] Remove confusion AbstractDSLLaunchConfigurationDelegateUI classes To better distinguish the classes org.eclipse.gemoc.dsl.debug.ide.sirius.ui.launch .AbstractDSLLaunchConfigurationDelegateUI and org.eclipse.gemoc.dsl.debug.ide.ui.launch .AbstractDSLLaunchConfigurationDelegateUI this commit renames the former to AbstractDSLLaunchConfigurationDelegateUI2 For some reason, this caused me really strange compilation errors in Eclipse, while probably tycho is not bothered. --- .../engine/ui/launcher/AbstractGemocLauncher.java | 2 +- ...> AbstractDSLLaunchConfigurationDelegateUI2.java} | 12 ++++++------ .../sirius/ui/launch/DSLLaunchConfigurationTab.java | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) rename simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/{AbstractDSLLaunchConfigurationDelegateUI.java => AbstractDSLLaunchConfigurationDelegateUI2.java} (94%) diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index 075b8b2bc..aec3d3716 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -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.AbstractDSLLaunchConfigurationDelegateUI2 { // 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"; diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI2.java similarity index 94% rename from simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI2.java index def5c52b7..5c21b9790 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI2.java @@ -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; @@ -24,6 +20,9 @@ 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; @@ -31,13 +30,14 @@ 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 Yvan Lussaud */ -public abstract class AbstractDSLLaunchConfigurationDelegateUI extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { +public abstract class AbstractDSLLaunchConfigurationDelegateUI2 extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.AbstractDSLLaunchConfigurationDelegateUI { /** * The Sirius {@link org.eclipse.emf.ecore.resource.Resource Resource} diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java index fcdff2a8b..bc27cf2d5 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java @@ -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 AbstractDSLLaunchConfigurationDelegateUI2#SIRIUS_RESOURCE_URI}. */ private Text siriusResourceURIText; @@ -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(AbstractDSLLaunchConfigurationDelegateUI2.SIRIUS_RESOURCE_URI, ""); } /** @@ -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(AbstractDSLLaunchConfigurationDelegateUI2.SIRIUS_RESOURCE_URI, siriusResourceURIText.getText()); } @@ -106,7 +106,7 @@ public boolean isValid(ILaunchConfiguration launchConfig) { try { if (res) { String siriusResourceURI = launchConfig.getAttribute( - AbstractDSLLaunchConfigurationDelegateUI.SIRIUS_RESOURCE_URI, ""); + AbstractDSLLaunchConfigurationDelegateUI2.SIRIUS_RESOURCE_URI, ""); IFile resourceFile = ResourcesPlugin.getWorkspace().getRoot().getFile( new Path(siriusResourceURI)); Resource resource = null; From 9e7eb0b8e66b6e30b6625116ae10a1c37c46e192 Mon Sep 17 00:00:00 2001 From: Erwan Bousse Date: Tue, 18 Jul 2017 10:56:11 +0200 Subject: [PATCH 2/2] Rename AbstractDSLLaunchConfigurationDelegateUI2 to AbstractDSLLaunchConfigurationDelegateSiriusUI --- .../engine/ui/launcher/AbstractGemocLauncher.java | 2 +- .../ui/launcher/tabs/LaunchConfigurationMainTab.java | 4 ++-- ...> AbstractDSLLaunchConfigurationDelegateSiriusUI.java} | 2 +- .../ide/sirius/ui/launch/DSLLaunchConfigurationTab.java | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) rename simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/{AbstractDSLLaunchConfigurationDelegateUI2.java => AbstractDSLLaunchConfigurationDelegateSiriusUI.java} (96%) diff --git a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java index aec3d3716..9f2f89fd1 100644 --- a/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java +++ b/framework/execution_framework/plugins/org.eclipse.gemoc.executionframework.engine.ui/src/org/eclipse/gemoc/executionframework/engine/ui/launcher/AbstractGemocLauncher.java @@ -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.AbstractDSLLaunchConfigurationDelegateUI2 { +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"; diff --git a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java index 4e8ea13ce..8a3ac34f4 100644 --- a/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java +++ b/java_execution/java_engine/plugins/org.eclipse.gemoc.execution.sequential.javaengine.ui/src/org/eclipse/gemoc/execution/sequential/javaengine/ui/launcher/tabs/LaunchConfigurationMainTab.java @@ -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 @@ -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())); diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI2.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateSiriusUI.java similarity index 96% rename from simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI2.java rename to simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateSiriusUI.java index 5c21b9790..7544509d8 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateUI2.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/AbstractDSLLaunchConfigurationDelegateSiriusUI.java @@ -37,7 +37,7 @@ * * @author Yvan Lussaud */ -public abstract class AbstractDSLLaunchConfigurationDelegateUI2 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} diff --git a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java index bc27cf2d5..9e7bb07b4 100644 --- a/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java +++ b/simulationmodelanimation/plugins/org.eclipse.gemoc.dsl.debug.ide.sirius.ui/src/org/eclipse/gemoc/dsl/debug/ide/sirius/ui/launch/DSLLaunchConfigurationTab.java @@ -50,7 +50,7 @@ public class DSLLaunchConfigurationTab extends org.eclipse.gemoc.dsl.debug.ide.ui.launch.DSLLaunchConfigurationTab { /** - * The {@link Text} used for the {@link AbstractDSLLaunchConfigurationDelegateUI2#SIRIUS_RESOURCE_URI}. + * The {@link Text} used for the {@link AbstractDSLLaunchConfigurationDelegateSiriusUI#SIRIUS_RESOURCE_URI}. */ private Text siriusResourceURIText; @@ -67,7 +67,7 @@ public DSLLaunchConfigurationTab(String[] extensions) { @Override public void setDefaults(ILaunchConfigurationWorkingCopy configuration) { super.setDefaults(configuration); - configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateUI2.SIRIUS_RESOURCE_URI, ""); + configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI, ""); } /** @@ -94,7 +94,7 @@ public void initializeFrom(final ILaunchConfiguration configuration) { @Override public void performApply(ILaunchConfigurationWorkingCopy configuration) { super.performApply(configuration); - configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateUI2.SIRIUS_RESOURCE_URI, + configuration.setAttribute(AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI, siriusResourceURIText.getText()); } @@ -106,7 +106,7 @@ public boolean isValid(ILaunchConfiguration launchConfig) { try { if (res) { String siriusResourceURI = launchConfig.getAttribute( - AbstractDSLLaunchConfigurationDelegateUI2.SIRIUS_RESOURCE_URI, ""); + AbstractDSLLaunchConfigurationDelegateSiriusUI.SIRIUS_RESOURCE_URI, ""); IFile resourceFile = ResourcesPlugin.getWorkspace().getRoot().getFile( new Path(siriusResourceURI)); Resource resource = null;