refactor: replace duplicated login wizard creation code with shared function

Author: andrewrobinsonhodges-snyk

plugin/src/main/java/io/snyk/eclipse/plugin/SnykStartup.java

@@ -16,7 +16,6 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.ui.IStartup;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
@@ -68,11 +67,7 @@ protected IStatus run(IProgressMonitor monitor) {
 					Preferences prefs = Preferences.getInstance();
 					if (prefs.getAuthToken().isBlank() && !prefs.isTest()) {
 						monitor.subTask("Starting Snyk Wizard to configure initial settings...");
-						SnykWizard wizard = new SnykWizard();
-						WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(),
-								wizard);
-						dialog.setBlockOnOpen(true);
-						dialog.open();
+						SnykWizard.createAndLaunch();
 					}
 				});
 				monitor.done();

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/BrowserHandler.java

@@ -6,7 +6,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4j.Location;
 import org.eclipse.lsp4j.Position;
@@ -71,12 +70,7 @@ public Object function(Object[] arguments) {
 		new BrowserFunction(browser, "initiateLogin") {
 			@Override
 			public Object function(Object[] arguments) {
-				SnykWizard wizard = new SnykWizard();
-				WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(),wizard);
-
-				dialog.setBlockOnOpen(true);
-				dialog.open();
-				return null;
+				return SnykWizard.createAndLaunch();
 			}
 		};
 

plugin/src/main/java/io/snyk/eclipse/plugin/wizards/SnykWizard.java

@@ -6,6 +6,8 @@
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.INewWizard;
 import org.eclipse.ui.IWorkbench;
 
@@ -92,4 +94,12 @@ protected IStatus run(IProgressMonitor monitor) {
 		}.schedule();
 		return true;
 	}
+	
+	public static Object createAndLaunch() {
+		SnykWizard wizard = new SnykWizard();
+		WizardDialog dialog = new WizardDialog(Display.getDefault().getActiveShell(),wizard);
+		dialog.setBlockOnOpen(true);
+		dialog.open();
+		return null;
+	}
 }

plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java

@@ -44,7 +44,6 @@
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.lsp4e.LSPEclipseUtils;
 import org.eclipse.lsp4e.LanguageClientImpl;
 import org.eclipse.lsp4j.ProgressParams;
@@ -190,7 +189,7 @@ private void registerPluginInstalledEventTask() {
 	public void triggerScan(Path projectPath) {
 		CompletableFuture.runAsync(() -> {
 			if (Preferences.getInstance().getAuthToken().isBlank()) {
-				runSnykWizard();
+				SnykWizard.createAndLaunch();
 			} else {
 				openToolView();
 				try {
@@ -606,15 +605,6 @@ public CompletableFuture<Void> createProgress(WorkDoneProgressCreateParams param
 		return super.createProgress(params);
 	}
 
-	private void runSnykWizard() {
-		SnykWizard wizard = new SnykWizard();
-
-		WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getDisplay().getActiveShell(), wizard);
-
-		dialog.setBlockOnOpen(true);
-		dialog.open();
-	}
-
 	/**
 	 * Refresh the token using language server. Waits up to 2s for the token change.
 	 *