Merge branch 'master' of git@gitlab.enst.fr:mbe-tools/TTool.git

src/main/java/proverifspec/ProVerifResultTrace.java

@@ -51,6 +51,7 @@ import java.io.BufferedWriter;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.Stack;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -289,8 +290,39 @@ public class ProVerifResultTrace {
         return str;
     }
 
+    private String removeBrackets(String str) {
+        Stack<Character> stack = new Stack<>();
+        StringBuilder builder = new StringBuilder();
+
+        for (char c: str.toCharArray()) {
+            if (c == '(' && !stack.empty()) {
+                stack.push(c);
+            } else if (c == '[') {
+                stack.push(c);
+            } else if (c == ')' && !stack.empty()) {
+                if (stack.peek() == '(')
+                    stack.pop();
+                else
+                    throw new IllegalArgumentException("Malformed expression: " + str);
+            } else if (c == ']') {
+                if (stack.empty())
+                    throw new IllegalArgumentException("Malformed expression: " + str);
+                else if (stack.peek() == '[')
+                    stack.pop();
+                else
+                    throw new IllegalArgumentException("Malformed expression: " + str);
+            }
+
+            if (stack.empty() && c != ']')
+                builder.append(c);
+        }
+
+        return builder.toString();
+    }
+
     private String replaceAllAttributeNames(AvatarDesignPanel adp, String str)
     {
+        str = this.removeBrackets(str);
         Matcher m = ProVerifResultTrace.attrPattern.matcher(str);
         String result = "";
 

src/main/java/ui/window/JFrameMinimize.java

@@ -152,7 +152,7 @@ public class JFrameMinimize extends javax.swing.JFrame implements ActionListener
         listIgnored.addListSelectionListener(this);
         JScrollPane scrollPane1 = new JScrollPane(listIgnored);
         panel1.add(scrollPane1, BorderLayout.CENTER);
-        panel1.setPreferredSize(new Dimension(400, 250));
+        panel1.setPreferredSize(new Dimension(300, 250));
         panelTop.add(panel1, BorderLayout.WEST);
         
         // validated list
@@ -165,7 +165,7 @@ public class JFrameMinimize extends javax.swing.JFrame implements ActionListener
         listProjected.addListSelectionListener(this);
         JScrollPane scrollPane2 = new JScrollPane(listProjected);
         panel2.add(scrollPane2, BorderLayout.CENTER);
-        panel2.setPreferredSize(new Dimension(400, 250));
+        panel2.setPreferredSize(new Dimension(300, 250));
         panelTop.add(panel2, BorderLayout.EAST);
         
         // radio buttons