Skip to content
This repository was archived by the owner on Oct 21, 2025. It is now read-only.

Fix: Issue for new models with constraints where annotations are empty #3

Merged
01Parzival10 merged 1 commit into from
Apr 22, 2025
Merged

Fix: Issue for new models with constraints where annotations are empty #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...g.dataflowanalysis.standalone/src/org/dataflowanalysis/standalone/analysis/Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,11 @@ public static String convertToDFDandStringify(WebEditorDfd webEditorDfd, String
}

private static List<AnalysisConstraint> parseConstraints(WebEditorDfd webEditorDfd) {
return webEditorDfd.constraints().stream().map(it -> {
return AnalysisConstraint.fromString(new StringView(it.constraint())).getResult();
}).toList();
return webEditorDfd.constraints().stream()
.filter(it -> it.constraint() != null && !it.constraint().isEmpty())
.map(it -> {
return AnalysisConstraint.fromString(new StringView(it.constraint())).getResult();
}).toList();
}

private static List<DSLResult> runAnalysis(DataFlowDiagramAndDictionary dfd, List<AnalysisConstraint> constraints) {
Expand Down Expand Up @@ -193,7 +195,7 @@ private static WebEditorDfd annotateViolations(WebEditorDfd webEditorDfd, List<D
for (Child child : webEditorDfd.model().children()) {
if (nodeToAnnotationMap.containsKey(child)) {
StringBuilder builder = new StringBuilder();
builder.append(child.annotation().message().toString());
if(child.annotation() != null) builder.append(child.annotation().message().toString());
if (builder.toString() != "") builder.append("\n");
builder.append(nodeToAnnotationMap.get(child));

Expand Down