Skip to content

Commit

Permalink
Merge branch 'detached-branch'
Browse files Browse the repository at this point in the history
  • Loading branch information
SvenPeldszus committed Mar 13, 2024
2 parents f976644 + 6df7152 commit dc5b4ad
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 16 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.gravity.mapping.secdfd.ui.handler;


import java.util.List;
import java.util.stream.Collectors;

Expand All @@ -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
*
*/
Expand All @@ -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<IJavaProject> 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<IJavaProject> 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;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<packaging>pom</packaging>

<properties>
<tycho-version>4.0.4</tycho-version>
<tycho-version>4.0.6</tycho-version>
<jacoco.version>0.8.11</jacoco.version>
<mwe2-version>2.16.0</mwe2-version>
<xtext-version>2.33.0</xtext-version>
Expand Down

0 comments on commit dc5b4ad

Please sign in to comment.