Work on *.localanalysis.pofile plug-in.
Fix GenericAbstractSFailureModeOwner.getSFailureModesLAnalysisList().
Change-Id: I4d97e011a56ba3a8a8b9324415cbc64413a63df1
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/GenericAbstractSFailureModeOwner.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/GenericAbstractSFailureModeOwner.java
index 85c2c33..d1553ad 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/GenericAbstractSFailureModeOwner.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/GenericAbstractSFailureModeOwner.java
@@ -40,8 +40,7 @@
* @param pBaseProperty The element base of a SFailureModeOwner
* @return The List of SFailureModeLAnalysis
*/
- public static EList<IAbstractSFailureModeLAnalysis> getSFailureModesLAnalysisList(
- final Property pBaseProperty) {
+ public static EList<IAbstractSFailureModeLAnalysis> getSFailureModesLAnalysisList(final Property pBaseProperty) {
EList<IAbstractSFailureModeLAnalysis> vSFailureModesLAnalysisList =
new BasicEList<IAbstractSFailureModeLAnalysis>();
@@ -54,7 +53,11 @@
if (UMLUtil.getStereotypeApplication(vConnector, ISDysfunctionalAssociation.class) != null) {
ISDysfunctionalAssociation vSDysfunctionalAssociation = (ISDysfunctionalAssociation) UMLUtil
.getStereotypeApplication(vConnector, ISDysfunctionalAssociation.class);
- vSFailureModesLAnalysisList.add(vSDysfunctionalAssociation.getSFailureModeLAnalysis());
+ IAbstractSFailureModeLAnalysis vSFailureModeLAnalysis =
+ vSDysfunctionalAssociation.getSFailureModeLAnalysis();
+ if (vSFailureModeLAnalysis != null) {
+ vSFailureModesLAnalysisList.add(vSFailureModeLAnalysis);
+ }
}
}
}
diff --git a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSDysfunctionalAssociation.java b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSDysfunctionalAssociation.java
index 4a0d982..443dda8 100644
--- a/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSDysfunctionalAssociation.java
+++ b/analysis/localanalysis/profile/org.polarsys.esf.localanalysis.profile/src/main/java/org/polarsys/esf/esflocalanalysis/impl/MSDysfunctionalAssociation.java
@@ -122,9 +122,7 @@
while ((vStereotypeApplication == null) && vIterator.hasNext()) {
java.lang.Class<? extends IAbstractSFailureModeOwner> vSFailureModeOwner = vIterator.next();
- if (UMLUtil.getStereotypeApplication(pElement, vSFailureModeOwner) != null) {
- vStereotypeApplication = UMLUtil.getStereotypeApplication(pElement, vSFailureModeOwner);
- }
+ vStereotypeApplication = UMLUtil.getStereotypeApplication(pElement, vSFailureModeOwner);
}
return vStereotypeApplication;
}
@@ -143,9 +141,7 @@
while ((vStereotypeApplication == null) && vIterator.hasNext()) {
java.lang.Class<? extends IAbstractSFailureModeLAnalysis> vSFailureMode = vIterator.next();
- if (UMLUtil.getStereotypeApplication(pElement, vSFailureMode) != null) {
- vStereotypeApplication = UMLUtil.getStereotypeApplication(pElement, vSFailureMode);
- }
+ vStereotypeApplication = UMLUtil.getStereotypeApplication(pElement, vSFailureMode);
}
return vStereotypeApplication;
}
