Show lifecycle mappings on open (#1155)

Instead of waiting for a first selection use the current selection when opening the view. Also use more readable String joining with comma and blank for the entries.
eclipse-m2e · Dec 29, 2022 · 7fca6de · 7fca6de
1 parent 8d89efc
commit 7fca6de
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 34 deletions.
diff --git a/...m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LifecycleMappingsViewer.java b/...m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/preferences/LifecycleMappingsViewer.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import org.osgi.framework.Bundle;
 
@@ -428,22 +429,14 @@ boolean isIgnoreMapping(MojoExecutionKey execution, List<IPluginExecutionMetadat
   }
 
   String toString(MojoExecutionKey execution, List<IPluginExecutionMetadata> mappings) {
-    StringBuilder sb = new StringBuilder();
     if(mappings != null && !mappings.isEmpty()) {
-      for(IPluginExecutionMetadata mapping : mappings) {
-        if(sb.length() > 0) {
-          sb.append(',');
-        }
-        sb.append(mapping.getAction().toString());
-      }
-    } else {
-      if(LifecycleMappingFactory.isInterestingPhase(execution.lifecyclePhase())) {
-        sb.append(PluginExecutionAction.error.toString());
-      } else {
-        sb.append(PluginExecutionAction.ignore.toString());
-      }
+      return mappings.stream().map(IPluginExecutionMetadata::getAction).map(PluginExecutionAction::toString)
+          .collect(Collectors.joining(", ")); //$NON-NLS-1$
     }
-    return sb.toString();
+    if(LifecycleMappingFactory.isInterestingPhase(execution.lifecyclePhase())) {
+      return PluginExecutionAction.error.toString();
+    }
+    return PluginExecutionAction.ignore.toString();
   }
 
   String getSourcelabel(MojoExecutionKey execution, List<IPluginExecutionMetadata> mappings, boolean detailed) {
@@ -471,14 +464,7 @@ String getSourcelabel(MojoExecutionKey execution, List<IPluginExecutionMetadata>
         sources.add("uninteresting"); //$NON-NLS-1$
       }
     }
-    StringBuilder sb = new StringBuilder();
-    for(String source : sources) {
-      if(sb.length() > 0) {
-        sb.append(',');
-      }
-      sb.append(source);
-    }
-    return sb.toString();
+    return String.join(", ", sources);
   }
 
   private String getSourceLabel(Bundle bundle, boolean detailed) {

diff --git a/...se.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenLifecycleMappingsView.java b/...se.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenLifecycleMappingsView.java
@@ -44,6 +44,8 @@ public void createPartControl(Composite parent) {
     mappingsViewer = new LifecycleMappingsViewer();
     this.composite = mappingsViewer.createContents(parent);
 
+    // react to current selection when opening the view
+    handleSelectionChanged(getSite().getPage().getSelection());
   }
 
   /* (non-Javadoc)
@@ -56,18 +58,7 @@ public void init(IViewSite site) throws PartInitException {
 
       @Override
       public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-        Object element;
-        if(selection instanceof IStructuredSelection structuredSelection) {
-          element = structuredSelection.getFirstElement();
-        } else {
-          element = null;
-        }
-        IResource resource = Adapters.adapt(element, IResource.class);
-        if(resource != null) {
-          mappingsViewer.setTarget(resource.getProject());
-        } else {
-          mappingsViewer.setTarget(null);
-        }
+        handleSelectionChanged(selection);
       }
     });
   }
@@ -80,4 +71,19 @@ public void setFocus() {
     composite.setFocus();
   }
 
+  private void handleSelectionChanged(ISelection selection) {
+    Object element;
+    if(selection instanceof IStructuredSelection structuredSelection) {
+      element = structuredSelection.getFirstElement();
+    } else {
+      element = null;
+    }
+    IResource resource = Adapters.adapt(element, IResource.class);
+    if(resource != null) {
+      mappingsViewer.setTarget(resource.getProject());
+    } else {
+      mappingsViewer.setTarget(null);
+    }
+  }
+
 }