Commit 387712d5 authored by Simon Barner's avatar Simon Barner
Browse files

Remove dependency to message sequence charts (af3.msc)

Issue-Ref: 3861
Issue-Url: https://af3-developer.fortiss.org/issues/3861

Signed-off-by: Simon Barner's avatarSimon Barner <barner@fortiss.org>
parent 3a67dcd8
ContextUtils.java 273aa06af2c15073bbbdd6f1a8112190732eaa9b GREEN
HighlightUtils.java e10dea2ebce5651b7b8f5c150ce195c95d693b7d GREEN
ImageUtils.java e62aae5ce8037edfdff09b6d0ffab0be32fc6821 GREEN
ImageUtils.java 7fa1e146283852f5cf817b922028f06515f7d00a YELLOW
ListenerUtils.java 11e9f9f7806a6eccaa53e4a9e75ebf733f633647 GREEN
MiraLayoutUtils.java 0ed0d5731be847edb8454acc27de691ac3ee28e9 GREEN
ReqSelectionDialog.java e5655f4f6167d0253ca7946b2cdec2d654d50bb1 GREEN
......
......@@ -84,7 +84,7 @@ public class ImageUtils {
AbstractGraphicalEditPart editPart = (AbstractGraphicalEditPart)o;
Rectangle partRec = editPart.getFigure().getBounds();
// it is assumed that the first (and only) children of the rootEditPart is the edit
// part of the top-level model element (e.g. the MSCDiagram)
// part of the top-level model element
if(!editPart.equals(rootEditPart) &&
!editPart.equals(rootEditPart.getChildren().get(0))) {
adjustClippingBounds(clippingBounds, partRec);
......
......@@ -60,7 +60,6 @@ Require-Bundle: org.eclipse.core.runtime,
org.fortiss.af3.expression;visibility:=reexport,
org.fortiss.af3.safety;bundle-version="2.16.0",
org.fortiss.af3.mode;bundle-version="2.16.0",
org.fortiss.af3.msc;bundle-version="2.16.0",
org.fortiss.tooling.base.ui,
org.fortiss.af3.state;bundle-version="2.16.0"
Bundle-ActivationPolicy: lazy
......
......@@ -2,7 +2,7 @@ AnalysisCompositor.java 56c5d1de60dd5e832c91829529d75e8997258564 GREEN
AnalysisFileProjectCompositor.java e9e1e12d8270fa7e527c0d591050c6b52651422e GREEN
GlossaryCompositor.java 06e80bcaa9cab98e3957496c702871538809dc60 GREEN
ModeSpecificationCompositor.java af3fe2bb496578958f9865df9a800f009f112465 GREEN
RequirementCompositor.java 636584ffd1744a8b887386f5fea451a3120256f0 GREEN
RequirementCompositor.java c03782e32c7e5af002bbf92c4408130bf66970e7 YELLOW
RequirementSourceCompositor.java a459fe9ec030739ca48405bd92092d4f2ac7466b GREEN
RequirementSpecificationCompositor.java 75654efc4dffb62f4925c580a99588df9af23e77 GREEN
RequirementsContainerCompositor.java 69ad11d765c83bc6691520a54e5a7af39b4133d4 GREEN
......
......@@ -34,10 +34,8 @@ import org.fortiss.af3.mira.model.security.CounterMeasuresRequirementSpecificati
import org.fortiss.af3.mira.model.security.ThreatsRequirementSpecification;
import org.fortiss.af3.mira.model.security.VulnerabilitiesRequirementSpecification;
import org.fortiss.af3.mira.model.timing.TimingRequirement;
import org.fortiss.af3.msc.model.MSCSpecification;
import org.fortiss.af3.project.model.ParameterDefinition;
import org.fortiss.tooling.base.compose.HierarchicElementCompositorBase;
import org.fortiss.tooling.base.model.element.IHierarchicElement;
import org.fortiss.tooling.base.model.element.IModelElementSpecification;
import org.fortiss.tooling.kernel.extension.IElementCompositor;
import org.fortiss.tooling.kernel.extension.data.IElementCompositionContext;
......@@ -130,8 +128,7 @@ public class RequirementCompositor extends HierarchicElementCompositorBase<Requi
elt instanceof DerivedRequirementSpecification ||
elt instanceof SignalContainerSpecification || elt instanceof ParameterDefinition ||
elt instanceof SafetyLevelRequirementSpecification ||
elt instanceof MSCSpecification || elt instanceof FormalSpecification ||
elt instanceof FunctionalSpecification ||
elt instanceof FormalSpecification || elt instanceof FunctionalSpecification ||
elt instanceof HazardRequirementSpecification ||
elt instanceof MooNSolutionRequirementSpecification;
}
......@@ -143,9 +140,6 @@ public class RequirementCompositor extends HierarchicElementCompositorBase<Requi
// Need to call HierarchicElementCompositorBase.compose() to ensure instantiation of
// annotations.
super.compose(container, contained, context);
if(contained instanceof MSCSpecification) {
return container.getContainedElements().add((IHierarchicElement)contained);
}
if(contained instanceof FormalSpecification) {
Component topVisibleComp = ((FormalSpecification)contained).getTopVisibleComponent();
if(topVisibleComp != null) {
......@@ -166,7 +160,7 @@ public class RequirementCompositor extends HierarchicElementCompositorBase<Requi
contained instanceof ParameterDefinition ||
contained instanceof DerivedRequirementSpecification ||
contained instanceof SafetyLevelRequirementSpecification ||
contained instanceof TimingRequirement || contained instanceof MSCSpecification ||
contained instanceof TimingRequirement ||
contained instanceof FormalSpecification ||
contained instanceof FunctionalSpecification ||
contained instanceof HazardRequirementSpecification ||
......
ContextFactory.java 2fcfa3b823b1ad4e9642108c2a105485356509b4 GREEN
ContextFactory.java 0396017064fccb2d7985af5c3ab555671116dd0c YELLOW
......@@ -63,7 +63,6 @@ import org.fortiss.af3.mira.report.template.EvaluationContext;
import org.fortiss.af3.mira.report.template.EvaluationContext.OutputFormat;
import org.fortiss.af3.mode.model.Mode;
import org.fortiss.af3.mode.model.ModeAutomaton;
import org.fortiss.af3.msc.model.MSCSpecification;
import org.fortiss.af3.state.model.State;
import org.fortiss.af3.state.model.StateAutomaton;
import org.fortiss.tooling.base.model.element.IModelElement;
......@@ -550,15 +549,6 @@ public class ContextFactory {
return ctx;
}
/** Return the {@link EvaluationContext} for the {@link MSCSpecification} */
public static EvaluationContext getContextFor(MSCSpecification mscSpec) {
EvaluationContext ctx = new EvaluationContext();
ctx.set("name", mscSpec.getTopEntity().getName());
ctx.set("id", mscSpec.getId());
ctx.set("project_name", getProjectName(mscSpec));
return ctx;
}
/** Return the {@link EvaluationContext} for the {@link Glossary} */
public static EvaluationContext getContextFor(Glossary glossary) {
......
......@@ -264,22 +264,7 @@
</ul>
</td>
</tr>
<tr>
<td>MSC Specifications</td>
<td>
<ul>
<TMPL_LOOP mscs_short>
<li><TMPL_VAR name></li>
</TMPL_LOOP mscs_short>
<TMPL_LOOP scenarios>
<TMPL_LOOP scenarios_mscs_short>
<li><TMPL_VAR name></li>
</TMPL_LOOP scenarios_mscs_short>
</TMPL_LOOP scenarios>
</ul>
</td>
</tr>
</TMPL_IF is_usecase>
</TMPL_IF is_usecase>
<tr>
<td>Formal Specifications</td>
<td>
......@@ -340,17 +325,7 @@
</tr>
</TMPL_LOOP scenariosteps>
</table>
<TMPL_LOOP scenarios_mscs>
<h5><TMPL_VAR name></h4>
<img src="images/<TMPL_VAR project_name>-object<TMPL_VAR id>"/>
</TMPL_LOOP scenarios_mscs>
</TMPL_LOOP scenarios>
<TMPL_LOOP mscs>
<h5><TMPL_VAR name></h4>
<img src="images/<TMPL_VAR project_name>-object<TMPL_VAR id>"/>
</TMPL_LOOP mscs>
</TMPL_IF is_usecase>
<TMPL_LOOP formalspecs>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment