Commit dac53d2d authored by Simon Barner's avatar Simon Barner
Browse files

Remove more references to usecase.

refs 3120
parent 3d6a8fdb
ConnectExternalRelationToComponentAction.java a0053a8f5409f73fc661a1db90013ff5109b2b45 GREEN
ConnectIBScopeToComponentAction.java ec7663eb3a783028bfadb05f0e1343bca4aab9fa GREEN
ConvertRequirementAction.java 3f5727d296a7570c878b8f50d2bdd1c9c4eaec07 GREEN
ConvertRequirementAction.java e012398d943db5d21f8060159d3b849a970cf32a GREEN
CreateGlossaryEntryAction.java 09fcc049d822918f729bf0c2295f733b69f9ebb4 GREEN
CreateRefSpecAction.java 1f73e091e5494b17f44af79cd8fb3e4336423282 GREEN
CreateRequirementSourceAction.java bb40578561fe12e09a2ef05889d4351e3fae829d GREEN
......
......@@ -20,10 +20,11 @@ import static org.eclipse.emf.ecore.util.EcoreUtil.delete;
import org.fortiss.af3.mira.model.ExternalRelation;
import org.fortiss.af3.mira.model.Requirement;
import org.fortiss.af3.mira.model.RequirementRelation;
import org.fortiss.af3.mira.model.interfacebehaviour.InterfaceBehaviour;
import org.fortiss.tooling.kernel.ui.service.IModelEditorBindingService;
/**
* Command to change a {@link Requirement} to {@link UseCase} and vice versa
* Command to change a {@link Requirement} to {@link InterfaceBehaviour} and vice versa
*
* @author wenwenchen
*/
......
......@@ -11,7 +11,7 @@ FunctionalAspectsHaveNonFunctionalAspectsConstraintsUI.java b0d0b5021e20aca8081e
GlossaryTermDefinitionConstraintUI.java ffc5c543c0c22a5473adf56c115697dbbcd34860 GREEN
IDConstraintUI.java 7b3daed9f2db3894dc36921da50737604865a22a GREEN
IdentifiedInputOutputDefinedConstraintUI.java 74c3d47a2c290dd7e8f0b99da9c024288865f585 GREEN
MultipleAspectsConstraintUI.java 7e6577bb73dbb3a52021d3d3360240abd5dade50 GREEN
MultipleAspectsConstraintUI.java 36be2681e7365838b3d6a3290460f6123060a139 GREEN
NameConstraintUI.java 2b7d44cf80028415b6d31f5b8f83f0e019c76992 GREEN
NonFunctionalAspectsHaveFunctionalAspectsConstraintUI.java e491fdabca4f3089e151ee6bb46a1ebeb776476c GREEN
NonFunctionalReqsHaveExactlyOneFunctionalReqUI.java 70aa07dc59848abfdc9a66f03dfeb213c9ec145c GREEN
......
......@@ -75,12 +75,6 @@ public class MultipleAspectsConstraintUI extends ConstraintUIBases.ConstraintUIB
*/
public int timingAspectCounter = 1;
/**
* Used for counting the usecasespecs and adding it to the ID (i.e.,
* requirementname.usecaseAspectCounter
*/
public int usecaseAspectCounter = 1;
/**
* Used for counting the formalspecs and adding it to the ID (i.e.,
* requirementname.formalSpecAspectCounter
......
......@@ -4,7 +4,7 @@ AssetsEditor.java f57d1ac1ef44cf6729ea18945c98cbafbdc770ff GREEN
CheckListEditor.java 87f32881ff21cdc24917db92620427cac40d5f38 GREEN
CounterMeasuresEditor.java 39b6ca208501681ba2ece1a2416a31a81a9fabea GREEN
DateToStringConverter.java ae64edf25d6b2b11194f69808561472b041bda3a GREEN
DerivedRequirementEditor.java 3787b0e95c00a4e98f269a4f2a539d6a14c9ec7f GREEN
DerivedRequirementEditor.java 6082e3f4bdc2c70e37821eb319343687e134d5f2 GREEN
FormalSpecificationTreeContentProvider.java 4caa4961b96c52a0c765399c9090c3a415b479cf GREEN
FunctionalRequirementEditor.java a3f61dc9c76c17798f7a64877442bda2ef42d592 GREEN
InterfaceBehaviourAspectEditor.java fb38ffdb49c506e54ceeac2f0f3f9ad30729c9a3 GREEN
......
......@@ -15,13 +15,13 @@
+--------------------------------------------------------------------------*/
package org.fortiss.af3.mira.ui.editor;
import static java.util.stream.Collectors.toList;
import static java.util.stream.IntStream.rangeClosed;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.pickFirstInstanceOf;
import static org.fortiss.tooling.kernel.utils.EcoreUtils.pickInstanceOf;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.conqat.ide.commons.ui.jface.TreeContentProviderBase;
import org.eclipse.emf.common.util.EList;
......@@ -59,13 +59,8 @@ import org.fortiss.tooling.kernel.ui.presentation.ModelElementLabelProvider;
*/
public class DerivedRequirementEditor<T extends Requirement> extends AspectEditorBase<T> {
DerivedRequirementSpecification drSpec;
/**
* The tree viewer displaying the modes. Only used as a table, but we use trees because it does
* not cost anything.
*/
private TreeViewer viewer;
/** The requirement specification this editor operates on. */
private DerivedRequirementSpecification drSpec;
/** Top level element for the edited object. */
private ITopLevelElement top;
......@@ -118,9 +113,8 @@ public class DerivedRequirementEditor<T extends Requirement> extends AspectEdito
if(parentElement instanceof List<?>) {
List<Object> range = new ArrayList<Object>();
range.add(new FakeChild());
range.addAll(IntStream
.rangeClosed(0, drSpecification.getRelatedTo().size() - 1).boxed()
.collect(Collectors.toList()));
range.addAll(rangeClosed(0, drSpecification.getRelatedTo().size() - 1).boxed()
.collect(toList()));
return range.toArray();
}
return new Object[0];
......
GlossaryEditor.java 46fea2064796ddddc11335515ff1d2ef5908b792 GREEN
GlossaryEntryEditor.java a09ee9042235b2f2a14bb1f4d43d3620ccf3a8c1 GREEN
GlossaryOccurrencesComparator.java ed3dc499b49c517f6f73f9e265c2a83c681525c5 GREEN
GlossaryOccurrencesEditor.java 64570fbd3a80d7e8b0d11703c7a0e904e3e606a1 GREEN
GlossaryOccurrencesEditor.java 6233ac30e1d555c829e17927391690a598cdd979 YELLOW
GlossaryOccurrencesLabelProvider.java 12dfee996ab6e7ce42e5bf93544c32f0030eddc2 GREEN
Levenshtein.java 453d8cce76ee7cb6d97fffa76a1b45688280d21a GREEN
......@@ -74,8 +74,6 @@ public class GlossaryOccurrencesEditor extends OverviewEditorBase<ContextElement
protected int glossaryEntryNum;
/** Number of {@link Requirement}s. */
protected int requirementsEntryNum;
/** Number of {@link UseCase}s. */
protected int useCasesEntryNum;
/** Number of {@link RequirementSource}s. */
protected int requirementSourceEntryNum;
......@@ -410,11 +408,8 @@ public class GlossaryOccurrencesEditor extends OverviewEditorBase<ContextElement
label += glossaryEntryNum + " glossary entries, ";
if(requirementSourceEntryNum > 0)
label += requirementSourceEntryNum + " requirement sources, ";
if(requirementsEntryNum + useCasesEntryNum > 0)
label +=
requirementsEntryNum + " requirement entries (" +
(requirementsEntryNum - useCasesEntryNum) + " requirements, " +
useCasesEntryNum + " use cases). ";
if(requirementsEntryNum > 0)
label += requirementsEntryNum + " requirement entries. ";
label += "\t";
return label;
......
OverviewComparator.java 4e067171c32bcf675884605c26fb586a54606e39 GREEN
OverviewEditorBase.java d37c6106215ca7b7b2231be97d36069ac50adf11 GREEN
OverviewLabelProvider.java ac45c2ad3524783463ee888c7fe3810a6bd920a0 GREEN
OverviewEditorBase.java 6f49190a4704a1c367029db962c0cee109a3ceac YELLOW
OverviewLabelProvider.java dcfde27ff56d76c5bb06e36f12a5f244ace5fdc2 YELLOW
OverviewTreeContentProvider.java 0e23bbf55cefe97a032a2225a43b44e1317c2ad2 GREEN
......@@ -24,7 +24,6 @@ import static org.fortiss.af3.mira.ui.editor.overview.OverviewEditorBase.Statist
import static org.fortiss.af3.mira.ui.editor.overview.OverviewEditorBase.StatisticEntries.NO_REQS;
import static org.fortiss.af3.mira.ui.editor.overview.OverviewEditorBase.StatisticEntries.NO_REQS_TOTAL;
import static org.fortiss.af3.mira.ui.editor.overview.OverviewEditorBase.StatisticEntries.NO_STAKEHOLDERS;
import static org.fortiss.af3.mira.ui.editor.overview.OverviewEditorBase.StatisticEntries.NO_USE_CASES;
import static org.fortiss.af3.mira.ui.utils.MiraLayoutUtils.fillControlFactory;
import static org.fortiss.af3.mira.ui.utils.MiraLayoutUtils.singleLineInputFactory;
import static org.fortiss.af3.mira.ui.utils.MiraLayoutUtils.singleLineLabelFactory;
......@@ -91,12 +90,10 @@ public abstract class OverviewEditorBase<T extends IHierarchicElement> extends F
NO_DOCUMENTS("Documents: "),
/** Total number of {@link ExternalSystem}s. */
NO_EXTERNAL_SYSTEMS("External systems: "),
/** Total number of {@link Requirement}s and {@link UseCase}s. */
/** Total number of {@link Requirement}s. */
NO_REQS_TOTAL("Requirements and use cases: "),
/** Total number of {@link Requirement}s. */
NO_REQS("Requirements: "),
/** Total number of {@link UseCase}s. */
NO_USE_CASES("Use cases: "),
/** Total number of all elements. */
NO_ALL("All elements: ");
......@@ -192,8 +189,6 @@ public abstract class OverviewEditorBase<T extends IHierarchicElement> extends F
Integer.toString(statistics.get(NO_EXTERNAL_SYSTEMS.ordinal())));
createSingleLineStatisticsField(statisticsComposite, NO_REQS.getLabel(),
Integer.toString(statistics.get(NO_REQS.ordinal())));
createSingleLineStatisticsField(statisticsComposite, NO_USE_CASES.getLabel(),
Integer.toString(statistics.get(NO_USE_CASES.ordinal())));
createSingleLineStatisticsField(statisticsComposite, NO_REQS_TOTAL.getLabel(),
Integer.toString(statistics.get(NO_REQS_TOTAL.ordinal())));
createSingleLineStatisticsField(statisticsComposite, NO_ALL.getLabel(),
......@@ -225,8 +220,6 @@ public abstract class OverviewEditorBase<T extends IHierarchicElement> extends F
editedObject instanceof RequirementsPackage) {
createSingleLineStatisticsField(statisticsComposite, NO_REQS.getLabel(),
Integer.toString(statistics.get(NO_REQS.ordinal())));
createSingleLineStatisticsField(statisticsComposite, NO_USE_CASES.getLabel(),
Integer.toString(statistics.get(NO_USE_CASES.ordinal())));
createSingleLineStatisticsField(statisticsComposite, NO_REQS_TOTAL.getLabel(),
Integer.toString(statistics.get(NO_REQS_TOTAL.ordinal())));
}
......@@ -296,7 +289,6 @@ public abstract class OverviewEditorBase<T extends IHierarchicElement> extends F
int numStakeholders = 0;
int numDocuments = 0;
int numExternalSystems = 0;
int numUC = 0;
int numReq = 0;
// For Analysis overview.
......@@ -328,11 +320,10 @@ public abstract class OverviewEditorBase<T extends IHierarchicElement> extends F
result.add(NO_STAKEHOLDERS.ordinal(), numStakeholders);
result.add(NO_DOCUMENTS.ordinal(), numDocuments);
result.add(NO_EXTERNAL_SYSTEMS.ordinal(), numExternalSystems);
result.add(NO_REQS_TOTAL.ordinal(), numUC + numReq);
result.add(NO_REQS_TOTAL.ordinal(), numReq);
result.add(NO_REQS.ordinal(), numReq);
result.add(NO_USE_CASES.ordinal(), numUC);
result.add(NO_ALL.ordinal(), numGlossaryEntries + numStakeholders + numDocuments +
numExternalSystems + numUC + numReq);
numExternalSystems + numReq);
return result;
}
......
......@@ -61,10 +61,6 @@ public class OverviewLabelProvider implements ITableLabelProvider {
private static Image requirementIcon = imageDescriptorFromPlugin(PLUGIN_ID,
"icons/Icon_Document.png").createImage();
/** {@link Image} icon for {@link UseCase}. */
private static Image usecaseIcon = imageDescriptorFromPlugin(PLUGIN_ID,
"icons/Icon_UseCase.png").createImage();
/** {@link Image} icon for {@link Glossary}. */
private static Image glossaryIcon = imageDescriptorFromPlugin(PLUGIN_ID,
"icons/Icon_Glossary.png").createImage();
......
......@@ -4,7 +4,7 @@ ExternalSystemEditorbindings.java 811780ad83786cc127d3b99f695612aa186a4455 GREEN
GlossaryEditorBinding.java 72e4034847575fdf38a02191857a8dafd57aba93 GREEN
GlossaryEntryEditorBindings.java 238f3d2eb59a21020cf4d1d7e092583de621dc44 GREEN
GlossaryOccurrencesEditorBinding.java 7e77dbf34927be9923e275a10e17e31813ffd878 GREEN
InterfaceBehaviourEditorBinding.java 6cf77cf8cf948dee45fd3fd01f48c4060c69380b GREEN
InterfaceBehaviourEditorBinding.java 0eb37320ea9d08674c8a8f98edbca798db39b809 GREEN
OtherEditorBinding.java 44fcf913b847f8c09b7e9970c1528a546371eb3e GREEN
RequirementDocumentEditorBindings.java ee5452340bd667d1389bc3b5437b58e37f9ec28b GREEN
RequirementEditorBinding.java 52e9f4c420501a57bce680b162d85f93a4a27132 GREEN
......
......@@ -23,7 +23,7 @@ import org.fortiss.af3.mira.ui.editor.InterfaceBehaviourEditor;
import org.fortiss.tooling.kernel.ui.extension.base.ModelEditorBindingBase;
/**
* Extension of {@link ModelEditorBindingBase} for {@link UseCase}.
* Extension of {@link ModelEditorBindingBase} for {@link InterfaceBehaviour}.
*
* @author mou
*/
......
......@@ -5,7 +5,7 @@ GlossaryEntryHandler.java a800a5eaa8ffd998c4cbe0a94b6a45f6e066a45e GREEN
GlossaryHandler.java 5a9e903191f24ce915833a8b8d633b40c7eb26e5 GREEN
InterfaceBehaviourHandler.java 9e1e2a396378b7a2febc3fa6a0baf8617b9bb4f5 GREEN
RequirementDocumentHandler.java 255d00556af095153b9f2b79b73d5b07d05bedbd GREEN
RequirementHandler.java eb950b75254f12a987a435208f6ee6aa147544fb GREEN
RequirementHandler.java beba02b0fbfa74ead3fe038d96d769b74615eb9c YELLOW
RequirementRelationStatusHandler.java 0682734376770ac02d69c1231fe78ca631962742 GREEN
RequirementSourceHandler.java 1d4c1e5bcbb276d2565acf8b55028a3181e77180 GREEN
RequirementSpecificationHandler.java cff78fce9676ebff3544e35105d55bbc463fa7c1 GREEN
......
......@@ -76,7 +76,6 @@ public class RequirementHandler extends NamedCommentedModelElementHandlerBase<Re
boolean timingAspect = false;
boolean signalAspect = false;
boolean parameterdefAspect = false;
boolean usecaseSpecAspect = false;
boolean modeAspect = false;
boolean formalspecAspect = false;
boolean safetyAspect = false;
......@@ -140,9 +139,6 @@ public class RequirementHandler extends NamedCommentedModelElementHandlerBase<Re
if(aspectCounter == 1 && safetyAspect == true) {
return imageDescriptorFromPlugin(PLUGIN_ID, "icons/Icon_ReqwithSafety.png");
}
if(aspectCounter == 1 && usecaseSpecAspect == true) {
return imageDescriptorFromPlugin(PLUGIN_ID, "icons/Icon_ReqwithUseCase.png");
}
if(aspectCounter == 1 && formalspecAspect == true) {
return imageDescriptorFromPlugin(PLUGIN_ID, "icons/Icon_ReqwithFormalSpec.png");
}
......
Supports Markdown
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