From c462d2525909bebd4f5058b948a17a434241a721 Mon Sep 17 00:00:00 2001 From: Letitia Li Date: Fri, 2 Feb 2018 08:44:44 +0100 Subject: [PATCH 1/2] Fixing firewall bug --- src/main/java/ui/TGComponentManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ui/TGComponentManager.java b/src/main/java/ui/TGComponentManager.java index afba76dcd..4a624712e 100755 --- a/src/main/java/ui/TGComponentManager.java +++ b/src/main/java/ui/TGComponentManager.java @@ -877,9 +877,9 @@ public class TGComponentManager { case PERFORMANCE_PRAGMA: tgc = new AvatarBDPerformancePragma(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp); break; - // case AVATAR_FIREWALL: - // tgc = new AvatarBDFirewall(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp); - // break; + case AVATAR_FIREWALL: + tgc = new AvatarBDFirewall(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp); + break; case IOD_CHOICE: tgc = new IODChoice(x, y, tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY(), false, null, tdp); break; -- GitLab From 59ac9941d365d6317dcd722fd37bde693a91d14f Mon Sep 17 00:00:00 2001 From: Letitia Li Date: Fri, 2 Feb 2018 10:00:15 +0100 Subject: [PATCH 2/2] Fixed invisible elements on architecture diagram --- src/main/java/ui/GTMLModeling.java | 4 ++-- src/main/java/ui/GTURTLEModeling.java | 2 +- src/main/java/ui/tmldd/TMLArchiFirewallNode.java | 2 +- src/main/java/ui/tmldd/TMLArchiHWANode.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/ui/GTMLModeling.java b/src/main/java/ui/GTMLModeling.java index 496165968..b87e052a0 100755 --- a/src/main/java/ui/GTMLModeling.java +++ b/src/main/java/ui/GTMLModeling.java @@ -2833,8 +2833,8 @@ public class GTMLModeling { ce.setTGComponent(firewallnode); checkingErrors.add(ce); } else { - names.add("CPU__"+firewallnode.getName()); - bridge = new HwBridge("CPU__"+firewallnode.getName()); + names.add(firewallnode.getName()); + bridge = new HwBridge(firewallnode.getName()); bridge.isFirewall=true; bridge.firewallRules = ((TMLArchiFirewallNode) tgc).getRules(); bridge.latency = ((TMLArchiFirewallNode) tgc).getLatency(); diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java index 923ef4279..f611d2262 100755 --- a/src/main/java/ui/GTURTLEModeling.java +++ b/src/main/java/ui/GTURTLEModeling.java @@ -740,7 +740,7 @@ public class GTURTLEModeling { } public TMLMapping drawFirewall(TMLMapping map) { - System.out.println("DRAWING FIREWALL"); + // System.out.println("DRAWING FIREWALL"); TGComponent comp = map.getTMLModeling().getTGComponent(); TMLComponentDesignPanel tmlcdp = (TMLComponentDesignPanel) comp.getTDiagramPanel().tp; // TMLComponentDesignPanel tmlcdp = map.getTMLCDesignPanel(); diff --git a/src/main/java/ui/tmldd/TMLArchiFirewallNode.java b/src/main/java/ui/tmldd/TMLArchiFirewallNode.java index 01969f5aa..af33ff900 100644 --- a/src/main/java/ui/tmldd/TMLArchiFirewallNode.java +++ b/src/main/java/ui/tmldd/TMLArchiFirewallNode.java @@ -60,7 +60,7 @@ import java.util.ArrayList; * @version 1.0 17/10/2016 * @author Letitia LI */ -public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes { +public class TMLArchiFirewallNode extends TMLArchiCommunicationNode implements SwallowTGComponent, WithAttributes, TMLArchiSecurityInterface { private int textY1 = 15; private int textY2 = 30; private int derivationx = 2; diff --git a/src/main/java/ui/tmldd/TMLArchiHWANode.java b/src/main/java/ui/tmldd/TMLArchiHWANode.java index 5b37e8d8c..db4c42d69 100755 --- a/src/main/java/ui/tmldd/TMLArchiHWANode.java +++ b/src/main/java/ui/tmldd/TMLArchiHWANode.java @@ -61,7 +61,7 @@ import java.util.Vector; * @version 1.0 23/11/2007 * @author Ludovic APVRILLE */ -public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes { +public class TMLArchiHWANode extends TMLArchiNode implements SwallowTGComponent, WithAttributes, TMLArchiElementInterface { private int textY1 = 15; private int textY2 = 30; private int derivationx = 2; -- GitLab