Skip to content

Commit

Permalink
Added title
Browse files Browse the repository at this point in the history
  • Loading branch information
rubendel committed Jul 17, 2019
1 parent 49ac16c commit 02f431e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
11 changes: 10 additions & 1 deletion Shared/src/org/bimserver/validationreport/IssueContainer.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@

public class IssueContainer extends Issue {
private static final Logger LOGGER = LoggerFactory.getLogger(IssueContainer.class);
private final List<Issue> issues = new ArrayList<>();
private final List<Issue> issues = new ArrayList<>();
private String title;

public IssueBuilder builder() {
return new IssueBuilder(this);
Expand Down Expand Up @@ -64,5 +65,13 @@ public void dumpSummary(Map<String, AtomicInteger> map, int indentation) {
((IssueContainer)issue).dumpSummary(map, indentation + 1);
}
}
}

public String getTitle() {
return title;
}

public void setTitle(String title) {
this.title = title;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.bimserver.emf.IdEObject;
import org.bimserver.models.ifc2x3tc1.IfcProduct;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
Expand All @@ -35,6 +36,9 @@ public JsonValidationReport() {
public ObjectNode toJson(IssueContainer issueContainer) {
ObjectNode result = OBJECT_MAPPER.createObjectNode();
ArrayNode itemsJson = OBJECT_MAPPER.createArrayNode();
if (issueContainer.getTitle() != null) {
result.put("title", issueContainer.getTitle());
}
result.set("items", itemsJson);
for (Issue issue : issueContainer.list()) {
ObjectNode jsonIssue = OBJECT_MAPPER.createObjectNode();
Expand All @@ -59,7 +63,9 @@ public ObjectNode toJson(IssueContainer issueContainer) {
itemsJson.add(jsonIssue);

if (issue instanceof IssueContainer) {
jsonIssue.set("items", toJson((IssueContainer)issue).get("items"));
JsonNode value = toJson((IssueContainer)issue);
jsonIssue.set("items", value.get("items"));
jsonIssue.set("title", value.get("title"));
}
}
return result;
Expand Down

0 comments on commit 02f431e

Please sign in to comment.