Merge pull request #9 from secure-software-engineering/feature/suggest-methods

Release 1.3.0

Author: oshando

swan_assist/build.gradle

@@ -10,21 +10,22 @@ sourceCompatibility = 1.8
 
 repositories {
     mavenCentral()
-    mavenLocal()
 }
 
 dependencies {
     compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1'
-    compile group:'de.upb.cs.swt', name: 'swan_core', version: '1.2.1'
+    compile group:'de.upb.cs.swt', name: 'swan_core', version: '1.3.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-simple', version : '1.7.5'
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
 intellij {
     version '2018.3.6'
+    intellij.updateSinceUntilBuild false
 }
+
 patchPluginXml {
     changeNotes """
       Add change notes here.<br>

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/PluginSettingsDialog.form

@@ -49,17 +49,6 @@
               <text value="..."/>
             </properties>
           </component>
-          <component id="b3a63" class="javax.swing.JLabel" binding="sourceCheckBox">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <horizontalAlignment value="2"/>
-              <horizontalTextPosition value="11"/>
-              <text resource-bundle="dialog_messages" key="Launcher.ProjectCheckBox"/>
-              <toolTipText value="Set path for project jars and output path for SWAN files"/>
-            </properties>
-          </component>
           <component id="f8ebf" class="javax.swing.JSeparator">
             <constraints>
               <grid row="0" column="3" row-span="1" col-span="2" vsize-policy="6" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
@@ -99,9 +88,18 @@
               <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
+              <selected value="false"/>
               <text resource-bundle="dialog_messages" key="Launcher.DefaultPath"/>
             </properties>
           </component>
+          <component id="998b" class="javax.swing.JLabel">
+            <constraints>
+              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties>
+              <text resource-bundle="dialog_messages" key="Launcher.ProjectCheckBox"/>
+            </properties>
+          </component>
         </children>
       </grid>
       <grid id="1ffb" binding="trainingPanel" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/ui/dialog/PluginSettingsDialog.java

@@ -96,13 +96,10 @@ public PluginSettingsDialog(Project project, boolean modal) {
             outputDir.setText(PropertiesComponent.getInstance(project).getValue(Constants.OUTPUT_DIRECTORY));
 
         //Set value for using training path
-        if (PropertiesComponent.getInstance(project).isValueSet(Constants.DEFAULT_TRAINING_PATH)) {
-
-            trainingPathCheckbox.setSelected(PropertiesComponent.getInstance(project).getBoolean(Constants.DEFAULT_TRAINING_PATH));
-        }
+        trainingPathCheckbox.setSelected(PropertiesComponent.getInstance(project).getBoolean(Constants.DEFAULT_TRAINING_PATH, false ));
 
         for (Component component : trainingPanel.getComponents()) {
-            component.setEnabled(!trainingPathCheckbox.isSelected());
+            component.setEnabled(trainingPathCheckbox.isSelected());
         }
 
         if(PropertiesComponent.getInstance(project).isValueSet(Constants.TRAIN_DIRECTORY)){
@@ -123,7 +120,7 @@ public void actionPerformed(ActionEvent e) {
                 PropertiesComponent.getInstance(project).setValue(Constants.DEFAULT_TRAINING_PATH, trainingPathCheckbox.isSelected());
 
                 for (Component component : trainingPanel.getComponents()) {
-                    component.setEnabled(!trainingPathCheckbox.isSelected());
+                    component.setEnabled(trainingPathCheckbox.isSelected());
                 }
             }
         });
@@ -165,13 +162,13 @@ protected void doOKAction() {
                         .createHtmlTextBalloonBuilder(resourceBundle.getString("Messages.Error.PathNotFound"), MessageType.ERROR, null)
                         .createBalloon()
                         .show(JBPopupFactory.getInstance().guessBestPopupLocation(sourceDirTextbox), Balloon.Position.below);
-            } else if (!trainingPathCheckbox.isSelected() && trainingTextbox.getText().isEmpty()) {
+            } else if (trainingPathCheckbox.isSelected() && trainingTextbox.getText().isEmpty()) {
 
                 JBPopupFactory.getInstance()
                         .createHtmlTextBalloonBuilder(resourceBundle.getString("Messages.Error.PathNotFound"), MessageType.ERROR, null)
                         .createBalloon()
                         .show(JBPopupFactory.getInstance().guessBestPopupLocation(trainingPathCheckbox), Balloon.Position.below);
-            } else if (!trainingPathCheckbox.isSelected()) {
+            } else if (trainingPathCheckbox.isSelected()) {
 
                 parameters.put(Constants.TRAIN_DIRECTORY, trainingTextbox.getText());
                 PropertiesComponent.getInstance(project).setValue(Constants.TRAIN_DIRECTORY, trainingTextbox.getText());

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

@@ -11,6 +11,8 @@
     <depends>com.intellij.modules.lang</depends>
     -->
 
+    <idea-version since-build="181"/>
+
     <extensions defaultExtensionNs="com.intellij">
         <codeInsight.lineMarkerProvider language="JAVA"
                                         implementationClass="de.fraunhofer.iem.swan.assist.ui.markers.ErrorLineMarker"/>

swan_assist/src/main/resources/dialog_messages.properties

@@ -17,7 +17,7 @@ Launcher.Project = Project JAR(s)
 Launcher.AdvancedOptionsCheckBox = Advanced Options
 Launcher.Output = Output Path
 Launcher.TrainingJars = Training JARs
-Launcher.DefaultPath = Use default training JARs
+Launcher.DefaultPath = Use training JARs from diretory
 
 #Notifications when running SWAN
 Messages.Title.RefreshStarted = Reloading SWAN

swan_core/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>de.upb.cs.swt</groupId>
 	<artifactId>swan_core</artifactId>
 	<packaging>jar</packaging>
-	<version>1.2.1</version>
+	<version>1.3.0</version>
 
 	<name>SWAN Weakness Detector</name>
 	<description>SWAN is a machine-learning approach for detection of methods of interest for security in Java libraries.</description>
@@ -166,6 +166,9 @@
 		</plugins>
 	</build>
 
+
+
+
 	<!-- release build command: mvn clean install -Prelease -->
 	<profiles>
 		<profile>