Merge pull request #104 from eharris369/95-importOnProjectCreate

Issue #95: Import project into Eclipse on project create

Author: eharris369

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/IOperationHandler.java

@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2019 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v20.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package com.ibm.microclimate.core.internal.connection;
+
+public interface IOperationHandler {
+
+	public void operationComplete(boolean passed, String msg);
+	
+}

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateConnection.java

@@ -779,13 +779,14 @@ public void requestNodeProjectCreate(String name)
 
 		String createEndpoint = MCConstants.APIPATH_PROJECT_LIST;
 
-		URI url = baseUrl.resolve(createEndpoint);
+		URI uri = baseUrl.resolve(createEndpoint);
 
 		JSONObject createProjectPayload = new JSONObject();
 		createProjectPayload.put(MCConstants.KEY_NAME, name);
 		createProjectPayload.put(MCConstants.KEY_LANGUAGE, "nodejs");
 
-		HttpUtil.post(url, createProjectPayload);
+		HttpResult result = HttpUtil.post(uri, createProjectPayload);
+		checkResult(result, uri, false);
 	}
 
 	public void requestProjectDelete(String projectId)

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateSocket.java

@@ -14,7 +14,9 @@
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.osgi.util.NLS;
@@ -57,6 +59,8 @@ public class MicroclimateSocket {
 	private Set<OldSocketConsole> oldSocketConsoles = new HashSet<>();
 
 	private Set<SocketConsole> socketConsoles = new HashSet<>();
+	
+	private Map<String, IOperationHandler> projectCreateHandlers = new HashMap<String, IOperationHandler>();
 
 	// Track the previous Exception so we don't spam the logs with the same connection failure message
 	private Exception previousException;
@@ -286,6 +290,13 @@ private void onProjectCreation(JSONObject event) throws JSONException {
 			MCLogger.logError("No application found matching the project id for the project creation event: " + projectID); //$NON-NLS-1$
 		}
 		MCUtil.updateConnection(mcConnection);
+		String projectName = event.has(MCConstants.KEY_NAME) ? event.getString(MCConstants.KEY_NAME) : null;
+		if (projectName != null) {
+			IOperationHandler handler = projectCreateHandlers.get(projectName);
+			if (handler != null) {
+				handler.operationComplete(true, null);
+			}
+		}
 	}
 
 	private void onProjectChanged(JSONObject event) throws JSONException {
@@ -470,6 +481,14 @@ public void registerSocketConsole(SocketConsole console) {
 	public void deregisterSocketConsole(SocketConsole console) {
 		this.socketConsoles.remove(console);
 	}
+	
+	public void registerProjectCreateHandler(String projectName, IOperationHandler handler) {
+		this.projectCreateHandlers.put(projectName, handler);
+	}
+	
+	public void deregisterProjectCreateHandler(String projectName) {
+		this.projectCreateHandlers.remove(projectName);
+	}
 
 	private void onContainerLogs(JSONObject event) throws JSONException {
 		String projectID = event.getString(MCConstants.KEY_PROJECT_ID);

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/Messages.java

@@ -141,6 +141,7 @@ public class Messages extends NLS {
 	public static String NewProjectPage_LanguageColumn;
 	public static String NewProjectPage_DescriptionLabel;
 	public static String NewProjectPage_DescriptionNone;
+	public static String NewProjectPage_ImportLabel;
 	public static String NewProjectPage_ProjectNameLabel;
 	public static String NewProjectPage_ProjectExistsError;
 	public static String NewProjectPage_InvalidProjectName;

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/messages/messages.properties

@@ -134,6 +134,7 @@ NewProjectPage_TypeColumn=Template
 NewProjectPage_LanguageColumn=Language
 NewProjectPage_DescriptionLabel=Description: {0}
 NewProjectPage_DescriptionNone=<none>
+NewProjectPage_ImportLabel=Import project after it is created
 NewProjectPage_ProjectNameLabel=Project name:
 NewProjectPage_ProjectExistsError=A Microclimate project named {0} already exists. Choose a unique name.
 NewProjectPage_InvalidProjectName=Use only lower case letters and numbers in the project name.

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/wizards/NewMicroclimateProjectPage.java

@@ -27,6 +27,7 @@
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
@@ -53,6 +54,7 @@ public class NewMicroclimateProjectPage extends WizardPage {
 	private Table selectionTable;
 	private Text descriptionLabel;
 	private Text projectNameText;
+	private Button importButton;
 
 	protected NewMicroclimateProjectPage(MicroclimateConnection connection, List<ProjectTemplateInfo> templateList) {
 		super(Messages.NewProjectPage_ShellTitle);
@@ -159,6 +161,13 @@ public void widgetSelected(SelectionEvent event) {
 		descriptionScroll.getVerticalBar().setPageIncrement(lineHeight);
 		descriptionScroll.getVerticalBar().setIncrement(lineHeight);
 
+		spacer = new Label(composite, SWT.NONE);
+		spacer.setLayoutData(new GridData(GridData.FILL, GridData.FILL, true, false, 2, 1));
+		
+		importButton = new Button(composite, SWT.CHECK);
+		importButton.setText(Messages.NewProjectPage_ImportLabel);
+		importButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 2, 1));
+		
 		// Listeners
 		filterText.addModifyListener(new ModifyListener() {
 			@Override
@@ -209,6 +218,7 @@ public void modifyText(ModifyEvent arg0) {
 			selectionTable.setSelection(0);
 		}
 		updateDescription();
+		importButton.setSelection(true);
 		// resize description since the UI isn't visible yet
 		descriptionLabel.setSize(descriptionLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 		projectNameText.setFocus();
@@ -245,6 +255,10 @@ public String getProjectName() {
 		}
 		return null;
 	}
+	
+	public boolean importProject() {
+		return importButton.getSelection();
+	}
 
 	private void createItems(Table table, String filter) {
 		// Create the items for the table.

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/wizards/NewMicroclimateProjectWizard.java

@@ -18,8 +18,11 @@
 
 import com.ibm.microclimate.core.internal.MCLogger;
 import com.ibm.microclimate.core.internal.MCUtil;
+import com.ibm.microclimate.core.internal.MicroclimateApplication;
+import com.ibm.microclimate.core.internal.connection.IOperationHandler;
 import com.ibm.microclimate.core.internal.connection.MicroclimateConnection;
 import com.ibm.microclimate.core.internal.console.ProjectTemplateInfo;
+import com.ibm.microclimate.ui.internal.actions.ImportProjectAction;
 import com.ibm.microclimate.ui.internal.messages.Messages;
 
 public class NewMicroclimateProjectWizard extends Wizard {
@@ -54,6 +57,21 @@ public boolean performFinish() {
 		}
 
 		try {
+			if (newProjectPage.importProject()) {
+				connection.getMCSocket().registerProjectCreateHandler(name, new IOperationHandler() {
+					@Override
+					public void operationComplete(boolean passed, String msg) {
+						connection.getMCSocket().deregisterProjectCreateHandler(name);
+						if (passed) {
+							MicroclimateApplication app = connection.getAppByName(name);
+							if (app != null) {
+								ImportProjectAction.importProject(app);
+								return;
+							}
+						}
+					}
+				});
+			}
 			connection.requestProjectCreate(info, name);
 			return true;
 		} catch (Exception e) {