Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2015-10-23 09:18:55 +0000
committerAnsgar Radermacher2015-10-23 09:18:55 +0000
commit2d70cb6846eee31a99e9ecb2d0db132f4c22987f (patch)
treee166e3952d6bba2c0bc11572d213e37ab5eb308d
parentac769b54423ebb71a2af0eb2254b2940a9fe38f3 (diff)
downloadorg.eclipse.papyrus-2d70cb6846eee31a99e9ecb2d0db132f4c22987f.tar.gz
org.eclipse.papyrus-2d70cb6846eee31a99e9ecb2d0db132f4c22987f.tar.xz
org.eclipse.papyrus-2d70cb6846eee31a99e9ecb2d0db132f4c22987f.zip
479829 - [Refactoring] [MokaQompass] Refactoring of tracepoint and breakpoints plugins, adaptation of Qompass plugins after initial changes
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceActions.java64
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceMechanism.java2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/dialogs/TraceActionSelection.java11
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/preferences/TPPreferencePage.java8
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml4
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceActionEnums.java134
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF5
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml2
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java14
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java4
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java11
13 files changed, 169 insertions, 98 deletions
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF
index e86f842f721..fae7afede30 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/META-INF/MANIFEST.MF
@@ -25,9 +25,10 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %pluginProvider
-Export-Package: org.eclipse.papyrus.infra.services.tracebreakpoints.ui.preferences,
+Export-Package: org.eclipse.papyrus.infra.services.tracebreakpoints.ui,
org.eclipse.papyrus.infra.services.tracebreakpoints.ui.commands,
- org.eclipse.papyrus.infra.services.tracebreakpoints.ui.dialogs
+ org.eclipse.papyrus.infra.services.tracebreakpoints.ui.dialogs,
+ org.eclipse.papyrus.infra.services.tracebreakpoints.ui.preferences
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceActions.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceActions.java
index f87a5391363..058fed5dbf1 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceActions.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceActions.java
@@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.services.tracebreakpoints.ui;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TraceFeature;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.preferences.TPPreferenceConstants;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.State;
@@ -27,62 +28,6 @@ import org.eclipse.uml2.uml.State;
*/
public class TraceActions {
- public enum TraceScope {
- clazz,
- operation,
- state,
- activity,
- };
-
- /**
- * Options for tracing a class. Note that some options need additional information, e.g. "all operations"
- * needs additional information how operations are traced
- */
- public enum TAClass {
- Creation,
- Destruction,
- AllOperations,
- AllPorts,
- AllStates
- // +(?) all properties/all operations
- // +(all ports?)
- // +all state changes? (hierarchical propagation?)
-
- };
-
- /**
- * Different ways to trace operations: put only the call itself or the values of the parameters into
- * a trace event.
- */
- public enum TAOperation {
- OnlyCall,
- ParameterValues, // here exclusive (parameter values and OnlyCall may not be selected at the same time)
- };
-
- /**
- * Not used for the moment
- */
- public enum TAAttribute {
- PropertyRead,
- PropertyWrite; // write old and new value
- };
-
- /**
- * Options to trace state
- */
- public enum TAState {
- StateEnter, // add incoming transition to trace?
- StateLeave, // add outgoing transition to trace?
- Transition // nothing (?) (triggers are known? - no, could be one out of many triggers)
- };
-
- /**
- * Not used for the moment
- */
- public enum TAActivity {
- activity // (i.e. call operation action) explicit choice of (named attribute?)
- };
-
public static String[][] getStringFields(Enum<?>[] enumValues) {
int i = 0;
String[][] taOptions = new String[enumValues.length][2];
@@ -94,13 +39,6 @@ public class TraceActions {
return taOptions;
}
- public enum TraceFeature {
- Class,
- Port,
- State,
- Operation
- };
-
/**
* Obtain the definition of a trace option in case of traces on classes
*
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceMechanism.java
index 45d3b7792ef..0e1ca9c1f61 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceMechanism.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/TraceMechanism.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ITraceMechanism;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TraceFeature;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TraceFeature;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.preferences.TPPreferenceConstants;
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/dialogs/TraceActionSelection.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/dialogs/TraceActionSelection.java
index 5153e54f68b..9bda1e7de0e 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/dialogs/TraceActionSelection.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/dialogs/TraceActionSelection.java
@@ -15,6 +15,7 @@
package org.eclipse.papyrus.infra.services.tracebreakpoints.ui.dialogs;
import java.util.Arrays;
+
import org.eclipse.core.resources.IMarker;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
@@ -31,13 +32,13 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ITraceMechanism;
import org.eclipse.papyrus.infra.services.tracebreakpoints.Messages;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TAClass;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TAOperation;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TAState;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TraceFeature;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TracepointConstants;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceMechanism;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.TracepointConstants;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TAClass;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TAOperation;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TAState;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TraceFeature;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.preferences.BinaryEncodedMChoiceFieldEditor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/preferences/TPPreferencePage.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/preferences/TPPreferencePage.java
index 701e4659f68..323cd11b6eb 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/preferences/TPPreferencePage.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints.ui/src/org/eclipse/papyrus/infra/services/tracebreakpoints/ui/preferences/TPPreferencePage.java
@@ -17,13 +17,13 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.jface.preference.ComboFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.RadioGroupFieldEditor;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.Activator;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ITraceMechanism;
import org.eclipse.papyrus.infra.services.tracebreakpoints.Messages;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TAClass;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TAOperation;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums.TAState;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.Activator;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TAClass;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TAOperation;
-import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceActions.TAState;
import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceMechanism;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml
index 93a68724a94..0db3021096c 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/plugin.xml
@@ -4,9 +4,6 @@
<plugin>
<extension-point id="traceMechanism" name="traceMechanism" schema="schema/traceMechanism.exsd"/>
-
-
-
<extension
id="org.eclipse.papyrus.tporbpmarker"
name="tracepoint or breakpoint marker"
@@ -43,5 +40,4 @@
</persistent>
</extension>
-
</plugin>
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceActionEnums.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceActionEnums.java
new file mode 100644
index 00000000000..3d2d2bc51c6
--- /dev/null
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.infra.services.tracebreakpoints/src/org/eclipse/papyrus/infra/services/tracebreakpoints/TraceActionEnums.java
@@ -0,0 +1,134 @@
+/*****************************************************************************
+ * Copyright (c) 2012 CEA LIST.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ansgar Radermacher (CEA LIST) - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.services.tracebreakpoints;
+
+/**
+ * Set of enumerations that indicates what we want to trace.
+ *
+ * @author ansgar
+ *
+ */
+public class TraceActionEnums {
+
+ public enum TraceScope {
+ clazz,
+ operation,
+ state,
+ activity,
+ };
+
+ /**
+ * Options for tracing a class. Note that some options need additional information, e.g. "all operations"
+ * needs additional information how operations are traced
+ */
+ public enum TAClass {
+ Creation,
+ Destruction,
+ AllOperations,
+ AllPorts,
+ AllStates
+ // +(?) all properties/all operations
+ // +(all ports?)
+ // +all state changes? (hierarchical propagation?)
+
+ };
+
+ /**
+ * Different ways to trace operations: put only the call itself or the values of the parameters into
+ * a trace event.
+ */
+ public enum TAOperation {
+ OnlyCall,
+ ParameterValues, // here exclusive (parameter values and OnlyCall may not be selected at the same time)
+ };
+
+ /**
+ * Not used for the moment
+ */
+ public enum TAAttribute {
+ PropertyRead,
+ PropertyWrite; // write old and new value
+ };
+
+ /**
+ * Options to trace state
+ */
+ public enum TAState {
+ StateEnter, // add incoming transition to trace?
+ StateLeave, // add outgoing transition to trace?
+ Transition // nothing (?) (triggers are known? - no, could be one out of many triggers)
+ };
+
+ /**
+ * Not used for the moment
+ */
+ public enum TAActivity {
+ activity // (i.e. call operation action) explicit choice of (named attribute?)
+ };
+
+ public enum TraceFeature {
+ Class,
+ Port,
+ State,
+ Operation
+ };
+
+ /**
+ * Obtain the definition of a trace option in case of traces on classes
+ *
+ * @param traceAction
+ * @param subFeature
+ * the trace feature which we want to obtain, i.e. class, state or operation
+ * from a composite action string in case of class trace points
+ * @return
+ */
+ public static String getOptions(String traceAction, TraceFeature subFeature) {
+ String prefix = getStringPrefix(subFeature);
+ int pos = traceAction.indexOf(prefix);
+ if (pos == -1) {
+ return null;
+ } else {
+ // comma is used as separation character.
+ pos += prefix.length();
+ int endPos = traceAction.indexOf(',', pos);
+ if (endPos == -1) {
+ return traceAction.substring(pos);
+ }
+ return traceAction.substring(pos, endPos);
+ }
+ }
+
+ /**
+ * Get the prefix that is used in each case of a class action to distinguish class, state and operation actions.
+ *
+ * @param feature
+ * The trace feature for which we set an action
+ * @return
+ */
+ public static String getStringPrefix(TraceFeature feature) {
+ if (feature == TraceFeature.Class) {
+ return "C:"; //$NON-NLS-1$
+ }
+ if (feature == TraceFeature.Port) {
+ return "P:"; //$NON-NLS-1$
+ }
+ else if (feature == TraceFeature.State) {
+ return "S:"; //$NON-NLS-1$
+ }
+ else if (feature == TraceFeature.Operation) {
+ return "O:"; //$NON-NLS-1$
+ }
+ return null;
+ }
+}
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
index 6908c801140..f304c025fb5 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="1.2.0",
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.qompass.designer.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.tracepoints;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.tracebreakpoints;bundle-version="1.2.0",
org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
org.eclipse.emf.workspace;bundle-version="1.5.0",
org.eclipse.uml2.uml;bundle-version="4.0.0",
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.papyrus.fcm.profile;bundle-version="1.2.0",
com.google.guava;bundle-version="11.0.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
- org.eclipse.xtend.lib.macro
+ org.eclipse.xtend.lib.macro,
+ org.eclipse.papyrus.infra.emf;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
index 7a1427bd9c9..d317d14db12 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/plugin.xml
@@ -30,7 +30,7 @@
</client>
</extension>
<extension
- point="org.eclipse.papyrus.infra.services.tracepoints.traceMechanism">
+ point="org.eclipse.papyrus.infra.services.tracebreakpoints.traceMechanism">
<client
class="org.eclipse.papyrus.qompass.modellibs.tracing.QompassTraceMechanism"
traceMechID="org.eclipse.papyrus.qompass.modellibs.tracing.qompass">
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
index 8e286a6792e..552401dd8b5 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/QompassTraceMechanism.java
@@ -16,11 +16,11 @@ import org.eclipse.papyrus.FCM.ContainerRule;
import org.eclipse.papyrus.FCM.RuleApplication;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.services.ServiceException;
-import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.infra.services.tracepoints.ITraceMechanism;
-import org.eclipse.papyrus.infra.services.tracepoints.MarkerUtils;
-import org.eclipse.papyrus.infra.services.tracepoints.TraceActions.TAOperation;
-import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants;
+import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.ITraceMechanism;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.MarkerUtils;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceActionEnums;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TracepointConstants;
import org.eclipse.papyrus.qompass.designer.core.Description;
import org.eclipse.papyrus.qompass.designer.core.Log;
import org.eclipse.papyrus.qompass.designer.core.Utils;
@@ -89,7 +89,7 @@ public class QompassTraceMechanism implements ITraceMechanism {
Class clazz = containerRule.getBase_Class();
if (clazz.getName().equals(id)) {
- if (traceOption == TAOperation.OnlyCall.ordinal()) {
+ if (traceOption == TraceActionEnums.TAOperation.OnlyCall.ordinal()) {
// yes => what do we then (i.e. how is mapping done??)
}
RuleApplication ruleApplication = StereotypeUtil.applyApp(clazzContext, RuleApplication.class);
@@ -142,7 +142,7 @@ public class QompassTraceMechanism implements ITraceMechanism {
if (eObj == null) {
// load rules of registered Tracing model library
try {
- ModelSet ms = ServiceUtilsForActionHandlers.getInstance().getModelSet();
+ ModelSet ms = ServiceUtilsForEObject.getInstance().getModelSet(eObj);
Resource rs = ms.getResource(tracingURI, true);
EList<EObject> contents = rs.getContents();
if ((contents.size() > 0) && (contents.get(0) instanceof Package)) {
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java
index 7e20fb3019f..f9d0d9c7fa9 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.qompass.modellibs.tracing/src/org/eclipse/papyrus/qompass/modellibs/tracing/acceleo/TraceUtils.java
@@ -7,8 +7,8 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.papyrus.infra.services.tracepoints.MarkerUtils;
-import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.MarkerUtils;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TracepointConstants;
import org.eclipse.papyrus.qompass.designer.core.transformations.TransformationContext;
import org.eclipse.uml2.uml.Element;
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
index a5d9938325c..864fb3a77bd 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/META-INF/MANIFEST.MF
@@ -1,7 +1,8 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.services.tracepoints;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.tracebreakpoints;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.tracebreakpoints.ui;bundle-version="1.2.0",
org.eclipse.core.resources;bundle-version="3.7.0",
org.eclipse.emf.ecore;bundle-version="2.8.0",
org.eclipse.gef;bundle-version="3.8.0",
diff --git a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java
index d628a81b917..2aab8015bc5 100644
--- a/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java
+++ b/extraplugins/qompass-designer/tracing/org.eclipse.papyrus.views.tracepoints/src/org/eclipse/papyrus/views/tracepoints/views/TracepointView.java
@@ -14,7 +14,6 @@
package org.eclipse.papyrus.views.tracepoints.views;
-
import java.util.Map;
import javax.swing.text.View;
@@ -54,11 +53,11 @@ import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.papyrus.infra.services.markerlistener.IPapyrusMarker;
-import org.eclipse.papyrus.infra.services.tracepoints.MarkerUtils;
-import org.eclipse.papyrus.infra.services.tracepoints.TraceFunctions;
-import org.eclipse.papyrus.infra.services.tracepoints.TraceState;
-import org.eclipse.papyrus.infra.services.tracepoints.TracepointConstants;
-import org.eclipse.papyrus.infra.services.tracepoints.dialogs.TraceActionSelection;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.MarkerUtils;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TraceState;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.TracepointConstants;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.TraceFunctions;
+import org.eclipse.papyrus.infra.services.tracebreakpoints.ui.dialogs.TraceActionSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;

Back to the top