Issue #157: Refresh projects on change event (#158)

Author: eharris369

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

@@ -306,20 +306,18 @@ 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);
-			}
-		}
+		invokeProjectCreateHandler(app);
 	}
 
 	private void onProjectChanged(JSONObject event) throws JSONException {
 		String projectID = event.getString(MCConstants.KEY_PROJECT_ID);
 		MicroclimateApplication app = mcConnection.getAppByID(projectID);
 		if (app == null) {
-			MCLogger.logError("No application found matching the project id for the project changed event: " + projectID); //$NON-NLS-1$
+			// Likely a new project is being created
+			mcConnection.refreshApps(projectID);
+			MCUtil.updateConnection(mcConnection);
+			app = mcConnection.getAppByID(projectID);
+			invokeProjectCreateHandler(app);
 			return;
 		}
 
@@ -362,7 +360,11 @@ private void onProjectSettingsChanged(JSONObject event) throws JSONException {
 		String projectID = event.getString(MCConstants.KEY_PROJECT_ID);
 		MicroclimateApplication app = mcConnection.getAppByID(projectID);
 		if (app == null) {
-			MCLogger.logError("No application found matching the project id for the project settings changed event: " + projectID); //$NON-NLS-1$
+			// Likely a new project is being created
+			mcConnection.refreshApps(projectID);
+			MCUtil.updateConnection(mcConnection);
+			app = mcConnection.getAppByID(projectID);
+			invokeProjectCreateHandler(app);
 			return;
 		}
 
@@ -383,6 +385,8 @@ private void onProjectStatusChanged(JSONObject event) throws JSONException {
 			// Likely a new project is being created
 			mcConnection.refreshApps(projectID);
 			MCUtil.updateConnection(mcConnection);
+			app = mcConnection.getAppByID(projectID);
+			invokeProjectCreateHandler(app);
 			return;
 		}
 
@@ -550,6 +554,8 @@ private void onProjectLogsListChanged(JSONObject event) throws JSONException {
 			// Likely a new project is being created
 			mcConnection.refreshApps(projectID);
 			MCUtil.updateConnection(mcConnection);
+			app = mcConnection.getAppByID(projectID);
+			invokeProjectCreateHandler(app);
 			return;
 		}
 
@@ -651,4 +657,14 @@ boolean blockUntilFirstConnection() {
 		MCLogger.log("MicroclimateSocket initialized in time ? " + hasConnected); //$NON-NLS-1$
 		return hasConnected;
 	}
+	
+	private void invokeProjectCreateHandler(MicroclimateApplication app) {
+		if (app == null) {
+			return;
+		}
+		IOperationHandler handler = projectCreateHandlers.get(app.name);
+		if (handler != null) {
+			handler.operationComplete(true, null);
+		}
+	}
 }

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

@@ -146,6 +146,7 @@ public class Messages extends NLS {
 	public static String NewProjectPage_ImportLabel;
 	public static String NewProjectPage_ProjectNameLabel;
 	public static String NewProjectPage_ProjectExistsError;
+	public static String NewProjectPage_EclipseProjectExistsError;
 	public static String NewProjectPage_InvalidProjectName;
 	public static String NewProjectPage_ProjectCreateErrorTitle;
 	public static String NewProjectPage_ProjectCreateErrorMsg;

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

@@ -139,6 +139,7 @@ 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_EclipseProjectExistsError=The import button is selected but an Eclipse project named {0} already exists. Choose a unique name.
 NewProjectPage_InvalidProjectName=Use only lower case letters and numbers in the project name.
 NewProjectPage_ProjectCreateErrorTitle=Project Create Error
 NewProjectPage_ProjectCreateErrorMsg=An error occurred trying to create Microclimate project {0}: {1}

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

@@ -15,6 +15,8 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.viewers.ColumnWeightData;
 import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.wizard.WizardPage;
@@ -234,10 +236,18 @@ private boolean validate() {
 		if (!projectNamePattern.matcher(projectName).matches()) {
 			setErrorMessage(Messages.NewProjectPage_InvalidProjectName);
 			return false;
-		} else if (connection.getAppByName(projectName) != null) {
+		}
+		if (connection.getAppByName(projectName) != null) {
 			setErrorMessage(NLS.bind(Messages.NewProjectPage_ProjectExistsError, projectName));
 			return false;
 		}
+		if (importButton.getSelection()) {
+			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
+			if (project != null && project.exists()) {
+				setErrorMessage(NLS.bind(Messages.NewProjectPage_EclipseProjectExistsError, projectName));
+				return false;
+			}
+		}
 		setErrorMessage(null);
 		return selectionTable.getSelectionCount() == 1 && projectName != null && !projectName.isEmpty();
 	}

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

@@ -13,6 +13,8 @@
 
 import java.util.List;
 
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.widgets.Display;
@@ -74,9 +76,17 @@ public void run() {
 								}
 							});
 							if (importProject) {
-								ImportProjectAction.importProject(app);
+								IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(app.name);
+								if (project == null || !project.exists()) {
+									ImportProjectAction.importProject(app);
+								} else {
+									// This should not happen since the wizard checks for this
+									MCLogger.logError("The project cannot be imported because a project already exists with the name: " + app.name);
+								}
 							}
 							return;
+						} else {
+							MCLogger.logError("An import operation was requested but the application could not be found for: " + name);
 						}
 					}
 				}