Bug 514634 general Improvement
[Fix] Exploration Graph Strategy, imposed by TransitionCoverage profile
[Fix] Uncomment GraphViz 'node#header' parameter
Change-Id: I4b4184d77064af4627806e6458fa59b99c4c1a50
Signed-off-by: Arnault Lapitre <arnault.lapitre@cea.fr>
diff --git a/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewAnalysisProfileSection.java b/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewAnalysisProfileSection.java
index 78c5a64..15d1c95 100644
--- a/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewAnalysisProfileSection.java
+++ b/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewAnalysisProfileSection.java
@@ -65,7 +65,7 @@
new OverviewExplorationConfigurationProfile(configurationPage);
fTransitionCoveragePage =
- new OverviewTransitionCoverageConfigurationProfile(configurationPage);
+ new OverviewTransitionCoverageConfigurationProfile(configurationPage, this);
fBehaviorSelectionPage =
new OverviewBehaviorSelectionConfigurationProfile(configurationPage);
@@ -91,6 +91,13 @@
return "Select the analysis profile of the model by selecting a tab";
}
+
+ public boolean isTransitionCoverage() {
+ return( fModelAnalysisProfile.equals(
+ ANALYSIS_PROFILE_MODEL_COVERAGE_TRANSITION) );
+ }
+
+
@Override
protected void createContent(Composite parent, IWidgetToolkit widgetToolkit)
@@ -406,4 +413,5 @@
}
}
+
}
diff --git a/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewTransitionCoverageConfigurationProfile.java b/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewTransitionCoverageConfigurationProfile.java
index ddc7836..22ae9c8 100644
--- a/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewTransitionCoverageConfigurationProfile.java
+++ b/execution/org.eclipse.efm.execution.configuration.common.ui/src/org/eclipse/efm/execution/configuration/common/ui/page/overview/OverviewTransitionCoverageConfigurationProfile.java
@@ -58,14 +58,19 @@
private String fModelFilePath;
+ private OverviewAnalysisProfileSection fOverviewAnalysisProfileSection;
/**
* Constructor
* @param parentTab
*/
- public OverviewTransitionCoverageConfigurationProfile(AbstractConfigurationPage configurationPage) {
+ public OverviewTransitionCoverageConfigurationProfile(
+ AbstractConfigurationPage configurationPage,
+ OverviewAnalysisProfileSection overviewAnalysisProfileSection) {
super(configurationPage);
+ this.fOverviewAnalysisProfileSection = overviewAnalysisProfileSection;
+
fModelFilePath = null;
}
@@ -432,7 +437,10 @@
configuration.setAttribute(
ATTR_TRANSITION_COVERAGE_SELECTION, fSelectedTransitionsList);
- configuration.setAttribute(ATTR_SPECIFICATION_ANALYZE_STRATEGY, "WEIGHT_BFS");
+ if( fOverviewAnalysisProfileSection.isTransitionCoverage() )
+ {
+ configuration.setAttribute(ATTR_SPECIFICATION_ANALYZE_STRATEGY, "WEIGHT_BFS");
+ }
}
@Override
diff --git a/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.ecore b/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.ecore
index 2fa26e6..cf491a7 100644
--- a/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.ecore
+++ b/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.ecore
@@ -212,6 +212,11 @@
<eLiterals name="LIFELINE_ID" value="61" literal="lifeline#id"/>
<eLiterals name="LIFELINE_STATE" value="62" literal="lifeline#state"/>
<eLiterals name="RAW_ATTRIBUTE" value="63" literal="RAW_ATTRIBUTE"/>
+ <eLiterals name="NODE_HEADER" value="64" literal="node#header"/>
+ <eLiterals name="NODE_DATA" value="65" literal="node#data"/>
+ <eLiterals name="NODE_INFO" value="66" literal="node#info"/>
+ <eLiterals name="NODE_TRACE_RUN" value="67" literal="node#trace#run"/>
+ <eLiterals name="NODE_TRACE_IO" value="68" literal="node#trace#io"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="TraceElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="nature" eType="#//common/TraceElementKind"/>
@@ -278,6 +283,8 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="specificationFilename"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="executableFilename" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="initializationFilename"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="symbexGraphFilename"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="parsedModelFilename"
diff --git a/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.genmodel b/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.genmodel
index 91712b2..09becef 100644
--- a/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.genmodel
+++ b/execution/org.eclipse.efm.execution.core/resources/ecore/workflow.genmodel
@@ -150,6 +150,11 @@
<genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/LIFELINE_ID"/>
<genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/LIFELINE_STATE"/>
<genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/RAW_ATTRIBUTE"/>
+ <genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/NODE_HEADER"/>
+ <genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/NODE_DATA"/>
+ <genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/NODE_INFO"/>
+ <genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/NODE_TRACE_RUN"/>
+ <genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/TraceElementKind/NODE_TRACE_IO"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="workflow.ecore#//common/HeuristicClassKind">
<genEnumLiterals ecoreEnumLiteral="workflow.ecore#//common/HeuristicClassKind/BASIC"/>
@@ -191,6 +196,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/Project/model"/>
</genClasses>
<genClasses ecoreClass="workflow.ecore#//common/GraphExplorationLimit">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/GraphExplorationLimit/step"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/GraphExplorationLimit/eval"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/GraphExplorationLimit/node"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/GraphExplorationLimit/height"/>
@@ -251,6 +257,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/outputFilename"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/specificationFilename"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/executableFilename"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/initializationFilename"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/symbexGraphFilename"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/parsedModelFilename"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute workflow.ecore#//common/DeveloperTuningOption/compiledModelFilename"/>
diff --git a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/CommonPackage.java b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/CommonPackage.java
index 33642ee..ecaa0d6 100644
--- a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/CommonPackage.java
+++ b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/CommonPackage.java
@@ -911,13 +911,22 @@
int DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME = 6;
/**
+ * The feature id for the '<em><b>Initialization Filename</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME = 7;
+
+ /**
* The feature id for the '<em><b>Symbex Graph Filename</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME = 7;
+ int DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME = 8;
/**
* The feature id for the '<em><b>Parsed Model Filename</b></em>' attribute.
@@ -926,7 +935,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__PARSED_MODEL_FILENAME = 8;
+ int DEVELOPER_TUNING_OPTION__PARSED_MODEL_FILENAME = 9;
/**
* The feature id for the '<em><b>Compiled Model Filename</b></em>' attribute.
@@ -935,7 +944,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__COMPILED_MODEL_FILENAME = 9;
+ int DEVELOPER_TUNING_OPTION__COMPILED_MODEL_FILENAME = 10;
/**
* The feature id for the '<em><b>Symbex Trace Filename</b></em>' attribute.
@@ -944,7 +953,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__SYMBEX_TRACE_FILENAME = 10;
+ int DEVELOPER_TUNING_OPTION__SYMBEX_TRACE_FILENAME = 11;
/**
* The feature id for the '<em><b>Enabled Parsing</b></em>' attribute.
@@ -953,7 +962,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PARSING = 11;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PARSING = 12;
/**
* The feature id for the '<em><b>Enabled Configuring</b></em>' attribute.
@@ -962,7 +971,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_CONFIGURING = 12;
+ int DEVELOPER_TUNING_OPTION__ENABLED_CONFIGURING = 13;
/**
* The feature id for the '<em><b>Enabled Compiling</b></em>' attribute.
@@ -971,7 +980,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_COMPILING = 13;
+ int DEVELOPER_TUNING_OPTION__ENABLED_COMPILING = 14;
/**
* The feature id for the '<em><b>Enabled Loading</b></em>' attribute.
@@ -980,7 +989,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_LOADING = 14;
+ int DEVELOPER_TUNING_OPTION__ENABLED_LOADING = 15;
/**
* The feature id for the '<em><b>Enabled Computing</b></em>' attribute.
@@ -989,7 +998,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_COMPUTING = 15;
+ int DEVELOPER_TUNING_OPTION__ENABLED_COMPUTING = 16;
/**
* The feature id for the '<em><b>Enabled Reporting</b></em>' attribute.
@@ -998,7 +1007,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_REPORTING = 16;
+ int DEVELOPER_TUNING_OPTION__ENABLED_REPORTING = 17;
/**
* The feature id for the '<em><b>Enabled Solving</b></em>' attribute.
@@ -1007,7 +1016,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_SOLVING = 17;
+ int DEVELOPER_TUNING_OPTION__ENABLED_SOLVING = 18;
/**
* The feature id for the '<em><b>Enabled Profiling</b></em>' attribute.
@@ -1016,7 +1025,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PROFILING = 18;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PROFILING = 19;
/**
* The feature id for the '<em><b>Enabled All Process Stage</b></em>' attribute.
@@ -1025,7 +1034,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_ALL_PROCESS_STAGE = 19;
+ int DEVELOPER_TUNING_OPTION__ENABLED_ALL_PROCESS_STAGE = 20;
/**
* The feature id for the '<em><b>Enabled Pre Processing</b></em>' attribute.
@@ -1034,7 +1043,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PRE_PROCESSING = 20;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PRE_PROCESSING = 21;
/**
* The feature id for the '<em><b>Enabled Post Processing</b></em>' attribute.
@@ -1043,7 +1052,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_POST_PROCESSING = 21;
+ int DEVELOPER_TUNING_OPTION__ENABLED_POST_PROCESSING = 22;
/**
* The feature id for the '<em><b>Enabled Processing</b></em>' attribute.
@@ -1052,7 +1061,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PROCESSING = 22;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PROCESSING = 23;
/**
* The feature id for the '<em><b>Enabled Pre Filtering</b></em>' attribute.
@@ -1061,7 +1070,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PRE_FILTERING = 23;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PRE_FILTERING = 24;
/**
* The feature id for the '<em><b>Enabled Post Filtering</b></em>' attribute.
@@ -1070,7 +1079,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_POST_FILTERING = 24;
+ int DEVELOPER_TUNING_OPTION__ENABLED_POST_FILTERING = 25;
/**
* The feature id for the '<em><b>Enabled Filtering</b></em>' attribute.
@@ -1079,7 +1088,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_FILTERING = 25;
+ int DEVELOPER_TUNING_OPTION__ENABLED_FILTERING = 26;
/**
* The feature id for the '<em><b>Enabled Queue</b></em>' attribute.
@@ -1088,7 +1097,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_QUEUE = 26;
+ int DEVELOPER_TUNING_OPTION__ENABLED_QUEUE = 27;
/**
* The feature id for the '<em><b>Enabled Program</b></em>' attribute.
@@ -1097,7 +1106,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PROGRAM = 27;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PROGRAM = 28;
/**
* The feature id for the '<em><b>Enabled Statement</b></em>' attribute.
@@ -1106,7 +1115,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT = 28;
+ int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT = 29;
/**
* The feature id for the '<em><b>Enabled Statement Assignment</b></em>' attribute.
@@ -1115,7 +1124,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT_ASSIGNMENT = 29;
+ int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT_ASSIGNMENT = 30;
/**
* The feature id for the '<em><b>Enabled Statement Communication</b></em>' attribute.
@@ -1124,7 +1133,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT_COMMUNICATION = 30;
+ int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT_COMMUNICATION = 31;
/**
* The feature id for the '<em><b>Enabled Statement Test Decision</b></em>' attribute.
@@ -1133,7 +1142,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT_TEST_DECISION = 31;
+ int DEVELOPER_TUNING_OPTION__ENABLED_STATEMENT_TEST_DECISION = 32;
/**
* The feature id for the '<em><b>Enabled Bytecode</b></em>' attribute.
@@ -1142,7 +1151,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_BYTECODE = 32;
+ int DEVELOPER_TUNING_OPTION__ENABLED_BYTECODE = 33;
/**
* The feature id for the '<em><b>Enabled Data</b></em>' attribute.
@@ -1151,7 +1160,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_DATA = 33;
+ int DEVELOPER_TUNING_OPTION__ENABLED_DATA = 34;
/**
* The feature id for the '<em><b>Enabled Trace</b></em>' attribute.
@@ -1160,7 +1169,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_TRACE = 34;
+ int DEVELOPER_TUNING_OPTION__ENABLED_TRACE = 35;
/**
* The feature id for the '<em><b>Enabled Variable</b></em>' attribute.
@@ -1169,7 +1178,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_VARIABLE = 35;
+ int DEVELOPER_TUNING_OPTION__ENABLED_VARIABLE = 36;
/**
* The feature id for the '<em><b>Enabled Buffer</b></em>' attribute.
@@ -1178,7 +1187,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_BUFFER = 36;
+ int DEVELOPER_TUNING_OPTION__ENABLED_BUFFER = 37;
/**
* The feature id for the '<em><b>Enabled Port</b></em>' attribute.
@@ -1187,7 +1196,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_PORT = 37;
+ int DEVELOPER_TUNING_OPTION__ENABLED_PORT = 38;
/**
* The feature id for the '<em><b>Enabled Signal</b></em>' attribute.
@@ -1196,7 +1205,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_SIGNAL = 38;
+ int DEVELOPER_TUNING_OPTION__ENABLED_SIGNAL = 39;
/**
* The feature id for the '<em><b>Enabled Connexion</b></em>' attribute.
@@ -1205,7 +1214,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_CONNEXION = 39;
+ int DEVELOPER_TUNING_OPTION__ENABLED_CONNEXION = 40;
/**
* The feature id for the '<em><b>Enabled Time</b></em>' attribute.
@@ -1214,7 +1223,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_TIME = 40;
+ int DEVELOPER_TUNING_OPTION__ENABLED_TIME = 41;
/**
* The feature id for the '<em><b>Enabled Executable</b></em>' attribute.
@@ -1223,7 +1232,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_EXECUTABLE = 41;
+ int DEVELOPER_TUNING_OPTION__ENABLED_EXECUTABLE = 42;
/**
* The feature id for the '<em><b>Enabled Activity</b></em>' attribute.
@@ -1232,7 +1241,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_ACTIVITY = 42;
+ int DEVELOPER_TUNING_OPTION__ENABLED_ACTIVITY = 43;
/**
* The feature id for the '<em><b>Enabled Routine</b></em>' attribute.
@@ -1241,7 +1250,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_ROUTINE = 43;
+ int DEVELOPER_TUNING_OPTION__ENABLED_ROUTINE = 44;
/**
* The feature id for the '<em><b>Enabled Transition</b></em>' attribute.
@@ -1250,7 +1259,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_TRANSITION = 44;
+ int DEVELOPER_TUNING_OPTION__ENABLED_TRANSITION = 45;
/**
* The feature id for the '<em><b>Enabled Machine</b></em>' attribute.
@@ -1259,7 +1268,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_MACHINE = 45;
+ int DEVELOPER_TUNING_OPTION__ENABLED_MACHINE = 46;
/**
* The feature id for the '<em><b>Enabled Statemachine</b></em>' attribute.
@@ -1268,7 +1277,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_STATEMACHINE = 46;
+ int DEVELOPER_TUNING_OPTION__ENABLED_STATEMACHINE = 47;
/**
* The feature id for the '<em><b>Enabled Name Id</b></em>' attribute.
@@ -1277,7 +1286,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_NAME_ID = 47;
+ int DEVELOPER_TUNING_OPTION__ENABLED_NAME_ID = 48;
/**
* The feature id for the '<em><b>Enabled Qualified Name Id</b></em>' attribute.
@@ -1286,7 +1295,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_QUALIFIED_NAME_ID = 48;
+ int DEVELOPER_TUNING_OPTION__ENABLED_QUALIFIED_NAME_ID = 49;
/**
* The feature id for the '<em><b>Enabled Fully Qualified Name Id</b></em>' attribute.
@@ -1295,7 +1304,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_FULLY_QUALIFIED_NAME_ID = 49;
+ int DEVELOPER_TUNING_OPTION__ENABLED_FULLY_QUALIFIED_NAME_ID = 50;
/**
* The feature id for the '<em><b>Enabled Redundance</b></em>' attribute.
@@ -1304,7 +1313,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_REDUNDANCE = 50;
+ int DEVELOPER_TUNING_OPTION__ENABLED_REDUNDANCE = 51;
/**
* The feature id for the '<em><b>Enabled Reference Counting</b></em>' attribute.
@@ -1313,7 +1322,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_REFERENCE_COUNTING = 51;
+ int DEVELOPER_TUNING_OPTION__ENABLED_REFERENCE_COUNTING = 52;
/**
* The feature id for the '<em><b>Enabled Nothing</b></em>' attribute.
@@ -1322,7 +1331,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_NOTHING = 52;
+ int DEVELOPER_TUNING_OPTION__ENABLED_NOTHING = 53;
/**
* The feature id for the '<em><b>Enabled God Mode</b></em>' attribute.
@@ -1331,7 +1340,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION__ENABLED_GOD_MODE = 53;
+ int DEVELOPER_TUNING_OPTION__ENABLED_GOD_MODE = 54;
/**
* The number of structural features of the '<em>Developer Tuning Option</em>' class.
@@ -1340,7 +1349,7 @@
* @generated
* @ordered
*/
- int DEVELOPER_TUNING_OPTION_FEATURE_COUNT = 54;
+ int DEVELOPER_TUNING_OPTION_FEATURE_COUNT = 55;
/**
* The number of operations of the '<em>Developer Tuning Option</em>' class.
@@ -2198,6 +2207,17 @@
EAttribute getDeveloperTuningOption_ExecutableFilename();
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getInitializationFilename <em>Initialization Filename</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Initialization Filename</em>'.
+ * @see org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getInitializationFilename()
+ * @see #getDeveloperTuningOption()
+ * @generated
+ */
+ EAttribute getDeveloperTuningOption_InitializationFilename();
+
+ /**
* Returns the meta object for the attribute '{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getSymbexGraphFilename <em>Symbex Graph Filename</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3419,6 +3439,14 @@
EAttribute DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME = eINSTANCE.getDeveloperTuningOption_ExecutableFilename();
/**
+ * The meta object literal for the '<em><b>Initialization Filename</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME = eINSTANCE.getDeveloperTuningOption_InitializationFilename();
+
+ /**
* The meta object literal for the '<em><b>Symbex Graph Filename</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOption.java b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOption.java
index 6d1416e..18e8c84 100644
--- a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOption.java
+++ b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOption.java
@@ -30,6 +30,7 @@
* <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getOutputFilename <em>Output Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getSpecificationFilename <em>Specification Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getExecutableFilename <em>Executable Filename</em>}</li>
+ * <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getInitializationFilename <em>Initialization Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getSymbexGraphFilename <em>Symbex Graph Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getParsedModelFilename <em>Parsed Model Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getCompiledModelFilename <em>Compiled Model Filename</em>}</li>
@@ -271,6 +272,32 @@
void setExecutableFilename(String value);
/**
+ * Returns the value of the '<em><b>Initialization Filename</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Initialization Filename</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Initialization Filename</em>' attribute.
+ * @see #setInitializationFilename(String)
+ * @see org.eclipse.efm.execution.core.workflow.common.CommonPackage#getDeveloperTuningOption_InitializationFilename()
+ * @model
+ * @generated
+ */
+ String getInitializationFilename();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.efm.execution.core.workflow.common.DeveloperTuningOption#getInitializationFilename <em>Initialization Filename</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Initialization Filename</em>' attribute.
+ * @see #getInitializationFilename()
+ * @generated
+ */
+ void setInitializationFilename(String value);
+
+ /**
* Returns the value of the '<em><b>Symbex Graph Filename</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
diff --git a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/TraceElementKind.java b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/TraceElementKind.java
index f9d2310..839530c 100644
--- a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/TraceElementKind.java
+++ b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/TraceElementKind.java
@@ -652,7 +652,47 @@
* @generated
* @ordered
*/
- RAW_ATTRIBUTE(63, "RAW_ATTRIBUTE", "RAW_ATTRIBUTE");
+ RAW_ATTRIBUTE(63, "RAW_ATTRIBUTE", "RAW_ATTRIBUTE"), /**
+ * The '<em><b>NODE HEADER</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #NODE_HEADER_VALUE
+ * @generated
+ * @ordered
+ */
+ NODE_HEADER(64, "NODE_HEADER", "node#header"), /**
+ * The '<em><b>NODE DATA</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #NODE_DATA_VALUE
+ * @generated
+ * @ordered
+ */
+ NODE_DATA(65, "NODE_DATA", "node#data"), /**
+ * The '<em><b>NODE INFO</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #NODE_INFO_VALUE
+ * @generated
+ * @ordered
+ */
+ NODE_INFO(66, "NODE_INFO", "node#info"), /**
+ * The '<em><b>NODE TRACE RUN</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #NODE_TRACE_RUN_VALUE
+ * @generated
+ * @ordered
+ */
+ NODE_TRACE_RUN(67, "NODE_TRACE_RUN", "node#trace#run"), /**
+ * The '<em><b>NODE TRACE IO</b></em>' literal object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #NODE_TRACE_IO_VALUE
+ * @generated
+ * @ordered
+ */
+ NODE_TRACE_IO(68, "NODE_TRACE_IO", "node#trace#io");
/**
* The '<em><b>UNDEFINED</b></em>' literal value.
@@ -1615,6 +1655,81 @@
public static final int RAW_ATTRIBUTE_VALUE = 63;
/**
+ * The '<em><b>NODE HEADER</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>NODE HEADER</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #NODE_HEADER
+ * @model literal="node#header"
+ * @generated
+ * @ordered
+ */
+ public static final int NODE_HEADER_VALUE = 64;
+
+ /**
+ * The '<em><b>NODE DATA</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>NODE DATA</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #NODE_DATA
+ * @model literal="node#data"
+ * @generated
+ * @ordered
+ */
+ public static final int NODE_DATA_VALUE = 65;
+
+ /**
+ * The '<em><b>NODE INFO</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>NODE INFO</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #NODE_INFO
+ * @model literal="node#info"
+ * @generated
+ * @ordered
+ */
+ public static final int NODE_INFO_VALUE = 66;
+
+ /**
+ * The '<em><b>NODE TRACE RUN</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>NODE TRACE RUN</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #NODE_TRACE_RUN
+ * @model literal="node#trace#run"
+ * @generated
+ * @ordered
+ */
+ public static final int NODE_TRACE_RUN_VALUE = 67;
+
+ /**
+ * The '<em><b>NODE TRACE IO</b></em>' literal value.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of '<em><b>NODE TRACE IO</b></em>' literal object isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @see #NODE_TRACE_IO
+ * @model literal="node#trace#io"
+ * @generated
+ * @ordered
+ */
+ public static final int NODE_TRACE_IO_VALUE = 68;
+
+ /**
* An array of all the '<em><b>Trace Element Kind</b></em>' enumerators.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1686,6 +1801,11 @@
LIFELINE_ID,
LIFELINE_STATE,
RAW_ATTRIBUTE,
+ NODE_HEADER,
+ NODE_DATA,
+ NODE_INFO,
+ NODE_TRACE_RUN,
+ NODE_TRACE_IO,
};
/**
@@ -1806,6 +1926,11 @@
case LIFELINE_ID_VALUE: return LIFELINE_ID;
case LIFELINE_STATE_VALUE: return LIFELINE_STATE;
case RAW_ATTRIBUTE_VALUE: return RAW_ATTRIBUTE;
+ case NODE_HEADER_VALUE: return NODE_HEADER;
+ case NODE_DATA_VALUE: return NODE_DATA;
+ case NODE_INFO_VALUE: return NODE_INFO;
+ case NODE_TRACE_RUN_VALUE: return NODE_TRACE_RUN;
+ case NODE_TRACE_IO_VALUE: return NODE_TRACE_IO;
}
return null;
}
diff --git a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/CommonPackageImpl.java b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/CommonPackageImpl.java
index eb23847..88087da 100644
--- a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/CommonPackageImpl.java
+++ b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/CommonPackageImpl.java
@@ -879,7 +879,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_SymbexGraphFilename() {
+ public EAttribute getDeveloperTuningOption_InitializationFilename() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(7);
}
@@ -888,7 +888,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_ParsedModelFilename() {
+ public EAttribute getDeveloperTuningOption_SymbexGraphFilename() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(8);
}
@@ -897,7 +897,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_CompiledModelFilename() {
+ public EAttribute getDeveloperTuningOption_ParsedModelFilename() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(9);
}
@@ -906,7 +906,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_SymbexTraceFilename() {
+ public EAttribute getDeveloperTuningOption_CompiledModelFilename() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(10);
}
@@ -915,7 +915,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledParsing() {
+ public EAttribute getDeveloperTuningOption_SymbexTraceFilename() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(11);
}
@@ -924,7 +924,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledConfiguring() {
+ public EAttribute getDeveloperTuningOption_EnabledParsing() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(12);
}
@@ -933,7 +933,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledCompiling() {
+ public EAttribute getDeveloperTuningOption_EnabledConfiguring() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(13);
}
@@ -942,7 +942,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledLoading() {
+ public EAttribute getDeveloperTuningOption_EnabledCompiling() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(14);
}
@@ -951,7 +951,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledComputing() {
+ public EAttribute getDeveloperTuningOption_EnabledLoading() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(15);
}
@@ -960,7 +960,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledReporting() {
+ public EAttribute getDeveloperTuningOption_EnabledComputing() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(16);
}
@@ -969,7 +969,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledSolving() {
+ public EAttribute getDeveloperTuningOption_EnabledReporting() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(17);
}
@@ -978,7 +978,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledProfiling() {
+ public EAttribute getDeveloperTuningOption_EnabledSolving() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(18);
}
@@ -987,7 +987,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledAllProcessStage() {
+ public EAttribute getDeveloperTuningOption_EnabledProfiling() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(19);
}
@@ -996,7 +996,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledPreProcessing() {
+ public EAttribute getDeveloperTuningOption_EnabledAllProcessStage() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(20);
}
@@ -1005,7 +1005,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledPostProcessing() {
+ public EAttribute getDeveloperTuningOption_EnabledPreProcessing() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(21);
}
@@ -1014,7 +1014,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledProcessing() {
+ public EAttribute getDeveloperTuningOption_EnabledPostProcessing() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(22);
}
@@ -1023,7 +1023,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledPreFiltering() {
+ public EAttribute getDeveloperTuningOption_EnabledProcessing() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(23);
}
@@ -1032,7 +1032,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledPostFiltering() {
+ public EAttribute getDeveloperTuningOption_EnabledPreFiltering() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(24);
}
@@ -1041,7 +1041,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledFiltering() {
+ public EAttribute getDeveloperTuningOption_EnabledPostFiltering() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(25);
}
@@ -1050,7 +1050,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledQueue() {
+ public EAttribute getDeveloperTuningOption_EnabledFiltering() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(26);
}
@@ -1059,7 +1059,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledProgram() {
+ public EAttribute getDeveloperTuningOption_EnabledQueue() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(27);
}
@@ -1068,7 +1068,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledStatement() {
+ public EAttribute getDeveloperTuningOption_EnabledProgram() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(28);
}
@@ -1077,7 +1077,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledStatementAssignment() {
+ public EAttribute getDeveloperTuningOption_EnabledStatement() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(29);
}
@@ -1086,7 +1086,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledStatementCommunication() {
+ public EAttribute getDeveloperTuningOption_EnabledStatementAssignment() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(30);
}
@@ -1095,7 +1095,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledStatementTestDecision() {
+ public EAttribute getDeveloperTuningOption_EnabledStatementCommunication() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(31);
}
@@ -1104,7 +1104,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledBytecode() {
+ public EAttribute getDeveloperTuningOption_EnabledStatementTestDecision() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(32);
}
@@ -1113,7 +1113,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledData() {
+ public EAttribute getDeveloperTuningOption_EnabledBytecode() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(33);
}
@@ -1122,7 +1122,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledTrace() {
+ public EAttribute getDeveloperTuningOption_EnabledData() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(34);
}
@@ -1131,7 +1131,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledVariable() {
+ public EAttribute getDeveloperTuningOption_EnabledTrace() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(35);
}
@@ -1140,7 +1140,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledBuffer() {
+ public EAttribute getDeveloperTuningOption_EnabledVariable() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(36);
}
@@ -1149,7 +1149,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledPort() {
+ public EAttribute getDeveloperTuningOption_EnabledBuffer() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(37);
}
@@ -1158,7 +1158,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledSignal() {
+ public EAttribute getDeveloperTuningOption_EnabledPort() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(38);
}
@@ -1167,7 +1167,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledConnexion() {
+ public EAttribute getDeveloperTuningOption_EnabledSignal() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(39);
}
@@ -1176,7 +1176,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledTime() {
+ public EAttribute getDeveloperTuningOption_EnabledConnexion() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(40);
}
@@ -1185,7 +1185,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledExecutable() {
+ public EAttribute getDeveloperTuningOption_EnabledTime() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(41);
}
@@ -1194,7 +1194,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledActivity() {
+ public EAttribute getDeveloperTuningOption_EnabledExecutable() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(42);
}
@@ -1203,7 +1203,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledRoutine() {
+ public EAttribute getDeveloperTuningOption_EnabledActivity() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(43);
}
@@ -1212,7 +1212,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledTransition() {
+ public EAttribute getDeveloperTuningOption_EnabledRoutine() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(44);
}
@@ -1221,7 +1221,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledMachine() {
+ public EAttribute getDeveloperTuningOption_EnabledTransition() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(45);
}
@@ -1230,7 +1230,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledStatemachine() {
+ public EAttribute getDeveloperTuningOption_EnabledMachine() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(46);
}
@@ -1239,7 +1239,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledNameId() {
+ public EAttribute getDeveloperTuningOption_EnabledStatemachine() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(47);
}
@@ -1248,7 +1248,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledQualifiedNameId() {
+ public EAttribute getDeveloperTuningOption_EnabledNameId() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(48);
}
@@ -1257,7 +1257,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledFullyQualifiedNameId() {
+ public EAttribute getDeveloperTuningOption_EnabledQualifiedNameId() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(49);
}
@@ -1266,7 +1266,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledRedundance() {
+ public EAttribute getDeveloperTuningOption_EnabledFullyQualifiedNameId() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(50);
}
@@ -1275,7 +1275,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledReferenceCounting() {
+ public EAttribute getDeveloperTuningOption_EnabledRedundance() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(51);
}
@@ -1284,7 +1284,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledNothing() {
+ public EAttribute getDeveloperTuningOption_EnabledReferenceCounting() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(52);
}
@@ -1293,7 +1293,7 @@
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getDeveloperTuningOption_EnabledGodMode() {
+ public EAttribute getDeveloperTuningOption_EnabledNothing() {
return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(53);
}
@@ -1302,6 +1302,15 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getDeveloperTuningOption_EnabledGodMode() {
+ return (EAttribute)developerTuningOptionEClass.getEStructuralFeatures().get(54);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getRedundancyDetection() {
return redundancyDetectionEClass;
}
@@ -1519,6 +1528,7 @@
createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__OUTPUT_FILENAME);
createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__SPECIFICATION_FILENAME);
createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME);
+ createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME);
createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME);
createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__PARSED_MODEL_FILENAME);
createEAttribute(developerTuningOptionEClass, DEVELOPER_TUNING_OPTION__COMPILED_MODEL_FILENAME);
@@ -1695,6 +1705,7 @@
initEAttribute(getDeveloperTuningOption_OutputFilename(), ecorePackage.getEString(), "outputFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDeveloperTuningOption_SpecificationFilename(), ecorePackage.getEString(), "specificationFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDeveloperTuningOption_ExecutableFilename(), ecorePackage.getEString(), "executableFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getDeveloperTuningOption_InitializationFilename(), ecorePackage.getEString(), "initializationFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDeveloperTuningOption_SymbexGraphFilename(), ecorePackage.getEString(), "symbexGraphFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDeveloperTuningOption_ParsedModelFilename(), ecorePackage.getEString(), "parsedModelFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getDeveloperTuningOption_CompiledModelFilename(), ecorePackage.getEString(), "compiledModelFilename", null, 0, 1, DeveloperTuningOption.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -1833,6 +1844,11 @@
addEEnumLiteral(traceElementKindEEnum, TraceElementKind.LIFELINE_ID);
addEEnumLiteral(traceElementKindEEnum, TraceElementKind.LIFELINE_STATE);
addEEnumLiteral(traceElementKindEEnum, TraceElementKind.RAW_ATTRIBUTE);
+ addEEnumLiteral(traceElementKindEEnum, TraceElementKind.NODE_HEADER);
+ addEEnumLiteral(traceElementKindEEnum, TraceElementKind.NODE_DATA);
+ addEEnumLiteral(traceElementKindEEnum, TraceElementKind.NODE_INFO);
+ addEEnumLiteral(traceElementKindEEnum, TraceElementKind.NODE_TRACE_RUN);
+ addEEnumLiteral(traceElementKindEEnum, TraceElementKind.NODE_TRACE_IO);
initEEnum(heuristicClassKindEEnum, HeuristicClassKind.class, "HeuristicClassKind");
addEEnumLiteral(heuristicClassKindEEnum, HeuristicClassKind.BASIC);
diff --git a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/DeveloperTuningOptionImpl.java b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/DeveloperTuningOptionImpl.java
index 68e9192..332d07d 100644
--- a/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/DeveloperTuningOptionImpl.java
+++ b/execution/org.eclipse.efm.execution.core/src-gen/org/eclipse/efm/execution/core/workflow/common/impl/DeveloperTuningOptionImpl.java
@@ -38,6 +38,7 @@
* <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getOutputFilename <em>Output Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getSpecificationFilename <em>Specification Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getExecutableFilename <em>Executable Filename</em>}</li>
+ * <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getInitializationFilename <em>Initialization Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getSymbexGraphFilename <em>Symbex Graph Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getParsedModelFilename <em>Parsed Model Filename</em>}</li>
* <li>{@link org.eclipse.efm.execution.core.workflow.common.impl.DeveloperTuningOptionImpl#getCompiledModelFilename <em>Compiled Model Filename</em>}</li>
@@ -231,6 +232,26 @@
protected String executableFilename = EXECUTABLE_FILENAME_EDEFAULT;
/**
+ * The default value of the '{@link #getInitializationFilename() <em>Initialization Filename</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getInitializationFilename()
+ * @generated
+ * @ordered
+ */
+ protected static final String INITIALIZATION_FILENAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getInitializationFilename() <em>Initialization Filename</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getInitializationFilename()
+ * @generated
+ * @ordered
+ */
+ protected String initializationFilename = INITIALIZATION_FILENAME_EDEFAULT;
+
+ /**
* The default value of the '{@link #getSymbexGraphFilename() <em>Symbex Graph Filename</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1341,6 +1362,27 @@
* <!-- end-user-doc -->
* @generated
*/
+ public String getInitializationFilename() {
+ return initializationFilename;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setInitializationFilename(String newInitializationFilename) {
+ String oldInitializationFilename = initializationFilename;
+ initializationFilename = newInitializationFilename;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CommonPackage.DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME, oldInitializationFilename, initializationFilename));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public String getSymbexGraphFilename() {
return symbexGraphFilename;
}
@@ -2345,6 +2387,8 @@
return getSpecificationFilename();
case CommonPackage.DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME:
return getExecutableFilename();
+ case CommonPackage.DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME:
+ return getInitializationFilename();
case CommonPackage.DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME:
return getSymbexGraphFilename();
case CommonPackage.DEVELOPER_TUNING_OPTION__PARSED_MODEL_FILENAME:
@@ -2472,6 +2516,9 @@
case CommonPackage.DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME:
setExecutableFilename((String)newValue);
return;
+ case CommonPackage.DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME:
+ setInitializationFilename((String)newValue);
+ return;
case CommonPackage.DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME:
setSymbexGraphFilename((String)newValue);
return;
@@ -2646,6 +2693,9 @@
case CommonPackage.DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME:
setExecutableFilename(EXECUTABLE_FILENAME_EDEFAULT);
return;
+ case CommonPackage.DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME:
+ setInitializationFilename(INITIALIZATION_FILENAME_EDEFAULT);
+ return;
case CommonPackage.DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME:
setSymbexGraphFilename(SYMBEX_GRAPH_FILENAME_EDEFAULT);
return;
@@ -2813,6 +2863,8 @@
return SPECIFICATION_FILENAME_EDEFAULT == null ? specificationFilename != null : !SPECIFICATION_FILENAME_EDEFAULT.equals(specificationFilename);
case CommonPackage.DEVELOPER_TUNING_OPTION__EXECUTABLE_FILENAME:
return EXECUTABLE_FILENAME_EDEFAULT == null ? executableFilename != null : !EXECUTABLE_FILENAME_EDEFAULT.equals(executableFilename);
+ case CommonPackage.DEVELOPER_TUNING_OPTION__INITIALIZATION_FILENAME:
+ return INITIALIZATION_FILENAME_EDEFAULT == null ? initializationFilename != null : !INITIALIZATION_FILENAME_EDEFAULT.equals(initializationFilename);
case CommonPackage.DEVELOPER_TUNING_OPTION__SYMBEX_GRAPH_FILENAME:
return SYMBEX_GRAPH_FILENAME_EDEFAULT == null ? symbexGraphFilename != null : !SYMBEX_GRAPH_FILENAME_EDEFAULT.equals(symbexGraphFilename);
case CommonPackage.DEVELOPER_TUNING_OPTION__PARSED_MODEL_FILENAME:
@@ -2935,6 +2987,8 @@
result.append(specificationFilename);
result.append(", executableFilename: ");
result.append(executableFilename);
+ result.append(", initializationFilename: ");
+ result.append(initializationFilename);
result.append(", symbexGraphFilename: ");
result.append(symbexGraphFilename);
result.append(", parsedModelFilename: ");
diff --git a/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOptionCustomImpl.java b/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOptionCustomImpl.java
index fa3f079..a7319d8 100644
--- a/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOptionCustomImpl.java
+++ b/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/DeveloperTuningOptionCustomImpl.java
@@ -598,6 +598,8 @@
if( enabled ) {
devTuning.setExecutableFilename(modelFilename + ".fexe");
+ devTuning.setInitializationFilename(modelFilename + ".fet");
+
if( fEnabledSymbexDeveloperMode ) {
devTuning.setCompiledModelFilename(
modelFilename + "_compiled.fexe");
@@ -711,7 +713,7 @@
String strOutputFilename = getOutputFilename();
String strSpecificationFilename = getSpecificationFilename();
String strExecutableFilename = getExecutableFilename();
- String strInitializationFilename = getExecutableFilename();
+ String strInitializationFilename = getInitializationFilename();
String strScenariiFilename = getSymbexGraphFilename();
if( (strOutputFilename != null)
diff --git a/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/TraceSpecificationCustomImpl.java b/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/TraceSpecificationCustomImpl.java
index 01aa16e..1f5e469 100644
--- a/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/TraceSpecificationCustomImpl.java
+++ b/execution/org.eclipse.efm.execution.core/src/org/eclipse/efm/execution/core/workflow/common/TraceSpecificationCustomImpl.java
@@ -79,9 +79,7 @@
for (String eltString : tabString) {
eltString = eltString.trim();
- if ( eltString.length() == 0 ) {
- }
- else {
+ if ( eltString.length() > 0 ) {
traceElt = TraceElementCustomImpl.create(
eltString, defaultNature);
if( traceElt != null ) {
diff --git a/releng/org.eclipse.efm.modeling.rcp/plugin.xml b/releng/org.eclipse.efm.modeling.rcp/plugin.xml
index 9e6cabe..b77c391 100644
--- a/releng/org.eclipse.efm.modeling.rcp/plugin.xml
+++ b/releng/org.eclipse.efm.modeling.rcp/plugin.xml
@@ -9,7 +9,7 @@
description="Papyrus

Version: 1.0.0

(c) Copyright Eclipse contributors and others 2000, 2015. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/"
name="Eclipse Formal Modeling & Symbex Tools">
<property name="windowImages" value="icons/efm16.png,icons/efm32.png,icons/efm48.png,icons/efm64.png,icons/efm128.png,icons/efm256.png"/>
- <property name="aboutImage" value="icons/efm_lg.png"/>
+ <property name="aboutImage" value="icons/efm128.png"/>
<property
name="appName"
value="Eclipse Formal Modeling & Symbex Tools">
@@ -47,7 +47,7 @@
</property>
<property
name="aboutText"
- value="Eclipse Formal Modeling (Incubation)

(c) Copyright Eclipse contributors and others 2000, 2016. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/">
+ value="Eclipse Formal Modeling (Incubation)

(c) Copyright Eclipse contributors and others 2000, 2016. All rights reserved.
Visit http://www.eclipse.org/platform

This product includes software developed by the
Apache Software Foundation http://www.apache.org/">
</property>
<property
name="preferenceCustomization"
diff --git a/releng/org.eclipse.efm.modeling.rcp/plugin_customization.ini b/releng/org.eclipse.efm.modeling.rcp/plugin_customization.ini
index 6793b9f..eb8a669 100644
--- a/releng/org.eclipse.efm.modeling.rcp/plugin_customization.ini
+++ b/releng/org.eclipse.efm.modeling.rcp/plugin_customization.ini
@@ -8,24 +8,22 @@
# Property "org.eclipse.ui/defaultPerspectiveId" controls the
# perspective that the workbench opens initially
-org.eclipse.ui/defaultPerspectiveId=org.eclipse.papyrus.infra.core.perspective
+org.eclipse.ui/defaultPerspectiveId=org.eclipse.efm.execution.ui.perspectiveExecution
+
+#org.eclipse.ui/defaultPerspectiveId=org.eclipse.efm.editing.ui.perspectiveEditing
+#org.eclipse.ui/defaultPerspectiveId=org.eclipse.efm.modeling.ui.perspectiveModeling
+#org.eclipse.ui/defaultPerspectiveId=org.eclipse.papyrus.infra.core.perspective
# new-style tabs by default
org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
# put the perspective switcher on the top right
org.eclipse.ui/DOCK_PERSPECTIVE_BAR=topRight
+org.eclipse.ui/SHOW_TEXT_ON_PERSPECTIVE_BAR=true
# show progress on startup
org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP=true
-# put default perspective
-org.eclipse.ui/defaultPerspectiveId=org.eclipse.efm.modeling.ui.perspectiveModeling
-
-#org.eclipse.ui/defaultPerspectiveId=org.eclipse.efm.editing.ui.perspectiveEditing
-#org.eclipse.ui/defaultPerspectiveId=org.eclipse.efm.execution.ui.perspectiveExecution
-
-
# Show Intro
org.eclipse.ui/showIntro=true
