Improve missing tests per project view

* sort projects in combo box alphabetically, case insensitive
* add packages to the tree view
* sort classes in tree view

Author: Bananeweizen

org.moreunit.plugin/src/org/moreunit/elements/MissingClassTreeContentProvider.java

@@ -1,7 +1,9 @@
 package org.moreunit.elements;
 
-import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaElement;
@@ -17,33 +19,54 @@
 public class MissingClassTreeContentProvider implements ITreeContentProvider
 {
 
-    public MissingClassTreeContentProvider()
-    {
-
-    }
-
-    public Object[] getChildren(Object arg0)
+    public Object[] getChildren(Object parent)
     {
+        if(parent instanceof IPackageFragment packageFragment)
+        {
+            try
+            {
+            Set<ICompilationUnit> compilationUnits = new HashSet<>();
+            for (ICompilationUnit compilationUnit : packageFragment.getCompilationUnits())
+            {
+                if(compilationUnit.findPrimaryType() != null)
+                {
+                    ClassTypeFacade classTypeFacade = new ClassTypeFacade(compilationUnit);
+                    if(! TypeFacade.isTestCase(compilationUnit) && ! classTypeFacade.hasTestCase())
+                    {
+                        compilationUnits.add(compilationUnit);
+                    }
+                }
+            }
+            return compilationUnits.stream().sorted(Comparator.comparing(Object::toString, String.CASE_INSENSITIVE_ORDER)).toArray(ICompilationUnit[]::new);
+        }
+        catch (JavaModelException e)
+        {
+            e.printStackTrace();
+        }
+        }
         return null;
     }
 
-    public Object getParent(Object arg0)
+    public Object getParent(Object child)
     {
+        if(child instanceof ICompilationUnit unit)
+        {
+            return unit.getParent();
+        }
         return null;
     }
 
-    public boolean hasChildren(Object arg0)
+    public boolean hasChildren(Object parent)
     {
-        return false;
+        return ! (parent instanceof ICompilationUnit);
     }
 
     public Object[] getElements(Object inputElement)
     {
-        List<Object> elements = new ArrayList<Object>();
-
-        if(inputElement instanceof MissingTestsViewPart)
+        Set<IPackageFragment> packages = new HashSet<>();
+        if(inputElement instanceof MissingTestsViewPart missingTestsViewPart)
         {
-            IJavaProject javaProject = ((MissingTestsViewPart) inputElement).getSelectedJavaProject();
+            IJavaProject javaProject = missingTestsViewPart.getSelectedJavaProject();
             if(javaProject != null)
             {
                 List<IPackageFragmentRoot> allSourceFolderFromProject = PluginTools.getAllSourceFolderFromProject(javaProject);
@@ -62,7 +85,8 @@ public Object[] getElements(Object inputElement)
                                     ClassTypeFacade classTypeFacade = new ClassTypeFacade(compilationUnit);
                                     if(! TypeFacade.isTestCase(compilationUnit) && ! classTypeFacade.hasTestCase())
                                     {
-                                        elements.add(compilationUnit);
+                                        packages.add((IPackageFragment) javaPackage);
+                                        break;
                                     }
                                 }
                             }
@@ -75,8 +99,7 @@ public Object[] getElements(Object inputElement)
                 }
             }
         }
-
-        return elements.toArray();
+        return packages.stream().sorted(Comparator.comparing(Object::toString, String.CASE_INSENSITIVE_ORDER)).toArray(IJavaElement[]::new);
     }
 
     public void inputChanged(Viewer arg0, Object arg1, Object arg2)

org.moreunit.plugin/src/org/moreunit/ui/MissingTestsViewPart.java

@@ -13,6 +13,7 @@
 import org.eclipse.jdt.core.ICompilationUnit;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart;
 import org.eclipse.jdt.ui.JavaElementLabelProvider;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -61,7 +62,7 @@ public void createPartControl(Composite parent)
 
     private String[] getNamesOfJavaProjects()
     {
-        return PluginTools.getJavaProjectsFromWorkspace().stream().map(IJavaProject::getElementName).toArray(String[]::new);
+        return PluginTools.getJavaProjectsFromWorkspace().stream().map(IJavaProject::getElementName).sorted(String.CASE_INSENSITIVE_ORDER).toArray(String[]::new);
     }
 
     @Override
@@ -79,6 +80,7 @@ public void widgetSelected(SelectionEvent e)
         IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
         selectedJavaProject = JavaCore.create(project);
         treeViewer.refresh();
+        treeViewer.expandAll();
     }
 
     public IJavaProject getSelectedJavaProject()
@@ -89,8 +91,17 @@ public IJavaProject getSelectedJavaProject()
     public void doubleClick(DoubleClickEvent event)
     {
         ITreeSelection selection = (ITreeSelection) this.treeViewer.getSelection();
-        ICompilationUnit compilationUnit = (ICompilationUnit) selection.getFirstElement();
-        new EditorUI().open(compilationUnit);
+        Object firstElement = selection.getFirstElement();
+        if(firstElement instanceof ICompilationUnit compilationUnit)
+        {
+            new EditorUI().open(compilationUnit);
+        }
+        else
+        {
+            PackageExplorerPart part = PackageExplorerPart.getFromActivePerspective();
+            part.selectAndReveal(firstElement);
+            part.setFocus();
+        }
     }
 
     @Override
@@ -108,7 +119,7 @@ public void resourceChanged(IResourceChangeEvent event)
             return;
         }
 
-        if (event.getType() != IResourceChangeEvent.POST_CHANGE)
+        if(event.getType() != IResourceChangeEvent.POST_CHANGE)
             return;
 
         if(selectedJavaProject == null)
@@ -147,7 +158,7 @@ public boolean visit(IResourceDelta delta) throws CoreException
             e.printStackTrace();
         }
 
-        if(!addedOrRemovedResource.isEmpty())
+        if(! addedOrRemovedResource.isEmpty())
         {
             PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable()
             {
@@ -187,7 +198,7 @@ public boolean visit(IResourceDelta delta) throws CoreException
             e.printStackTrace();
         }
 
-        if(!addedProjects.isEmpty())
+        if(! addedProjects.isEmpty())
         {
             updateProjectsInComboBox();
         }