Bug fixes

Author: oshando

swan_assist/src/de/fraunhofer/iem/swan/assist/actions/LaunchSwanAction.java

@@ -15,7 +15,6 @@
 import de.fraunhofer.iem.swan.assist.util.Constants;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -42,7 +41,7 @@ public void actionPerformed(AnActionEvent anActionEvent) {
         InputStream input = null;
 
         try {
-            input = new FileInputStream(getClass().getClassLoader().getResource("").getPath()+"config.properties");
+            input = getClass().getClassLoader().getResourceAsStream("config.properties");
             config.load(input);
         } catch (IOException e) {
             e.printStackTrace();

swan_assist/src/de/fraunhofer/iem/swan/assist/data/JSONFileLoader.java

@@ -101,7 +101,6 @@ public static ArrayList<MethodWrapper> getMethods(ArrayList<Pair<String, String>
                 if (method.getUpdateOperation().equals(Constants.METHOD_DELETED) || method.isTrainingMethod())
                     continue;
 
-                System.out.println(method.getSignature(true));
                 filteredList.add(method);
             }
             return filteredList;

swan_assist/src/de/fraunhofer/iem/swan/assist/util/PsiTraversal.java

@@ -13,6 +13,7 @@
 import org.apache.commons.lang3.StringUtils;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Methods to find PSI methods using the PSI object or event.
@@ -97,7 +98,15 @@ public static String getMethodSignature(PsiMethod psiMethod) {
 
         PsiClass psiClass = PsiTreeUtil.getParentOfType(psiMethod, PsiClass.class);
 
-        return psiMethod.getReturnType().getCanonicalText() + " " +
+        String returnType ="";
+        if(psiMethod.getReturnType()!=null){
+            if(psiMethod.getReturnType() instanceof PsiPrimitiveType)
+                returnType = ((PsiPrimitiveType) psiMethod.getReturnType()).getName();
+            else
+                returnType = psiMethod.getReturnType().getCanonicalText();
+        }
+
+        return  returnType+ " " +
                 psiClass.getQualifiedName() + "." + psiMethod.getName() + " (" +
                 StringUtils.join(getParameters(psiMethod), ", ") + ")";
     }