From d047984df2ec419f02c084c12c46581192547b8a Mon Sep 17 00:00:00 2001 From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr> Date: Mon, 13 Apr 2015 14:53:31 +0000 Subject: [PATCH] Update on syntax checking attack trees --- src/ui/AttackTreePanelTranslator.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ui/AttackTreePanelTranslator.java b/src/ui/AttackTreePanelTranslator.java index 7d271cea6d..e23c02aa56 100644 --- a/src/ui/AttackTreePanelTranslator.java +++ b/src/ui/AttackTreePanelTranslator.java @@ -289,7 +289,9 @@ public class AttackTreePanelTranslator { // Make block for attacks makeAttackBlocks(as, mainBlock); - // Make relations for attacks + + // Make blocks for nodes + makeAttackNodeBlocks(as, mainBlock); @@ -307,9 +309,9 @@ public class AttackTreePanelTranslator { ab.addSignal(sigAttack); avatartranslator.AvatarSignal stopAttack = new avatartranslator.AvatarSignal("acceptStopAttack__" + attack.getName() + attackID, AvatarSignal.IN, listE.getTG(attack)); ab.addSignal(stopAttack); - avatartranslator.AvatarSignal sigAttackMain = new avatartranslator.AvatarSignal("make__" + attack.getName() + attackID, AvatarSignal.IN, listE.getTG(attack)); + avatartranslator.AvatarSignal sigAttackMain = new avatartranslator.AvatarSignal("make__" + attack.getName() + attackID, AvatarSignal.OUT, listE.getTG(attack)); _main.addSignal(sigAttackMain); - avatartranslator.AvatarSignal stopAttackMain = new avatartranslator.AvatarSignal("stopAttack__" + attack.getName() + attackID, AvatarSignal.IN, listE.getTG(attack)); + avatartranslator.AvatarSignal stopAttackMain = new avatartranslator.AvatarSignal("stopAttack__" + attack.getName() + attackID, AvatarSignal.OUT, listE.getTG(attack)); _main.addSignal(stopAttackMain); makeAttackBlockSMD(ab, sigAttack, stopAttack, listE.getTG(attack)); @@ -319,6 +321,8 @@ public class AttackTreePanelTranslator { ar.setAsynchronous(false); ar.setPrivate(true); ar.setBroadcast(false); + ar.addSignals(sigAttackMain, sigAttack); + ar.addSignals(stopAttackMain, stopAttack); _as.addRelation(ar); attackID ++; @@ -371,6 +375,9 @@ public class AttackTreePanelTranslator { } + private void makeAttackNodeBlocks(AvatarSpecification _as, AvatarBlock _main) { + } + -- GitLab