Merge branch 'master' into 'alan_attack_tree_gen'

# Conflicts:
#   src/main/java/ui/atd/ATDAttack.java
#   src/main/java/ui/atd/AttackTreeDiagramPanel.java

build.txt

-14744
+14746
\ No newline at end of file

src/main/java/attacktrees/Attack.java

@@ -62,6 +62,7 @@ public class Attack extends AttackElement {
     private ArrayList<AttackNode> destinationNodes;
     private boolean isRoot;
     private boolean isEnabled = true;
+    private String description;
 
     private int attackCost;
     private int attackExperience;
@@ -81,6 +82,14 @@ public class Attack extends AttackElement {
         isRoot = _root;
     }
 
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String _description) {
+        description = _description;
+    }
+
     public boolean isEnabled() {
         return isEnabled;
     }

src/main/java/attacktrees/AttackNode.java

@@ -76,6 +76,9 @@ public abstract class AttackNode extends AttackElement {
     }
 
 
+    public String getType() {
+        return type;
+    }
     public void setResultingAttack(Attack _attack) {
         resultingAttack = _attack;
     }

src/main/java/ui/atd/ATDAttack.java

@@ -455,7 +455,10 @@ CanBeDisabled*/ {
         return isRootAttack;
     }
 
-    public void setIsRootAttack(boolean bool) { isRootAttack = bool; }
+    public void setRootAttack(boolean _isRootAttack) {
+        isRootAttack = _isRootAttack;
+    }
+
 
     public void wasUnswallowed() {
         setFather(null);

src/main/java/ui/atd/ATDConstraint.java

@@ -253,6 +253,18 @@ public class ATDConstraint extends TGCScalableWithInternalComponent implements S
         return (value.compareTo(STEREOTYPES[5]) == 0);
     }
 
+    public void setType(String _type) {
+        _type = _type.toUpperCase();
+
+        for(int i=STEREOTYPES.length-1; i>0; i--) {
+            if (STEREOTYPES[i].indexOf(_type) > - 1) {
+                value = STEREOTYPES[i];
+                break;
+            }
+        }
+        value = STEREOTYPES[0];
+    }
+
     protected String translateExtraParam() {
         StringBuffer sb = new StringBuffer("<extraparam>\n");
         sb.append("<info equation=\"" + GTURTLEModeling.transformString(getEquation()));

src/main/java/ui/atd/AttackTreeDiagramPanel.java

@@ -203,13 +203,8 @@ public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttr
         // We draw the attack
         ATDAttack attack = new ATDAttack(_x, _y, getMinX(), getMaxX(), getMinY(), getMaxY(), true, null, this);
         attack.setValue(_att.getName());
-        attack.setIsRootAttack(_att.isRoot());
-
-        String attackDesc = _att.getDescription();
-        if (!attackDesc.isEmpty()) {
-            attack.setDescription(attackDesc);
-        }
-
+        attack.setRootAttack(_att.isRoot());
+        attack.setDescription(_att.getDescription());
         addBuiltComponent(attack);
         _mapOfComponents.put(_att, attack);
 
@@ -253,11 +248,8 @@ public class AttackTreeDiagramPanel extends TDiagramPanel implements TDPWithAttr
         // We create the ATDConstraint
         _y = _y + 70;
         ATDConstraint constraint = new ATDConstraint(_x, _y, getMinX(), getMaxX(), getMinY(), getMaxY(), true, null, this);
-
-        String contraintType = "<<" + nextNode.getType() + ">>";
-        constraint.setValue(contraintType);
-
-
+        //constraint.setValue(nextNode.getName());
+        constraint.setType(nextNode.getType());
         addBuiltComponent(constraint);
         _mapOfComponents.put(nextNode, constraint);
 

src/main/java/ui/util/DefaultText.java

@@ -50,8 +50,8 @@ package ui.util;
  */
 public class DefaultText {
 
-    public static String BUILD = "14743";
-    public static String DATE = "2024/04/09 03:22:30 CET";
+    public static String BUILD = "14745";
+    public static String DATE = "2024/04/11 03:22:09 CET";
 
     public static StringBuffer sbAbout = makeAbout();
 

src/main/java/ui/window/JFrameAI.java

@@ -218,6 +218,7 @@ public class JFrameAI extends JFrame implements ActionListener {
         chatPanelAction.add(listOfPossibleActions);
         panelTop.add(chatPanelAction, BorderLayout.CENTER);
         listOfPossibleActions.addActionListener(this);
+        listOfPossibleActions.setMinimumSize(new Dimension(50, 100));
 
         JPanel modelSelectionPanel = new JPanel();
         modelSelectionPanel.add(new JLabel("Selected AI model:"));