Merge pull request #26 from eharris369/24-addOpenImportProjectPageAction

Issue #24: Add open import project page action

Author: eharris369

dev/com.ibm.microclimate.core/plugin.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018 IBM Corporation and others.
+# Copyright (c) 2018, 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
@@ -15,10 +15,6 @@
 Bundle-Vendor = IBM
 Bundle-Name = Microclimate Developer Tools
 
-MICROCLIMATE_SERVER_ID=microclimate.server
-SERVER_NAME=Microclimate Server
-SERVER_DESCRIPTION=Server representing a Microclimate project
-
 LAUNCH_CONFIG_NAME=Microclimate Project
 
 VALIDATION_MARKER=Microclimate Problem

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

@@ -599,13 +599,21 @@ public IPath getWorkspacePath() {
 	}
 
 	public URI getNewProjectURI() {
+		return getProjectURI(MCConstants.QUERY_NEW_PROJECT);
+	}
+	
+	public URI getImportProjectURI() {
+		return getProjectURI(MCConstants.QUERY_IMPORT_PROJECT);
+	}
+	
+	private URI getProjectURI(String projectQuery) {
 		try {
 			URI uri = baseUrl;
-			String query = MCConstants.QUERY_NEW_PROJECT + "=" + MCConstants.VALUE_TRUE;
+			String query = projectQuery + "=" + MCConstants.VALUE_TRUE;
 			uri = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), query, uri.getFragment());
 			return uri;
 		} catch (Exception e) {
-			MCLogger.logError("Failed to get the URI for the new project page.", e);  //$NON-NLS-1$
+			MCLogger.logError("Failed to get the project URI for the query: " + projectQuery, e);  //$NON-NLS-1$
 		}
 		return null;
 	}

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/constants/MCConstants.java

@@ -111,6 +111,7 @@ private MCConstants() {}
 			DOCKERFILE_BUILD = "Dockerfile-build",
 
 			QUERY_NEW_PROJECT = "new-project",
+			QUERY_IMPORT_PROJECT = "import-project",
 			VALUE_TRUE = "true",
 
 			QUERY_PROJECT = "project",

dev/com.ibm.microclimate.ui/plugin.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018 IBM Corporation and others.
+# Copyright (c) 2018, 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
@@ -18,7 +18,8 @@ Bundle-Name = Microclimate UI Plugin
 ACTION_REFRESH=Re&fresh
 
 ACTION_OPEN_MICROCLIMATE_UI=Open Microclimate &UI
-ACTION_CREATE_NEW_PROJECT=Create New &Project
+ACTION_CREATE_NEW_PROJECT=Open Create &Project Page
+ACTION_IMPORT_PROJECT=Open &Import Project Page
 ACTION_REMOVE_CONNECTION=&Remove Connection
 
 ACTION_OPEN_APP=&Open Application
@@ -36,10 +37,6 @@ ACTION_OPEN_APP_OVERVIEW=Open Project O&verview
 PREFS_PARENT_PAGE_NAME=Microclimate
 PREFS_CONNECTION_PAGE_NAME=Microclimate Connections
 
-MICROCLIMATE_SERVER_ID=microclimate.server
-
-SERVER_DECORATOR_LABEL=Microclimate Server
-
 MICROCLIMATE_CATEGORY_NAME=Microclimate
 MICROCLIMATE_VIEW_NAME=Microclimate Explorer
 NAVIGATOR_CONTENT_NAME=Microclimate Navigator Content

dev/com.ibm.microclimate.ui/plugin.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-    Copyright (c) 2018 IBM Corporation and others.
+    Copyright (c) 2018, 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
@@ -210,6 +210,13 @@
 				menubarPath="group.additions"
 				label="%ACTION_REMOVE_CONNECTION"
 				class="com.ibm.microclimate.ui.internal.actions.RemoveConnectionAction"/>
+			<action
+				id="com.ibm.microclimate.ui.importProject"
+				enablesFor="1"
+				menubarPath="group.new"
+				icon="%DEFAULT_ICON_PATH"
+				label="%ACTION_IMPORT_PROJECT"
+				class="com.ibm.microclimate.ui.internal.actions.OpenMicroclimateUIAction"/>
 			<action
 				id="com.ibm.microclimate.ui.createNewProject"
 				enablesFor="1"

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/actions/OpenMicroclimateUIAction.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 IBM Corporation and others.
+ * Copyright (c) 2018, 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
@@ -35,6 +35,7 @@
 public class OpenMicroclimateUIAction implements IObjectActionDelegate {
 
 	private final String CREATE_NEW_PROJECT_ID = "com.ibm.microclimate.ui.createNewProject";
+	private final String IMPORT_PROJECT_ID = "com.ibm.microclimate.ui.importProject";
 
     protected MicroclimateConnection connection;
 
@@ -75,6 +76,8 @@ public void run(IAction action) {
 			URI uri = null;
 			if (CREATE_NEW_PROJECT_ID.equals(action.getId())) {
 				uri = connection.getNewProjectURI();
+			} else if (IMPORT_PROJECT_ID.equals(action.getId())) {
+				uri = connection.getImportProjectURI();
 			}
 			if (uri == null) {
 				uri = connection.baseUrl;

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

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2018 IBM Corporation and others.
+# Copyright (c) 2018, 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
@@ -44,7 +44,7 @@ StartBuildAction_AlreadyBuildingMsg=The project {0} is already building. Wait fo
 MicroclimateConnectionLabel=MicroclimateConnection:
 MicroclimateDisconnected=Disconnected. Check that Microclimate is running.
 MicroclimateProjectDisabled=Disabled
-MicroclimateConnectionNoProjects=No projects. Right click and select Create New Project.
+MicroclimateConnectionNoProjects=No projects. Right click and select Open Create Project Page.
 
 RestartInDebugMode=&Restart in Debug Mode
 RestartInRunMode=&Restart in Run Mode