Update messages, dialogs and labels

oshando · oshando · commit 1c9013bae402 · 2020-03-30T14:15:25.000+02:00
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/RunSwanAnalysisAction.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/RunSwanAnalysisAction.java
@@ -16,7 +16,7 @@
 import de.fraunhofer.iem.swan.assist.comm.SwanNotifier;
 import de.fraunhofer.iem.swan.assist.data.JSONFileLoader;
 import de.fraunhofer.iem.swan.assist.data.TrainingFileManager;
-import de.fraunhofer.iem.swan.assist.ui.dialog.PluginSettingsDialog;
+import de.fraunhofer.iem.swan.assist.ui.dialog.RunAnalysisDialog;
 import de.fraunhofer.iem.swan.assist.util.Constants;
 import de.fraunhofer.iem.swan.data.Method;
 
@@ -65,7 +65,7 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         }
 
         //Launch Dialog
-        PluginSettingsDialog dialog = new PluginSettingsDialog(project, true);
+        RunAnalysisDialog dialog = new RunAnalysisDialog(project, true);
         dialog.show();
 
         if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/DeleteMethodAction.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/DeleteMethodAction.java
@@ -36,7 +36,6 @@ public class DeleteMethodAction extends AnAction {
      * Initializes the action
      */
     public DeleteMethodAction() {
-        super("Delete");
         deleteMethod = null;
     }
 
@@ -45,7 +44,7 @@ public DeleteMethodAction() {
      * @param method that will be deleted
      */
     public DeleteMethodAction(MethodWrapper method) {
-        super("Delete");
+        super("Delete Classification");
         deleteMethod = method;
     }
 
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/MethodPropertiesAction.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/MethodPropertiesAction.java
@@ -39,7 +39,7 @@ public MethodPropertiesAction() {
      * @param method The properties of this method will be loaded.
      */
     public MethodPropertiesAction(MethodWrapper method) {
-        super("Properties");
+        super("Classification Properties");
         this.method = method;
     }
 
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/RestoreMethodAction.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/RestoreMethodAction.java
@@ -34,14 +34,16 @@ public class RestoreMethodAction extends AnAction {
      * Initializes action
      */
     public RestoreMethodAction() {
+
     }
 
     /**
      * Initializes action using method.
      * @param method Method that will be restored.
      */
     public RestoreMethodAction(MethodWrapper method) {
-        super("Restore");
+
+        super("Restore Classification");
         this.method = method;
     }
 
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/UpdateMethodAction.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/method/UpdateMethodAction.java
@@ -30,7 +30,7 @@ public class UpdateMethodAction extends AnAction {
      * @param method Method that should be updated or added.
      */
     public UpdateMethodAction(MethodWrapper method) {
-        super("Update");
+        super("Re-Classify Method");
         this.method = method;
     }
 
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONFileLoader.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/JSONFileLoader.java
@@ -24,7 +24,7 @@
  */
 public class JSONFileLoader {
 
-    static private HashMap<String, MethodWrapper> methods;
+    static private HashMap<String, MethodWrapper> methods= new HashMap<>();
     static private String congFile = "";
     static public final int NEW_METHOD = 0;
     static public final int EXISTING_METHOD = 1;
@@ -149,11 +149,16 @@ public static ArrayList<MethodWrapper> getMethods(ArrayList<Pair<String, String>
         }
     }
 
-    public static HashMap<String, ArrayList<MethodWrapper>> getMethodsForTree(ArrayList<Pair<String, String>> filters, String currentFile, Project project) {
+    public static TreeMap<String, ArrayList<MethodWrapper>> getMethodsForTree(ArrayList<Pair<String, String>> filters, String currentFile, Project project) {
 
         ArrayList<MethodWrapper> methods = getMethods(filters, currentFile, project);
 
-        HashMap<String, ArrayList<MethodWrapper>> methodMap = new HashMap();
+        TreeMap<String, ArrayList<MethodWrapper>> methodMap = new TreeMap<>(new Comparator<String>() {
+            @Override
+            public int compare(String class1, String class2) {
+                return Formatter.trimProperty(class1).toLowerCase().compareTo(Formatter.trimProperty(class2).toLowerCase());
+            }
+        });
 
         for (MethodWrapper method : methods) {
 
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/MethodWrapper.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/MethodWrapper.java
@@ -11,6 +11,8 @@
 import de.fraunhofer.iem.swan.data.Category;
 import org.apache.commons.lang3.StringUtils;
 import de.fraunhofer.iem.swan.data.Method;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.*;
 
 /**
@@ -255,7 +257,14 @@ public void setUpdateOperation(String updateOperation) {
      * @return Message for editor marker
      */
     public String getMarkerMessage() {
-        return "This is a potential " + StringUtils.join(getTypesList(true), ", ") + " method of sensitive information relevant for " + StringUtils.join(getCWEList(), ", ");
+
+        String message = "<html><i>Potential</i> <b>" + StringUtils.join(getTypesList(true), ", ") + "</b> method";
+
+        if(getCWEList().size()>0)
+        message += " of sensitive information relevant for <b>" + StringUtils.join(getCWEList(), ", ")+"</b";
+
+        message+=".</html>";
+        return message;
     }
 
     /**
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/PropertiesManager.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/PropertiesManager.java
@@ -10,7 +10,7 @@
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import de.fraunhofer.iem.swan.assist.ui.dialog.PluginSettingsDialog;
+import de.fraunhofer.iem.swan.assist.ui.dialog.RunAnalysisDialog;
 
 import java.io.File;
 import java.util.HashMap;
@@ -45,7 +45,7 @@ public static String setProjectOutputPath(Project project){
     private static void showSettingsDialog(Project project) {
 
         //Launch SWAN Properties Dialog
-        PluginSettingsDialog dialog = new PluginSettingsDialog(project, true);
+        RunAnalysisDialog dialog = new RunAnalysisDialog(project, true);
         dialog.show();
 
         if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/CategoryRenderer.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/CategoryRenderer.java
@@ -24,19 +24,23 @@ public class CategoryRenderer extends JLabel implements ListCellRenderer<Categor
     @Override
     public Component getListCellRendererComponent(JList<? extends Category> list, Category category, int index, boolean isSelected, boolean cellHasFocus) {
 
+        String HIGHLIGHT_COLOR = "gray";
+
         if (isSelected) {
             setBackground(new JBColor(new Color(9, 80, 208), new Color(9, 80, 208)));
             setForeground(JBColor.white);
+            HIGHLIGHT_COLOR = "white";
         } else {
             setBackground(JBColor.WHITE);
             setForeground(JBColor.BLACK);
         }
 
+
         if (category.isCwe()) {
 
             ResourceBundle resourceBundle = ResourceBundle.getBundle("dialog_messages");
 
-            setText("<html>" + Formatter.toTitleCase(category.toString()) + " <font color='gray'>" + resourceBundle.getString(category.toString() + ".Name") + "</font></html>");
+            setText("<html>" + Formatter.toTitleCase(category.toString()) + " <font color='" + HIGHLIGHT_COLOR + "'>" + resourceBundle.getString(category.toString() + ".Name") + "</font></html>");
             setToolTipText("<html>" + "<b>" + Formatter.toTitleCase(category.toString()) + "</b> " + resourceBundle.getString(category.toString() + ".FullName") + "</html>");
         } else {
             setText(Formatter.toTitleCase(category.toString()));
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodListTree.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodListTree.java
@@ -55,6 +55,7 @@
 import javax.swing.tree.TreePath;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.text.DecimalFormat;
 import java.util.*;
 
 /**
@@ -138,7 +139,6 @@ public void mouseClicked(MouseEvent e) {
                             if (methodSignature.contains("<init>"))
                                 methodSignature = Formatter.trimProperty(method.getClassName(false));
 
-
                             boolean methodFound = false;
 
                             for (PsiFile file : files) {
@@ -184,9 +184,9 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
 
                         ApplicationManager.getApplication().runReadAction(new Runnable() {
                             public void run() {
+
                                 JSONFileLoader.setConfigurationFile(fileName, project);
                                 JSONFileLoader.loadInitialFile();
-
                             }
                         });
                     }
@@ -210,7 +210,6 @@ public void run(@NotNull ProgressIndicator progressIndicator) {
                         ApplicationManager.getApplication().runReadAction(new Runnable() {
                             public void run() {
                                 JSONFileLoader.loadUpdatedFile(fileName, project);
-                                loadMethods();
                             }
                         });
                     }
@@ -509,11 +508,14 @@ private void loadMethods() {
 
         if (methods.size() > 0) {
 
-            DefaultMutableTreeNode root = new DefaultMutableTreeNode("<html><b>Methods</b> <font color='gray'>[<i>" + JSONFileLoader.getConfigurationFile(false) + "</i>]</font></html>");
+            DefaultMutableTreeNode root = new DefaultMutableTreeNode("<html><b>Classified Methods</b> <font color='gray'>[<i>" + JSONFileLoader.getConfigurationFile(false) + "</i>]</font></html>");
 
+            int methodCount = 0;
+            int totalMethods = 0;
             for (String classname : methods.keySet()) {
 
-                DefaultMutableTreeNode classNode = new DefaultMutableTreeNode(new Pair<>(classname, methods.get(classname).size()));
+                methodCount = methods.get(classname).size();
+                totalMethods += methodCount;
 
                 for (MethodWrapper method : methods.get(classname)) {
 
@@ -522,6 +524,11 @@ private void loadMethods() {
                 }
             }
 
+            String pattern = "###,###";
+            DecimalFormat decimalFormat = new DecimalFormat(pattern);
+
+            root.setUserObject("<html><b>Classified Methods</b> <font color='gray'>(" + decimalFormat.format(totalMethods) + " in "+ decimalFormat.format(methods.size())+" classes)</font></html>");
+
             treeModel.setRoot(root);
             TREE_EXPANDED = false;
         } else {
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodTreeRenderer.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/MethodTreeRenderer.java
@@ -34,9 +34,11 @@ public class MethodTreeRenderer extends JLabel implements TreeCellRenderer {
     @Override
     public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
 
-        if (selected)
+        String HIGHLIGHT_COLOR = "gray";
+        if (selected){
             text.setForeground(JBColor.WHITE);
-        else
+             HIGHLIGHT_COLOR = "white";
+        } else
             text.setForeground(JBColor.BLACK);
 
         if (value instanceof DefaultMutableTreeNode) {
@@ -51,16 +53,19 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 if(methodName.contains("<init>"))
                     methodName = Formatter.trimProperty(method.getClassName(false));
 
-
-                text.setText("<html><font color='gray'>" + Formatter.trimProperty(method.getReturnType(false)) + "</font> <b>" + methodName + "</b> ( )</html>");
+                text.setText("<html><font color='" + HIGHLIGHT_COLOR + "'>" + Formatter.trimProperty(method.getReturnType(false)) + "</font> <b>" + methodName + "</b> ( )</html>");
                 text.setIcon(IconUtils.getNodeIcon(method.getTypesList(false)));
 
                 if (method.getUpdateOperation() != null && method.getUpdateOperation().equals(Constants.METHOD_ADDED) && !selected)
                     text.setForeground(new JBColor(new Color(1, 128, 0), new Color(1, 128, 0)));
                 else if (method.getUpdateOperation() != null && method.getUpdateOperation().equals(Constants.METHOD_DELETED) && !selected)
                     text.setForeground(new JBColor(new Color(178, 34, 34), new Color(178, 34, 34)));
 
-                text.setToolTipText(StringUtils.join(method.getTypesList(true), ", ")+": "+ method.getSignature(true));
+                String cweList =": ";
+                if(method.getCWEList().size()>0)
+                    cweList = " relevant for <b>"+StringUtils.join(method.getCWEList(), ", ")+"</b>: ";
+
+                text.setToolTipText("<html><i>Potential</i> <b>"+StringUtils.join(method.getTypesList(true), ", ")+"</b>"+cweList+ method.getSignature(true)+"</html>");
 
             } else if (object instanceof Category) {
 
@@ -71,7 +76,7 @@ else if (method.getUpdateOperation() != null && method.getUpdateOperation().equa
                 if (category.isCwe()) {
 
                     ResourceBundle resourceBundle = ResourceBundle.getBundle("dialog_messages");
-                    text.setText("<html>" + category.toString() + " <font color='gray'>" + resourceBundle.getString(category.toString() + ".Name") + "</font></html>");
+                    text.setText("<html>" + category.toString() + " <font color='" + HIGHLIGHT_COLOR + "'>" + resourceBundle.getString(category.toString() + ".Name") + "</font></html>");
                     text.setToolTipText("<html>" + "<b>" + category.toString() + "</b> " + resourceBundle.getString(category.toString() + ".FullName") + "</html>");
                 } else
                     text.setText(category.toString());
@@ -80,12 +85,12 @@ else if (method.getUpdateOperation() != null && method.getUpdateOperation().equa
                 Pair classPair = (Pair)object;
                 String classname = classPair.getKey().toString();
 
-                text.setToolTipText("Class Name: "+classname);
-                text.setText("<html>" + classname.substring(classname.lastIndexOf(".") + 1) + "  <font color='gray'>(" + classPair.getValue() +")</font></html>");
+                text.setToolTipText("<html>" +classPair.getValue()+ " methods in <b>"+classname+"</b></html>");
+                text.setText("<html>" + classname.substring(classname.lastIndexOf(".") + 1) + "  <font color='" + HIGHLIGHT_COLOR + "'>(" + classPair.getValue() +")</font></html>");
                 text.setIcon(PluginIcons.CLASS);
             }else {
 
-                text.setText(value.toString());
+                text.setText(value.toString().replace("color='gray'","color='"+ HIGHLIGHT_COLOR +"'"));
                 text.setIcon(null);
                 text.setToolTipText(null);
             }
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/SummaryToolWindow.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/SummaryToolWindow.java
@@ -61,6 +61,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
                 MessageBus messageBus = project.getMessageBus();
                 ConfigurationFileNotifier publisher = messageBus.syncPublisher(ConfigurationFileNotifier.FILE_NOTIFIER_TOPIC);
                 publisher.loadInitialFile(PropertiesComponent.getInstance(project).getValue(Constants.CONFIGURATION_FILE));
+
+                actionToolbar.updateActionsImmediately();
             }
         }
 
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/RunAnalysisDialog.form b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/RunAnalysisDialog.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.fraunhofer.iem.swan.assist.ui.dialog.PluginSettingsDialog">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.fraunhofer.iem.swan.assist.ui.dialog.RunAnalysisDialog">
   <grid id="cbd77" binding="contentPane" layout-manager="GridLayoutManager" row-count="7" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>
diff --git a/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/RunAnalysisDialog.java b/swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/RunAnalysisDialog.java
@@ -32,7 +32,7 @@
  * Dialog to launch configuration window for SWAN before running the application.
  */
 
-public class PluginSettingsDialog extends DialogWrapper {
+public class RunAnalysisDialog extends DialogWrapper {
 
     private JPanel contentPane;
     private JButton buttonOK;
@@ -60,7 +60,7 @@ public class PluginSettingsDialog extends DialogWrapper {
      * @param project Active project in the editor
      * @param modal   Modal setting for dialog
      */
-    public PluginSettingsDialog(Project project, boolean modal) {
+    public RunAnalysisDialog(Project project, boolean modal) {
 
         super(project, modal);
         this.project = project;
diff --git a/swan_assist/src/main/resources/META-INF/plugin.xml b/swan_assist/src/main/resources/META-INF/plugin.xml
diff --git a/swan_assist/src/main/resources/dialog_messages.properties b/swan_assist/src/main/resources/dialog_messages.properties

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ public class DeleteMethodAction extends AnAction {`
`36`	`36`	`* Initializes the action`
`37`	`37`	`*/`
`38`	`38`	`public DeleteMethodAction() {`
`39`		`- super("Delete");`
`40`	`39`	`deleteMethod = null;`
`41`	`40`	`}`
`42`	`41`
`@@ -45,7 +44,7 @@ public DeleteMethodAction() {`
`45`	`44`	`* @param method that will be deleted`
`46`	`45`	`*/`
`47`	`46`	`public DeleteMethodAction(MethodWrapper method) {`
`48`		`- super("Delete");`
	`47`	`+ super("Delete Classification");`
`49`	`48`	`deleteMethod = method;`
`50`	`49`	`}`
`51`	`50`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public MethodPropertiesAction() {`
`39`	`39`	`* @param method The properties of this method will be loaded.`
`40`	`40`	`*/`
`41`	`41`	`public MethodPropertiesAction(MethodWrapper method) {`
`42`		`- super("Properties");`
	`42`	`+ super("Classification Properties");`
`43`	`43`	`this.method = method;`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class UpdateMethodAction extends AnAction {`
`30`	`30`	`* @param method Method that should be updated or added.`
`31`	`31`	`*/`
`32`	`32`	`public UpdateMethodAction(MethodWrapper method) {`
`33`		`- super("Update");`
	`33`	`+ super("Re-Classify Method");`
`34`	`34`	`this.method = method;`
`35`	`35`	`}`
`36`	`36`