Bug 568832 - [MOKA, Designer] Tracepoint view enhancements
- Fix image reference for model explorer (showed active tracepoint icon even if inactive)
- Do not use radio buttons in preference page, since inconsistent with dialog on a specific
tracepoint => remove "only transition" option, since that's the default if the other option
is inactive
Change-Id: Ib04c1bc96e3dcc32ca882825b3ff73867380e01b
Signed-off-by: Ansgar Radermacher <ansgar.radermacher@cea.fr>
diff --git a/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceActions.java b/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceActions.java
index ed49793..738feb9 100644
--- a/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceActions.java
+++ b/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceActions.java
@@ -76,11 +76,10 @@
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)
+ Transition // add incoming and outgoing transitions to trace
};
public enum TATransition {
- OnlyTrigger,
TriggerValues,
};
diff --git a/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceFunctions.java b/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceFunctions.java
index c485756..0d3c173 100644
--- a/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceFunctions.java
+++ b/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/TraceFunctions.java
@@ -40,7 +40,7 @@
public static final String activeTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$
- public static final String inActiveTracepoint11 = "icons/etool16/trcp_11x12.gif"; //$NON-NLS-1$
+ public static final String inActiveTracepoint11 = "icons/etool16/trcpd_11x12.gif"; //$NON-NLS-1$
/**
* Return the image descriptor associated with a trace or breakpoint marker
diff --git a/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/preferences/TPPreferencePage.java b/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/preferences/TPPreferencePage.java
index 64ce98d..2557116 100644
--- a/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/preferences/TPPreferencePage.java
+++ b/plugins/org.eclipse.papyrus.moka.tracepoint.service/src/org/eclipse/papyrus/moka/tracepoint/service/preferences/TPPreferencePage.java
@@ -20,7 +20,6 @@
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.moka.tracepoint.service.Activator;
import org.eclipse.papyrus.moka.tracepoint.service.ITraceMechanism;
import org.eclipse.papyrus.moka.tracepoint.service.Messages;
@@ -84,21 +83,20 @@
String[][] taPortOptions = TraceActions.getStringFields(TAOperation.values());
String[][] taTransitionOptions = TraceActions.getStringFields(TATransition.values());
- String tst = getPreferenceStore().getString(TPPreferenceConstants.P_TRACE_OPTION_CLASS);
-
- addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_CLASS, Messages.TraceActionSelection_ClassOptions, 3, taClassOptions, getFieldEditorParent(), true));
+ addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_CLASS,
+ Messages.TraceActionSelection_ClassOptions, 3, taClassOptions, getFieldEditorParent(), true));
- addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_STATE, Messages.TraceActionSelection_StateOptions, 3, taStateOptions, getFieldEditorParent(), true));
+ addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_STATE,
+ Messages.TraceActionSelection_StateOptions, 3, taStateOptions, getFieldEditorParent(), true));
- addField(new RadioGroupFieldEditor(
- TPPreferenceConstants.P_TRACE_OPTION_OP,
+ addField(new BinaryEncodedMChoiceFieldEditor(TPPreferenceConstants.P_TRACE_OPTION_OP,
Messages.TraceActionSelection_OperationOptions, 3, taOperationOptions, getFieldEditorParent(), true));
- addField(new RadioGroupFieldEditor(
+ addField(new BinaryEncodedMChoiceFieldEditor(
TPPreferenceConstants.P_TRACE_OPTION_PORT,
Messages.TraceActionSelection_PortOptions, 3, taPortOptions, getFieldEditorParent(), true));
- addField(new RadioGroupFieldEditor(
+ addField(new BinaryEncodedMChoiceFieldEditor(
TPPreferenceConstants.P_TRACE_OPTION_TRANSITION,
Messages.TraceActionSelection_TransitionOptions, 3, taTransitionOptions, getFieldEditorParent(), true));
