Sort method list alphabetically

Author: oshando

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/actions/filter/CategoryActionGroup.java

@@ -11,9 +11,9 @@
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import de.fraunhofer.iem.swan.assist.data.JSONFileLoader;
+import de.fraunhofer.iem.swan.assist.util.Constants;
 import de.fraunhofer.iem.swan.assist.util.Formatter;
 import de.fraunhofer.iem.swan.data.Category;
-import de.fraunhofer.iem.swan.assist.util.Constants;
 import javafx.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -54,15 +54,12 @@ public AnAction[] getChildren(@Nullable AnActionEvent anActionEvent) {
         ArrayList<FilterAction> cweFilter = new ArrayList<FilterAction>();
         ArrayList<FilterAction> typeFilter = new ArrayList<FilterAction>();
 
-        if (JSONFileLoader.isFileSelected()) {
-
-            for (Category category : JSONFileLoader.getCategories()) {
+        for (Category category : JSONFileLoader.getCategories()) {
 
-                if (category.isCwe())
-                    cweFilter.add(new FilterAction(new Pair<>(Constants.FILTER_CWE, Formatter.toTitleCase(category.toString()))));
-                else
-                    typeFilter.add(new FilterAction(new Pair<>(Constants.FILTER_TYPE, Formatter.toTitleCase(category.toString()))));
-            }
+            if (category.isCwe())
+                cweFilter.add(new FilterAction(new Pair<>(Constants.FILTER_CWE, Formatter.toTitleCase(category.toString()))));
+            else
+                typeFilter.add(new FilterAction(new Pair<>(Constants.FILTER_TYPE, Formatter.toTitleCase(category.toString()))));
         }
 
         if (this.toString().contains(Constants.FILTER_CWE))

swan_assist/src/main/java/de/fraunhofer/iem/swan/assist/data/MethodWrapper.java

@@ -18,7 +18,8 @@
 /**
  * Wrapper class to format data in method object to display in plugin.
  */
-public class MethodWrapper {
+public class MethodWrapper implements Comparable<MethodWrapper> {
+
 
     public enum MethodStatus {
         NONE,
@@ -70,6 +71,11 @@ public MethodWrapper(String methodName, List<String> parameters, String returnTy
 
     }
 
+    @Override
+    public int compareTo(@NotNull MethodWrapper o) {
+        return this.getMethodName(false).compareTo(o.getMethodName(false));
+    }
+
     /**
      * Returns Method object
      * @return Method object

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

@@ -127,7 +127,36 @@ public void mouseClicked(MouseEvent e) {
                     if (node != null) {
                         Object object = node.getUserObject();
 
-                        if (object instanceof MethodWrapper) {
+                        if (object instanceof Pair) {
+
+                            Pair classPair = (Pair) object;
+                            String classname = classPair.getKey().toString();
+                            String simpleClassname = classname.substring(classname.lastIndexOf(".") + 1);
+
+                            PsiFile[] files = FilenameIndex.getFilesByName(project, simpleClassname + ".java", GlobalSearchScope.allScope(project));
+
+                            boolean methodFound = false;
+
+                            for (PsiFile file : files) {
+
+                                PsiJavaFile psiJavaFile = (PsiJavaFile) file;
+
+                                if ((psiJavaFile.getPackageName() + "." + simpleClassname).contentEquals(classname)) {
+
+                                    methodFound = true;
+
+                                    OpenFileDescriptor fileDescriptor = new OpenFileDescriptor(project, psiJavaFile.getVirtualFile());
+                                    fileDescriptor.navigateInEditor(project, true);
+                                }
+                            }
+
+                            if (!methodFound) {
+                                JBPopupFactory.getInstance().createHtmlTextBalloonBuilder(resource.getString("Messages.Error.ClassNotFound"), MessageType.ERROR, null)
+                                        .createBalloon()
+                                        .show(JBPopupFactory.getInstance().guessBestPopupLocation((JComponent) e.getComponent()), Balloon.Position.below);
+                            }
+
+                        } else if (object instanceof MethodWrapper) {
 
                             MethodWrapper method = (MethodWrapper) object;
 
@@ -504,7 +533,7 @@ private void addNode(MethodWrapper method) {
      */
     private void loadMethods() {
 
-        HashMap<String, ArrayList<MethodWrapper>> methods = JSONFileLoader.getMethodsForTree(TREE_FILTERS, currentFile, project);
+        TreeMap<String, ArrayList<MethodWrapper>> methods = JSONFileLoader.getMethodsForTree(TREE_FILTERS, currentFile, project);
 
         if (methods.size() > 0) {
 
@@ -517,7 +546,11 @@ private void loadMethods() {
                 methodCount = methods.get(classname).size();
                 totalMethods += methodCount;
 
-                for (MethodWrapper method : methods.get(classname)) {
+                DefaultMutableTreeNode classNode = new DefaultMutableTreeNode(new Pair<>(classname, methodCount));
+
+                ArrayList<MethodWrapper> sortedList =  methods.get(classname);
+                Collections.sort(sortedList);
+                for (MethodWrapper method : sortedList) {
 
                     classNode.add(addCategoriesToNode(method));
                     root.add(classNode);