Commit 5f1be414 authored by Ashmi Banerjee's avatar Ashmi Banerjee
Browse files

Merge branch '3418' of https://git.fortiss.org/af3/af3.git into 3418

Conflicts:
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editor/.ratings
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/editorbinding/.ratings
	org.fortiss.af3.mira.ui/src/org/fortiss/af3/mira/ui/handler/.ratings
	org.fortiss.af3.mira/model/.ratings
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/compose/.ratings
	org.fortiss.af3.mira/src/org/fortiss/af3/mira/prototype/.ratings
parents afd39cd0 8f93bf6b
AnalysisEditor.java ab1f7a5ecbd1bea48d9bc14009f2f10123c17c43 GREEN
AspectEditorBase.java 52b5f77252d8a273c423801aeb2984163a9c5d6e GREEN
AssetsEditor.java 165885aba6ff43f5b59e690bb11f2c33805af90b YELLOW
AssetsEditor.java 165885aba6ff43f5b59e690bb11f2c33805af90b GREEN
CounterMeasuresEditor.java 94b90214d707dcb4739f308b981e608492a8690e GREEN
DateToStringConverter.java c969b068ea1dfd77b7153dd8937dca2e4b5630b7 GREEN
DerivedRequirementEditor.java b63b7200096998268b777f6060076073cb018a89 GREEN
FormalSpecificationTreeContentProvider.java 469e589d7911316da6a52b4cbd97a59fcc720a97 GREEN
FunctionalRequirementEditor.java 386dd8b065aea7e155a60823cdd73b35100185cc GREEN
<<<<<<< HEAD
HazardRequirementEditor.java 0985139682ed38747b10ed0a9b39d936ce68a12e YELLOW
HazardRequirementEditor.java 0985139682ed38747b10ed0a9b39d936ce68a12e GREEN
InterfaceBehaviourAspectEditor.java ca70f1f82fca7f92e95ff83bf049c9383d5a781e GREEN
InterfaceBehaviourEditor.java be0a51fa8116f1c47b5d706935dfb17a19c775e5 GREEN
InterfaceBehaviourSectionExtension.java ead6ef67dd9aeafb070db4bd1fc9a0e8829af418 GREEN
=======
>>>>>>> refs/remotes/origin/master
InterfaceEditor.java 0e9f292c180ee06f6972a484e050252653df6178 GREEN
ModeDefinitionEditor.java 2ea1404961c2f75156d1214339b0c9b53058d4bc GREEN
<<<<<<< HEAD
MooNSolutionRequirementEditor.java 032f39665ed9682b20274ea8517c681a87ea2d85 YELLOW
OtherEditor.java adb5f3b3523fb1e6d1e2510a4d457f7f6a547e05 GREEN
=======
OtherEditor.java cb8c948d6dcc3fd0a620ead5ab2fc5b693d8bdeb GREEN
>>>>>>> refs/remotes/origin/master
ParameterDefinitionEditor.java 620497ad99059484a47d1e1f2c922215b46dfcdc GREEN
RequirementEditor.java c53c4be1eb900341fd4b74ff0e744908fb59d8ac GREEN
RequirementsContainerEditor.java 720bdefcc6ac66161673117f6082a6a71fd25c59 GREEN
......
......@@ -64,13 +64,14 @@ import org.fortiss.tooling.kernel.ui.service.IActionService;
import org.fortiss.tooling.kernel.ui.util.SelectionUtils;
/**
* Editor for the functional specification aspect of a {@link Requirement}.
*
* @author abid
* Editor for Safety MooN Solution aspect of a {@link Requirement}.
*
* @author vivek
*/
public class MooNSolutionRequirementEditor<T extends Requirement> extends AspectEditorBase<T> {
/** The edited functional specification. */
/** The edited solution specification. */
private MooNSolutionRequirementSpecification spec;
/** Label width. */
public static final int PROPERTIES_LABEL_WIDTH = 150;
......@@ -78,11 +79,11 @@ public class MooNSolutionRequirementEditor<T extends Requirement> extends Aspect
/** List of the registered source viewers. We store this in a field because.... */
protected List<SourceViewer> localRegisteredSourceViewers;
/** Default text displayed in the functional component table. */
/** Default text displayed in the input signals table. */
private static final String CLICK_TO_ADD_A_NEW_SIGNAL = "Click to add a new signal";
/**
* The tree viewer displaying the functional component. Only used as a table, but we use trees
* The tree viewer displaying the signals table. Only used as a table, but we use trees
* because it does
* not cost anything.
*/
......@@ -128,7 +129,7 @@ public class MooNSolutionRequirementEditor<T extends Requirement> extends Aspect
MOO_NSOLUTION_REQUIREMENT_SPECIFICATION__VOTER_THRESHOLD);
}
/** Section for functional component. */
/** Section for signal component. */
private Composite addSignalSection(MooNSolutionRequirementSpecification ms) {
Composite moonSection =
createNewSection("Input Signals",
......
AnalysisEditorBinding.java ca735cd4b22e526d164b8fb2c3c80ac37435c6ef GREEN
<<<<<<< HEAD
AspectBindings.java b53a3a3a9f4ccc79cd3b1e27aa400e4ef0e7fc0d YELLOW
=======
AspectBindings.java 0ab06216de323e2110d9bf9917a4a518cf9b7ba7 GREEN
>>>>>>> refs/remotes/origin/master
ExternalSystemEditorbindings.java 40c012d99f576964ef603d32103a266aba25c8f3 GREEN
GlossaryEditorBinding.java 4dd69c6ef1605a123db5a4d2ca93e5f600c0b360 GREEN
GlossaryEntryEditorBindings.java bd793cb120fca29f9ccaee59eeebbb1652cfe180 GREEN
......
AnalysisHandler.java 13127bcfc32c55261fb699a03fa614d579fddcfa GREEN
<<<<<<< HEAD
AspectHandlers.java c34da6621ad0fa61d137a7f0b8772883b3fc6519 YELLOW
=======
AspectHandlers.java 8345ad505b4c2532b0330e10e3a8d8f0a8e24a5b GREEN
>>>>>>> refs/remotes/origin/master
ExternalSystemHandler.java 0b8613287068e6cd7dad78b52e1511a4ce58c8c1 GREEN
GlossaryEntryHandler.java e8d9100791c218e8897cf64f1beaf6afb42adeb5 GREEN
GlossaryHandler.java 5399ca3ba430b1f25f40e2b8f99fea126e686d34 GREEN
......
<<<<<<< HEAD
mira.ecore de2ca324a2d5e2713e6e55ceee09dd413c2a091b YELLOW
=======
mira.ecore 1da42564575683992d8b99dbf7b4237003f402bd RED
>>>>>>> refs/remotes/origin/master
mira.ecore de2ca324a2d5e2713e6e55ceee09dd413c2a091b RED
......@@ -828,7 +828,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="sameChannel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="voterThreshold" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="inputSignals" upperBound="-1"
eType="#//functional/Signal"/>
eType="#//functional/Signal" containment="true"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="HazardImpact">
<eLiterals name="NA"/>
......
......@@ -2,11 +2,7 @@ AnalysisCompositor.java 682836040391b224d80598b64af5f94e46c58e36 GREEN
AnalysisFileProjectCompositor.java e9e1e12d8270fa7e527c0d591050c6b52651422e GREEN
GlossaryCompositor.java ca630c5bd0447ae4eb589b875598dc33ea3bd797 GREEN
ModeSpecificationCompositor.java 4f1c441100ea03f42476085e3f590dea91cf7509 GREEN
<<<<<<< HEAD
RequirementCompositor.java d1d93d837b1dfcc25664ea88659b31f5217bee58 YELLOW
=======
RequirementCompositor.java 116f72cd030e21ff1c9475c6729e49de8f9e2857 GREEN
>>>>>>> refs/remotes/origin/master
RequirementSourceCompositor.java db1e0424a0da2ae7c1cd6cb3e8578e00c987d0b8 GREEN
RequirementSpecificationCompositor.java 75654efc4dffb62f4925c580a99588df9af23e77 GREEN
RequirementsContainerCompositor.java 69ad11d765c83bc6691520a54e5a7af39b4133d4 GREEN
......
<<<<<<< HEAD
PrototypeProvider.java 2be408f968ff5e6ebec21802dab498629cb793cd YELLOW
=======
PrototypeProvider.java 0dcbfceabac2faba4b4b28949b5d714f512e5685 GREEN
>>>>>>> refs/remotes/origin/master
......@@ -4,7 +4,7 @@ ConnectTheAwayEntity.java e77f604dc27f771f954f89420115a6964b9acb79 GREEN
ContextIsPrivate.java 4c50e601bb1e621943e4b17cb76bde870f6c3ea1 GREEN
DeleteAwayEntityReference.java ba9781d6c041be1c0a552a3f08271d99329347de GREEN
DeleteReference.java 07dec16de78fecc25664c2e8c4fe014230478ff2 GREEN
DeleteRequirementReference.java 6b72216edadb66d76be547efa707d308553f12cd YELLOW
DeleteRequirementReference.java 6edaabf1137e77f32f00e01b5d5bf528a7f21335 YELLOW
ElementIsInstantiated.java 825edcd59646ece551f1d25ddf9aca3985abb16d GREEN
GenerateModuleConnections.java f406788dade34f78bc7d28538254799a7189d6f7 GREEN
GoToReferencedAF3Element.java 55655b084f1b10cb1f715ea77a2912b1370400da GREEN
......@@ -21,7 +21,7 @@ MakeAChoice.java fa998355a64ac4ee8aebe5161d44c0dcf90c6e21 GREEN
ReferenceGeneratedCode.java 4a77c98164eb5c9973d4324d23f8d3a58dea0252 GREEN
ReferenceMode.java 0e9f5c130968a692d5f3147c1614223a3c0857fe GREEN
ReferencePlatform.java d6f4c8606678e1e55c69ac23e9e2300d2cb9d764 GREEN
ReferenceRequirement.java 5d6663f6e65d38ead95a6fbd58178f2f41fa8cfa YELLOW
ReferenceRequirement.java bef051b63bc2ebf918f6186984978fc04fc3427f YELLOW
ReferenceState.java 2b199d24aa66861726d6624dec3b63535f40fe30 GREEN
ReferenceTestCoverage.java 71949e8f46a257eaa680b52115fd3ff6513e71c5 GREEN
ReferenceTestSuite.java 3cb1da360d5459c8ec6ca791ec9da572fd6323ff GREEN
......
......@@ -74,6 +74,7 @@ public class DeleteRequirementReference implements IContextMenuContributor {
/** The action. */
private class DeleteRequirementReferenceAction extends Action {
// The comment that not reflects the correct type
/** The selected {@link Goal}. */
private SpinalElement selectedElement;
......
......@@ -39,6 +39,7 @@ import org.fortiss.af3.safetycases.model.Goal;
import org.fortiss.af3.safetycases.model.Solution;
import org.fortiss.af3.safetycases.ui.AF3SafetyCasesUIActivator;
import org.fortiss.af3.safetycases.ui.action.ConnectGoalToSafetyRequirementAction;
import org.fortiss.tooling.base.model.element.IModelElement;
import org.fortiss.tooling.kernel.extension.data.ITopLevelElement;
import org.fortiss.tooling.kernel.ui.extension.IContextMenuContributor;
import org.fortiss.tooling.kernel.ui.extension.data.ContextMenuContextProvider;
......@@ -142,10 +143,10 @@ public class ReferenceRequirement implements IContextMenuContributor {
selectedSolution.setName("Solution: " + sr.getName());
}
for(ExternalRelation er : sr.getExternalRelation()) {
if(er.getExternalRelationSpecification().getSpecificationOf() != null &&
er.getExternalRelationSpecification().getSpecificationOf() instanceof Component) {
selectedSolution.setAf3Element(er.getExternalRelationSpecification()
.getSpecificationOf());
IModelElement erSpecification =
er.getExternalRelationSpecification().getSpecificationOf();
if(erSpecification != null && erSpecification instanceof Component) {
selectedSolution.setAf3Element(erSpecification);
}
}
}
......
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