From d4f7912856acf39067a07de8f292cc550c559183 Mon Sep 17 00:00:00 2001 From: Sven Peldszus Date: Wed, 13 Mar 2024 18:35:16 +0100 Subject: [PATCH 1/2] Improved handling of user selection --- .../secdfd/ui/handler/MappingHandler.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/implementation/org.gravity.mapping.secdfd/src/org/gravity/mapping/secdfd/ui/handler/MappingHandler.java b/implementation/org.gravity.mapping.secdfd/src/org/gravity/mapping/secdfd/ui/handler/MappingHandler.java index 548118a5..ef49a9db 100755 --- a/implementation/org.gravity.mapping.secdfd/src/org/gravity/mapping/secdfd/ui/handler/MappingHandler.java +++ b/implementation/org.gravity.mapping.secdfd/src/org/gravity/mapping/secdfd/ui/handler/MappingHandler.java @@ -1,6 +1,5 @@ package org.gravity.mapping.secdfd.ui.handler; - import java.util.List; import java.util.stream.Collectors; @@ -12,11 +11,13 @@ import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; import org.gravity.eclipse.ui.GravityUiActivator; +import org.gravity.eclipse.ui.handler.SelectionHelper; import org.gravity.mapping.secdfd.ui.wizard.MappingWizard; /** - * A handler for triggering the initial creation of a new UML models for the selected projects - * + * A handler for triggering the initial creation of a new UML models for the + * selected projects + * * @author speldszus * */ @@ -25,24 +26,21 @@ public class MappingHandler extends AbstractHandler { static final Logger LOGGER = Logger.getLogger(MappingHandler.class); @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - List selection = GravityUiActivator.getSelection(event); - List projects = selection.parallelStream() - .filter(o -> o instanceof IJavaProject) - .map(p -> (IJavaProject) p) - .collect(Collectors.toList()); - - WizardDialog wizard = new WizardDialog(GravityUiActivator.getShell(),new MappingWizard(projects)); - if(wizard.open() == Window.OK) { + public Object execute(final ExecutionEvent event) throws ExecutionException { + final List selection = SelectionHelper.getSelection(event); + final List projects = selection.parallelStream().filter(IJavaProject.class::isInstance) + .map(p -> (IJavaProject) p).collect(Collectors.toList()); + + final var wizard = new WizardDialog(GravityUiActivator.getShell(), new MappingWizard(projects)); + if (wizard.open() == Window.OK) { System.out.println("OK pressed"); - } - else { + } else { System.out.println("CANCEL"); } return null; } - + @Override public boolean isEnabled() { return true; From 6df7152e22c95cc11e5199b0e6a5a7c988ab4753 Mon Sep 17 00:00:00 2001 From: Sven Peldszus Date: Wed, 13 Mar 2024 18:36:15 +0100 Subject: [PATCH 2/2] Updated tycho --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1efa2d1d..55a82344 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom - 4.0.3 + 4.0.6 0.8.11 2.16.0 2.33.0