Update plugin configuration and messages

Author: oshando

swan_assist/build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'org.jetbrains.intellij' version '0.4.8'
     id 'java'
+    id 'org.jetbrains.intellij' version '0.4.15'
 }
 
 group 'de.fraunhofer'
-version '1.1'
+version '1.3'
 
 sourceCompatibility = 1.8
 
@@ -15,10 +15,11 @@ repositories {
 
 dependencies {
     compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1'
-    compile group:'de.upb.cs.swt', name: 'swan_core', version: '1.4.0'
+    compile group:'de.upb.cs.swt', name: 'swan_core', version: '1.5.0'
     compile group: 'ca.mcgill.sable', name: 'soot', version: '3.3.0'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.5'
-    compile group: 'org.slf4j', name: 'slf4j-simple', version : '1.7.5'
+    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.29'
+    compile group: 'org.slf4j', name:'slf4j-simple', version: '1.7.29'
+    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.0'
 }
 
 intellij {
@@ -30,4 +31,8 @@ patchPluginXml {
             "<br>- suggest methods" +
             "<br>- filter list" +
             "<br>- import and export configuration file"
+}
+
+runIde {
+    jvmArgs '-Xmx1024m'
 }

swan_assist/src/main/resources/META-INF/plugin.xml

@@ -1,9 +1,9 @@
 <idea-plugin>
     <id>de.fraunhofer.iem.swan_assist</id>
-    <name>SWAN_Assist</name>
+    <name>SWAN-Assist</name>
     <vendor email="support@iem.fraunhofer.de" url="https://www.iem.fraunhofer.de/">Fraunhofer IEM</vendor>
 
-    <description> SWAN_Assist provides a GUI support for SWAN -a machine-learning approach for detection of
+    <description>SWAN-Assist provides a GUI support for SWAN -a machine-learning approach for detection of
         methods of interest for security in Java libraries. The user is able to interact with the learning
         process by giving feedback on the methods of interest. The tool helps users that write static analyses
         to create list of security methods for weakness detection for their specific Java libraries.
@@ -22,9 +22,7 @@
     <extensions defaultExtensionNs="com.intellij">
         <codeInsight.lineMarkerProvider language="JAVA"
                                         implementationClass="de.fraunhofer.iem.swan.assist.ui.markers.ErrorLineMarker"/>
-        <toolWindow id="SWAN_Assist" anchor="right" factoryClass="de.fraunhofer.iem.swan.assist.ui.SummaryToolWindow" icon="PluginIcons.SWAN_ASSIST"/>
-        <applicationService serviceInterface="de.fraunhofer.iem.swan.assist.ui.LoggerService"
-                            serviceImplementation="de.fraunhofer.iem.swan.assist.ui.impl.LoggerServiceImpl"/>
+        <toolWindow id="SWAN-Assist" anchor="right" factoryClass="de.fraunhofer.iem.swan.assist.ui.SummaryToolWindow" icon="PluginIcons.SWAN_ASSIST"/>
     </extensions>
 
     <actions>
@@ -56,9 +54,9 @@
             <separator/>
 
             <action id="SWAN_Assist.LaunchSWANAction"
-                    class="de.fraunhofer.iem.swan.assist.actions.LaunchSwanAction"
+                    class="de.fraunhofer.iem.swan.assist.actions.RunSwanAnalysisAction"
                     icon="PluginIcons.REFRESH_SWAN"
-                    text="Load or Reload SWAN">
+                    text="Run Analysis">
             </action>
 
             <action id="SuggestAction" class="de.fraunhofer.iem.swan.assist.actions.suggest.SuggestAction" text="Suggest Methods"
@@ -112,9 +110,9 @@
             </action>
             <separator/>
             <action id="SWAN_Assist.Editor.LaunchSWANAction"
-                    class="de.fraunhofer.iem.swan.assist.actions.LaunchSwanAction"
+                    class="de.fraunhofer.iem.swan.assist.actions.RunSwanAnalysisAction"
                     icon="PluginIcons.REFRESH_SWAN"
-                    text="Run/Rerun SWAN">
+                    text="Run Analysis">
             </action>
 
             <separator/>
@@ -123,7 +121,6 @@
                     class="de.fraunhofer.iem.swan.assist.actions.HelpAction"
                     text="Help" description="Resources" icon="PluginIcons.HELP_ACTION">
             </action>
-
         </group>
     </actions>
 

swan_assist/src/main/resources/dialog_messages.properties

@@ -17,15 +17,16 @@ Launcher.Project = Project JAR(s)
 Launcher.AdvancedOptionsCheckBox = Advanced Options
 Launcher.Output = Output Path
 Launcher.TrainingJars = Training JARs
-Launcher.DefaultPath = Use training JARs from diretory
+Launcher.DefaultPath = Use training JARs from directory
+Launcher.Checkbox.ConfigurationFile= Use project configuration file
+Launcher.ConfigurationFile= Configuration File
 
 #Notifications when running SWAN
-Messages.Title.RefreshStarted = Reloading SWAN
-Messages.Notification.RefreshStarted = SWAN refresh started
-Messages.Notification.Title.Completed = SWAN Rerun Completed
-Messages.Notification.Completed = SWAN execution completed
+Messages.Notification.Title.Completed = SWAN-Assist Analysis
+Messages.Notification.Completed = Analysis completed
 Messages.Notification.EmptyTree = Select a configuration file using the \"Import\" button
 Messages.Notification.NoFilterResults = No methods match the filters you've selected
+Messages.Title.Progress = Running SWAN-Assist Analysis
 
 Status.ImportFile = Loading Configuration File
 
@@ -35,7 +36,7 @@ Messages.Notification.SuggestStarted = Process to suggest methods started
 Messages.Title.Suggest.Completed = Methods Suggested
 Messages.Notification.Suggest.Completed = <a href='methods'>View methods</a> that were suggested
 Messages.Notification.Suggest.Link = methods
-Messages.Title.Suggest.NewTrainingFile = New SWAN Training File Created
+Messages.Title.Suggest.NewTrainingFile = New SWAN-Assist Training File Created
 
 #FileChooser
 FileChooser.FileDescription = JSON files