Modified not to fetch volume options info if the cluster is empty. Removed class VolumeOptionsDefaults and moved its logic to VolumeService.

4 files changed, 17 insertions, 10 deletions

diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
index 917497e5..82a24209 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
@@ -67,7 +67,7 @@ public class GlusterDataModelManager {
 	private GlusterDataModel model;
 	private String securityToken;
 	private List<ClusterListener> listeners = new ArrayList<ClusterListener>();
-	private List<VolumeOptionInfo> volumeOptionsDefaults;
+	private List<VolumeOptionInfo> volumeOptionsInfo;
 	private String clusterName;
  	private static Boolean syncInProgress = false;
  	private static final GlusterLogger logger = GlusterLogger.getInstance();;
@@ -109,7 +109,7 @@ public class GlusterDataModelManager {
 		GlusterDataModel model = fetchModel(monitor);
 		
 		initializeAlerts(model.getCluster());
-		initializeVolumeOptionsDefaults();
+		initializeVolumeOptionsInfo(model.getCluster());
 
 		return model;
 	}
@@ -452,8 +452,12 @@ public class GlusterDataModelManager {
 		cluster.setVolumes(volumeClient.getAllVolumes());
 	}
 
-	private void initializeVolumeOptionsDefaults() {
-		this.volumeOptionsDefaults = new VolumesClient(clusterName).getVolumeOptionsDefaults();
+	private void initializeVolumeOptionsInfo(Cluster cluster) {
+		if(cluster.getServers().isEmpty()) {
+			// cluster is empty. we won't be able to fetch the volume options information.
+			return;
+		}
+		this.volumeOptionsInfo = new VolumesClient(clusterName).getVolumeOptionsInfo();
 	}
 
 	private void initializeTasks(Cluster cluster) {
@@ -878,12 +882,15 @@ public class GlusterDataModelManager {
 		}
 	}
 	
-	public List<VolumeOptionInfo> getVolumeOptionsDefaults() {
-		return volumeOptionsDefaults;
+	public List<VolumeOptionInfo> getVolumeOptionsInfo() {
+		if(volumeOptionsInfo == null || volumeOptionsInfo.isEmpty()) {
+			initializeVolumeOptionsInfo(getModel().getCluster());
+		}
+		return volumeOptionsInfo;
 	}
 
 	public VolumeOptionInfo getVolumeOptionInfo(String optionKey) {
-		for (VolumeOptionInfo info : volumeOptionsDefaults) {
+		for (VolumeOptionInfo info : volumeOptionsInfo) {
 			if (info.getName().equals(optionKey)) {
 				return info;
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
index 393b4f28..ed6aea64 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
@@ -25,7 +25,7 @@ import com.gluster.storage.management.core.model.VolumeOptions;
 public class OptionKeyEditingSupport extends EditingSupport {
 	private CellEditor cellEditor;
 	private Volume volume;
-	private List<VolumeOptionInfo> defaults = GlusterDataModelManager.getInstance().getVolumeOptionsDefaults();
+	private List<VolumeOptionInfo> defaults = GlusterDataModelManager.getInstance().getVolumeOptionsInfo();
 	private String[] allowedKeys;
 	private ColumnViewer viewer;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
index 6bce3997..faf4fbe6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
@@ -27,7 +27,7 @@ import com.gluster.storage.management.core.model.VolumeOptionInfo;
 public class OptionValueEditingSupport extends EditingSupport {
 	private CellEditor cellEditor;
 	private Volume volume;
-	private List<VolumeOptionInfo> defaults = GlusterDataModelManager.getInstance().getVolumeOptionsDefaults();
+	private List<VolumeOptionInfo> defaults = GlusterDataModelManager.getInstance().getVolumeOptionsInfo();
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 
 	public OptionValueEditingSupport(ColumnViewer viewer, Volume volume) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
index 57ecb615..dd02a672 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
+++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
@@ -70,7 +70,7 @@ public class VolumeOptionsPage extends Composite {
 	private DefaultClusterListener clusterListener;
 	private Text filterText;
 	private List<VolumeOptionInfo> defaultVolumeOptions = GlusterDataModelManager.getInstance()
-			.getVolumeOptionsDefaults();
+			.getVolumeOptionsInfo();
 
 	public enum OPTIONS_TABLE_COLUMN_INDICES {
 		OPTION_KEY, OPTION_VALUE