Modified to open cluster selection dialog based on preference settings

3 files changed, 66 insertions, 57 deletions

diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
index ae2ead0c..e5d58ca4 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterDataModelManager.java
@@ -81,25 +81,6 @@ public class GlusterDataModelManager {
 		return instance;
 	}
 
-	public void initializeModelWithNewCluster(String securityToken, String clusterName) {
-		model = new GlusterDataModel("Gluster Data Model");
-		setSecurityToken(securityToken);
-		setClusterName(clusterName);
-
-		Cluster cluster = new Cluster(clusterName, model);
-
-		cluster.setServers(new ArrayList<GlusterServer>());
-		cluster.setVolumes(new ArrayList<Volume>());
-
-		initializeAutoDiscoveredServers(cluster);
-		// initializeDisks();
-
-		initializeRunningTasks(cluster);
-		initializeAlerts(cluster);
-
-		model.addCluster(cluster);
-	}
-
 	public void initializeModel(String securityToken, String clusterName) {
 		model = new GlusterDataModel("Gluster Data Model");
 		setSecurityToken(securityToken);
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
index 9db0f0e8..0fe13dd2 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/LoginDialog.java
@@ -24,6 +24,8 @@ import java.util.List;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.beans.PojoProperties;
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.databinding.swt.SWTObservables;
 import org.eclipse.jface.databinding.swt.WidgetProperties;
 import org.eclipse.jface.dialogs.Dialog;
@@ -50,8 +52,10 @@ import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.ConnectionDetails;
 import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.response.StringListResponse;
+import com.gluster.storage.management.gui.Application;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
+import com.gluster.storage.management.gui.preferences.PreferenceConstants;
 import com.gluster.storage.management.gui.utils.GUIHelper;
 import com.gluster.storage.management.gui.validators.StringRequiredValidator;
 
@@ -202,49 +206,46 @@ public class LoginDialog extends Dialog {
 		UsersClient usersClient = new UsersClient();
 		Status loginStatus = usersClient.authenticate(user, password); 
 		if (loginStatus.isSuccess()) {
+			// authentication successful. close the login dialog and open the next one.
 			close();
+			
 			ClustersClient clustersClient = new ClustersClient(usersClient.getSecurityToken());
-			List<String> clusterNames = getClusterNames(clustersClient);
-			ClusterSelectionDialog clusterDialog = new ClusterSelectionDialog(getParentShell(),
-					clusterNames);
-			int userAction = clusterDialog.open();
-			if (userAction == Window.CANCEL) {
-				MessageDialog.openError(getShell(), "Login Cancelled",
-						"User cancelled login at cluster selection. Application will close!");
-				cancelPressed();
-				return;
+
+			IEclipsePreferences preferences = new ConfigurationScope().getNode(Application.PLUGIN_ID);
+			boolean showClusterSelectionDialog = preferences.getBoolean(PreferenceConstants.P_SHOW_CLUSTER_SELECTION_DIALOG, true);
+
+			String clusterName = null; 
+			if(!showClusterSelectionDialog) {
+				clusterName = preferences.get(PreferenceConstants.P_DEFAULT_CLUSTER_NAME, null);
+				if(clusterName == null || clusterName.isEmpty()) {
+					// Cluster name not available in preferences. Hence we must show the cluster selection dialog.
+					showClusterSelectionDialog = true;
+				}
 			}
 			
-			try {
-				CLUSTER_MODE mode = clusterDialog.getClusterMode();
-				String clusterName = clusterDialog.getClusterName();
-				GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-				Status status = null;
-				switch(mode) {
-				case SELECT:
-					modelManager.initializeModel(usersClient.getSecurityToken(), clusterName);
-					break;
-				case CREATE:
-					status = clustersClient.createCluster(clusterName);
-					if(!status.isSuccess()) {
-						MessageDialog.openError(getShell(), "Cluster Creation Failed!", status.toString());
-						setReturnCode(RETURN_CODE_ERROR);
-						return;
-					}
-					modelManager.initializeModelWithNewCluster(usersClient.getSecurityToken(), clusterName);
-					break;
-				case REGISTER:
-					status = clustersClient.registerCluster(clusterName, clusterDialog.getServerName());
-					if(!status.isSuccess()) {
-						MessageDialog.openError(getShell(), "Cluster Registration Failed!", status.toString());
-						setReturnCode(RETURN_CODE_ERROR);
-						return;
-					}
-					modelManager.initializeModel(usersClient.getSecurityToken(), clusterName);
-					break;
+			CLUSTER_MODE mode;
+			String serverName = null;
+
+			if (showClusterSelectionDialog) {
+				ClusterSelectionDialog clusterDialog = new ClusterSelectionDialog(getParentShell(), getClusterNames(clustersClient));
+				int userAction = clusterDialog.open();
+				if (userAction == Window.CANCEL) {
+					MessageDialog.openError(getShell(), "Login Cancelled",
+							"User cancelled login at cluster selection. Application will close!");
+					cancelPressed();
+					return;
 				}
-				super.okPressed();
-					
+				mode = clusterDialog.getClusterMode();
+				clusterName = clusterDialog.getClusterName();
+				serverName = clusterDialog.getServerName();
+			} else {
+				mode = CLUSTER_MODE.SELECT;
+			}
+			
+			try {
+				createOrRegisterCluster(clustersClient, clusterName, serverName, mode);
+				GlusterDataModelManager.getInstance().initializeModel(usersClient.getSecurityToken(), clusterName);
+				super.okPressed();					
 			} catch (Exception e) {
 				setReturnCode(RETURN_CODE_ERROR);
 				MessageDialog.openError(getShell(), "Initialization Error", e.getMessage());
@@ -255,6 +256,30 @@ public class LoginDialog extends Dialog {
 		}
 	}
 
+	public void createOrRegisterCluster(ClustersClient clustersClient, String clusterName, String serverName,
+			CLUSTER_MODE mode) {
+		Status status = null;
+		String errTitle = null;
+		
+		switch(mode) {
+		case SELECT:
+			return;
+		case CREATE:
+			errTitle = "Cluster Creation Failed!";
+			status = clustersClient.createCluster(clusterName);
+			break;
+		case REGISTER:
+			errTitle = "Cluster Registration Failed!";
+			status = clustersClient.registerCluster(clusterName, serverName);
+			break;
+		}
+		
+		if(!status.isSuccess()) {
+			MessageDialog.openError(getShell(), errTitle, status.toString());
+			setReturnCode(RETURN_CODE_ERROR);
+		}
+	}
+
 	private List<String> getClusterNames(ClustersClient clustersClient) {
 		StringListResponse clustersResponse = clustersClient.getClusters();
 		List<String> clusters = new ArrayList<String>();
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
index a8826772..8b5a8cfd 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/preferences/PreferenceConstants.java
@@ -22,6 +22,9 @@ package com.gluster.storage.management.gui.preferences;
  * Constant definitions for plug-in preferences
  */
 public class PreferenceConstants {
+	
+	public static final String P_SHOW_CLUSTER_SELECTION_DIALOG = "show.cluster.selection.dialog";
+	public static final String P_DEFAULT_CLUSTER_NAME = "default.cluster.name";
 
 	// TODO: Remove after proper preferences are added
 	public static final String P_PATH = "pathPreference";