From 10d89a16985aab16d6a4ddd9be89788d86d3f95e Mon Sep 17 00:00:00 2001
From: Fabien Tessier <fabien.tessier@telecom-paristech.fr>
Date: Mon, 2 Oct 2017 17:41:00 +0200
Subject: [PATCH] Fix model loading for TURTLE files
---
src/main/java/ui/GTURTLEModeling.java | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index db2b7bbe42..8882717642 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -7577,17 +7577,25 @@ public class GTURTLEModeling {
//TraceManager.addDev("Loading seq diag1");
ui.sd.SequenceDiagramPanel sdp = mgui.getSequenceDiagramPanel(indexAnalysis, name);
//TraceManager.addDev("Loading seq diag2");
+ ui.sd2.SequenceDiagramPanel sdp2 = mgui.getSequenceDiagramPanelZV(indexAnalysis, name);
+
+ if (sdp != null) {
+ sdp.removeAll();
+ //TraceManager.addDev("Loading seq diag4");
- if (sdp == null) {
- throw new MalformedModelingException();
+ loadDiagram(elt, sdp);
+ //TraceManager.addDev("Loading seq diag5");
}
- //TraceManager.addDev("Loading seq diag3");
+ else if (sdp2 != null) {
+ sdp2.removeAll();
- sdp.removeAll();
- //TraceManager.addDev("Loading seq diag4");
+ loadDiagram(elt, sdp2);
+ }
+ else
+ throw new MalformedModelingException();
+ //TraceManager.addDev("Loading seq diag3");
- loadDiagram(elt, sdp);
- //TraceManager.addDev("Loading seq diag5");
+
}
public void loadSequenceDiagramZV(Element elt, int indexAnalysis) throws MalformedModelingException, SAXException {
--
GitLab