#98 NPE on null source or target elements of AbstractRelation

Add check to prevent NPE Change-Id: Ie15824da7ff3ec0bc5d25f8aa3792977c5d29fbd Signed-off-by: Arnaud Dieumegard <arnaud.dieumegard@obeo.fr>
eclipse-capella · Mar 26, 2021 · a7e9c94 · a7e9c94
1 parent 05a3dd4
commit a7e9c94
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/...nts.docgen/src/org/polarsys/kitalpha/vp/requirements/docgen/helper/RequirementHelper.java b/...nts.docgen/src/org/polarsys/kitalpha/vp/requirements/docgen/helper/RequirementHelper.java
@@ -148,16 +148,27 @@ public static String generateRequirementInternalAllocationSection(Requirement re
           }
           String relationTypeName = getRelationTypeName(relation);
           Requirement target = ((InternalRelation) relation).getTarget();
-          String hyperlinkFromElement = RequirementsServices.getHyperlinkFromElement(target);
-          String imageLinkFromElmeent = RequirementsServices.getImageLinkFromElement(target, projectName, outputFolder);
-          sb.append(genTableRow(false, imageLinkFromElmeent + " " + hyperlinkFromElement, relationTypeName));
+          String linkFromElement = getImageHyperlinkFromElement(target, projectName, outputFolder, RequirementsServices.NO_TARGET_DEFINED);
+          sb.append(genTableRow(false, linkFromElement, relationTypeName));
         }
       }
       sb.append(RequirementsServices.TABLE_CLOSE);
     }
 
     return sb.toString();
   }
+
+  private static String getImageHyperlinkFromElement (EObject target, String projectName, String outputFolder, String defaultValue) {
+	  String linkFromElement = "";
+      if (target != null) {
+    	  String hyperlinkFromElement = RequirementsServices.getHyperlinkFromElement(target);
+    	  String imageLinkFromElement = RequirementsServices.getImageLinkFromElement(target, projectName, outputFolder);
+    	  linkFromElement = imageLinkFromElement + " " + hyperlinkFromElement;
+      } else {
+    	  linkFromElement = defaultValue;
+      }
+      return linkFromElement;
+  }
 
   public static String generateRequirementsAllocationSection(Requirement requirement, String projectName,
       String folderName) {
@@ -199,9 +210,8 @@ public static String generateRequirementsIncomingAllocation(List<EObject> incomi
       for (EObject eObject : incomingRelations) {
         String relationTypeName = getRelationTypeName((AbstractRelation) eObject);
         CapellaElement source = ((CapellaOutgoingRelation) eObject).getSource();
-        String imageLinkFromElement = RequirementsServices.getImageLinkFromElement(source, projectName, folderName);
-        String hyperlinkFromElement = RequirementsServices.getHyperlinkFromElement(source);
-        builder.append(genTableRow(false, imageLinkFromElement + " " + hyperlinkFromElement, relationTypeName));
+        String linkFromElement = getImageHyperlinkFromElement(source, projectName, folderName, RequirementsServices.NO_SOURCE_DEFINED);
+        builder.append(genTableRow(false, linkFromElement, relationTypeName));
       }
       builder.append(RequirementsServices.TABLE_CLOSE).append("</div>");
     }
@@ -220,9 +230,8 @@ public static String generateRequirementsOutgoingAllocation(List<EObject> outgoi
       for (EObject eObject : outgoingRelations) {
         String relationTypeName = getRelationTypeName((AbstractRelation) eObject);
         CapellaElement target = ((CapellaIncomingRelation) eObject).getTarget();
-        String imageLinkFromElement = RequirementsServices.getImageLinkFromElement(target, projectName, folderName);
-        String hyperlinkFromElement = RequirementsServices.getHyperlinkFromElement(target);
-        builder.append(genTableRow(false, imageLinkFromElement + " " + hyperlinkFromElement, relationTypeName));
+        String linkFromElement = getImageHyperlinkFromElement(target, projectName, folderName, RequirementsServices.NO_TARGET_DEFINED);
+        builder.append(genTableRow(false, linkFromElement, relationTypeName));
       }
       builder.append(RequirementsServices.TABLE_CLOSE).append("</div>");
     }

diff --git a/...s.docgen/src/org/polarsys/kitalpha/vp/requirements/docgen/utils/RequirementsServices.java b/...s.docgen/src/org/polarsys/kitalpha/vp/requirements/docgen/utils/RequirementsServices.java
@@ -72,6 +72,9 @@ public class RequirementsServices {
   private static final String PATH_COMPLETE = ".html";
   public static final String LINE_BREAK = "<br/>";
 
+  public static final String NO_SOURCE_DEFINED = "No source defined";
+  public static final String NO_TARGET_DEFINED = "No target defined";
+
   public static Set<DSemanticDiagram> getDiagramContainingObject(ReqIFElement element) {
     Set<DSemanticDiagram> diagrams = new HashSet<DSemanticDiagram>();
     if (!DocgenDiagramPreferencesHelper.getExportDiagram()) {