Update tool window toolbar order and titles

oshando · oshando · commit 82f5985cc0cf · 2023-12-04T15:25:59.000+01:00
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
@@ -55,7 +55,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 if (methodName.contains("<init>"))
                     methodName = Formatter.trimProperty(method.getClassName(false));
 
-                text.setText("<html><font color='" + HIGHLIGHT_COLOR + "'>" + Formatter.trimProperty(method.getReturnType(false)) + "</font> <b>"+ methodName + "</b>( ) <font color='" +CWE_COLOR + "'>"+StringUtils.join(method.getCWEList(),", ").replaceAll("CWE","")+"</font></html>");
+                text.setText("<html><font color='" + HIGHLIGHT_COLOR + "'>" + Formatter.trimProperty(method.getReturnType(false)) + "</font> <b>"+ methodName + "</b>( ) <font color='" +CWE_COLOR + "'>"+StringUtils.join(method.getCWEList(),", ")+"</font></html>");
                 text.setIcon(IconUtils.getNodeIcon(method.getTypesList(false)));
 
                 if (method.getUpdateOperation() != null && method.getUpdateOperation().equals(Constants.METHOD_ADDED) && !selected)
diff --git a/swan-assist/src/main/resources/META-INF/plugin.xml b/swan-assist/src/main/resources/META-INF/plugin.xml
@@ -33,11 +33,22 @@
                     text="Run Analysis">
             </action>
 
+            <action id="SWAN_Assist.ImportAction" class="de.fraunhofer.iem.swan.assist.actions.ImportAction"
+                    text="Import File"
                     icon="AllIcons.ToolbarDecorator.Import"
+                    description="Import configuration file">
+            </action>
+
+            <action id="SWAN_Assist.ExportAction"
+                    class="de.fraunhofer.iem.swan.assist.actions.ExportAction"
                     icon="AllIcons.ToolbarDecorator.Export"
+                    text="Export File"
+                    description="Export configuration file">
+            </action>
+
             <!--action id="SuggestAction" class="de.fraunhofer.iem.swan.assist.actions.suggest.SuggestAction" text="Suggest Methods"
                     description="Classify suggested methods" icon="PluginIcons.SUGGEST_ACTION"/-->
-            <separator/>
+
             <group id="SWAN_Assist.FilterActionGroup" class="de.fraunhofer.iem.swan.assist.actions.filter.FilterActionGroup"
                    text="Filter Methods"
                    popup="true" icon="AllIcons.General.Filter">
@@ -82,29 +93,23 @@
         <group id="EditorGroup" text="SWAN-Assist" popup="true" icon="PluginIcons.SWAN_ASSIST">
             <add-to-group group-id="EditorPopupMenu" />
             <action id="SWAN_Assist.Editor.LaunchSWANAction"
-                    class="de.fraunhofer.iem.swan.assist.actions.RunSwanAnalysisAction"
+                    class="de.fraunhofer.iem.swan.assist.actions.RunSwanAction"
                     icon="AllIcons.Toolwindows.ToolWindowRun"
                     text="Run Analysis">
             </action>
 
             <separator/>
 
             <action id="SWAN_Assist.AddMethodAction" class="de.fraunhofer.iem.swan.assist.actions.method.AddMethodAction"
-                    text="Classify/Re-Classify Method" icon="AllIcons.General.Add">
-            </action>
-
-            <action id="SWAN_Assist.RestoreMethodAction" class="de.fraunhofer.iem.swan.assist.actions.method.RestoreMethodAction"
-                    text="Restore Method" >
+                    text="Add/Edit Method" icon="AllIcons.General.Add">
             </action>
 
             <action id="SWAN_Assist.DeleteMethodAction" class="de.fraunhofer.iem.swan.assist.actions.method.DeleteMethodAction"
-                    text="Delete Classification">
-            </action>
-
-            <action id="SWAN_Assist.MethodPropertiesAction" class="de.fraunhofer.iem.swan.assist.actions.method.MethodPropertiesAction"
-                    text="Classification Properties" >
+                    icon="AllIcons.General.Reset"
+                    text="Reset">
             </action>
 
+            <separator/>
             <action id="SWAN_Assist.MethodListAction" class="de.fraunhofer.iem.swan.assist.actions.method.MethodListAction"
                     text="View Tool Window">
             </action>
diff --git a/swan-assist/src/main/resources/dialog_messages.properties b/swan-assist/src/main/resources/dialog_messages.properties
@@ -4,7 +4,7 @@ Restore.Description
 
 #Dialog for method categories
 MethodDialog.Method= Method
-MethodDialog.UpdateTitle= Update Method
+MethodDialog.UpdateTitle= Edit
 MethodDialog.AddTitle= Add Method
 MethodDialog.SuggestTitle= Suggested Methods
 MethodDialog.Signature= Method
@@ -14,6 +14,9 @@ MethodDialog.Category = Category
 MethodDialog.AvailableCategory =  Available Categories
 MethodDialog.SelectedCategory = Selected Categories
 
+MethodDialog.Category.SRM = Security Relevant Methods (SRM)
+MethodDialog.Category.CWE = Common Weakness Enumeration (CWE)
+
 #Dialog for running SWAN
 SettingsDialog.Title=Plugin Settings
 SettingsDialog.ProjectCheckBox = General Options
@@ -67,7 +70,7 @@ Messages.Error.MethodNotInEditor = Method not found in project or cannot be loca
 Messages.Error.PageNotFound = Page Not Found
 
 #Confirmation messages
-Messages.Title.DeleteMethod = Delete Method
+Messages.Title.DeleteMethod = Remove
 Messages.Confirmation.DeleteMethod = Are you sure you want to delete this method?
 
 Messages.Title.RestoreMethod = Restore Method
