From edaf56c6ea5a24a09ebfe3352bd9335940a7649f Mon Sep 17 00:00:00 2001
From: jerray <jawher.jerray@eurecom.fr>
Date: Mon, 5 Jun 2023 16:47:59 +0200
Subject: [PATCH] Add Panel name when mapping a key
---
src/main/java/ui/MainGUI.java | 16 ++++++++++++++++
src/main/java/ui/window/JDialogArchiKey.java | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index 64dff6d38c..8a02671fb7 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -4727,6 +4727,20 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
return list;
}
+ public ArrayList<String> getAllKeysWithPanelName() {
+ TURTLEPanel tp;
+ ArrayList<String> list = new ArrayList<String>();
+ for (int i = 0; i < tabs.size(); i++) {
+ tp = tabs.elementAt(i);
+ if (tp instanceof TMLComponentDesignPanel) {
+ for (String s : ((TMLComponentDesignPanel) tp).getAllKeys()) {
+ list.add(tp.getNameOfTab()+"::"+s);
+ }
+ }
+ }
+ return list;
+ }
+
public ArrayList<TGComponent> getAllAttacks() {
TURTLEPanel tp;
ArrayList<TGComponent> list = new ArrayList<TGComponent>();
@@ -4834,6 +4848,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
gtm.getTMLMapping().getTMLModeling().clearBacktracing();
gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, getTabName(tp));
gtm.getTML2Avatar().backtraceReachability(pvoa.getReachabilityResults());
+ gtm.getTML2Avatar().backtraceAuthenticityADReadChannels(pvoa, getTabName(tp));
gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa, getTabName(tp));
}
@@ -4843,6 +4858,7 @@ public class MainGUI implements ActionListener, WindowListener, KeyListener, Per
gtm.getTMLMapping().getTMLModeling().clearBacktracing();
gtm.getTMLMapping().getTMLModeling().backtrace(pvoa, "Default Mapping");
gtm.getTML2Avatar().backtraceReachability(pvoa.getReachabilityResults());
+ gtm.getTML2Avatar().backtraceAuthenticityADReadChannels(pvoa, "Default Mapping");
gtm.getTMLMapping().getTMLModeling().backtraceAuthenticity(pvoa, "Default Mapping");
}
}
diff --git a/src/main/java/ui/window/JDialogArchiKey.java b/src/main/java/ui/window/JDialogArchiKey.java
index 80f6185c3d..d8706d7570 100644
--- a/src/main/java/ui/window/JDialogArchiKey.java
+++ b/src/main/java/ui/window/JDialogArchiKey.java
@@ -125,7 +125,7 @@ public class JDialogArchiKey extends JDialogBase implements ActionListener {
panel2.add(new JLabel("Key:"), c2);
c1.gridwidth = GridBagConstraints.REMAINDER; //end row
TraceManager.addDev("Getting key");
- ArrayList<String> list = artifact.getTDiagramPanel().getMGUI().getAllKeys();
+ ArrayList<String> list = artifact.getTDiagramPanel().getMGUI().getAllKeysWithPanelName();
int index = 0;
/* if (list.size() == 0) {
emptyList = true;
--
GitLab