Changes to link UI with back-end for listing discovered and added servers

Signed-off-by: Shireesh Anjal <shireesh@gluster.com>

7 files changed, 7 insertions, 128 deletions

diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
index 3a35fa89..92553797 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/DiskTableLabelProvider.java
@@ -79,7 +79,7 @@ public class DiskTableLabelProvider extends TableLabelProviderAdapter {
 		}
 
 		Disk disk = (Disk) element;
-		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServer().getName()
+		return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? getDiskSpace(disk)
 				: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? getDiskSpaceInUse(disk)
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
index 344b2ce7..399cdc65 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/VolumeLogTableLabelProvider.java
@@ -29,7 +29,7 @@ public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 	
 	private String getFormattedDiskName(Disk disk) {
-		return disk.getServer().getName() + ":" + disk.getName();
+		return disk.getServerName() + ":" + disk.getName();
 	}
 
 	@Override
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeDisksPage.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeDisksPage.java
index 841eb574..44d1d8c3 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeDisksPage.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/CreateVolumeDisksPage.java
@@ -70,7 +70,7 @@ public class CreateVolumeDisksPage extends Composite {
 				}
 
 				Disk disk = (Disk) element;
-				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServer().getName()
+				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? NumberUtil.formatNumber(disk.getSpace())
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_USED.ordinal() ? NumberUtil.formatNumber(disk.getSpaceInUse()) 
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
index c496ce3f..7dc0b03d 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/MigrateDiskPage1.java
@@ -65,7 +65,7 @@ public class MigrateDiskPage1 extends WizardPage {
 				}
 
 				Disk disk = (Disk) element;
-				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServer().getName()
+				return (columnIndex == DISK_TABLE_COLUMN_INDICES.SERVER.ordinal() ? disk.getServerName()
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.DISK.ordinal() ? disk.getName()
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE.ordinal() ? NumberUtil.formatNumber(disk.getSpace())
 						: columnIndex == DISK_TABLE_COLUMN_INDICES.SPACE_IN_USE.ordinal() ? NumberUtil.formatNumber(disk.getSpaceInUse()) 
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
index 86525823..c312e34b 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/dialogs/SelectDisksDialog.java
@@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 
-import com.gluster.storage.management.core.model.GlusterDummyModel;
+import com.gluster.storage.management.client.GlusterDataModelManager;
 
 public class SelectDisksDialog extends Dialog {
 
@@ -56,7 +56,7 @@ public class SelectDisksDialog extends Dialog {
 		container.setLayoutData(containerLayoutData);
 
 		getShell().setText("Create Volume - Select Disks");
-		CreateVolumeDisksPage disksPage = new CreateVolumeDisksPage(container, SWT.NONE, GlusterDummyModel
+		CreateVolumeDisksPage disksPage = new CreateVolumeDisksPage(container, SWT.NONE, GlusterDataModelManager
 				.getInstance().getReadyDisksOfAllServers());
 
 		return container;
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/PieChartViewerComposite.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/PieChartViewerComposite.java
index 67f046b4..80c9c807 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/PieChartViewerComposite.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/PieChartViewerComposite.java
@@ -82,7 +82,7 @@ public final class PieChartViewerComposite extends Composite implements
 	 *            Values of each category in the pie chart Constructs a pie
 	 *            chart viewer composite for given categories and values
 	 */
-	PieChartViewerComposite(Composite parent, int style, String[] categories,
+	public PieChartViewerComposite(Composite parent, int style, String[] categories,
 			Double[] values) {
 		super(parent, style);
 		try {
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/navigator/RootAdapter.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/navigator/RootAdapter.java
deleted file mode 100644
index 52f7ee3d..00000000
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/navigator/RootAdapter.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.gui.views.navigator;
-
-import java.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.gui.Application;
-import com.gluster.storage.management.gui.IImageKeys;
-
-public class RootAdapter implements IWorkbenchAdapter {
-	public enum NODE_TYPE {
-		CLUSTER, SERVERS, VOLUMES, GSN
-	};
-
-	private Cluster cluster;
-	private static final String LABEL_SERVERS = "Servers";
-	private static final String LABEL_VOLUMES = "Volumes";
-	private static final String LABEL_GSN = "GSN";
-
-	public RootAdapter(Cluster cluster) {
-		this.cluster = cluster;
-	}
-
-	@Override
-	public Object getParent(Object o) {
-		return cluster;
-	}
-
-	@Override
-	public String getLabel(Object o) {
-		switch (getNodeType(o)) {
-		case CLUSTER:
-			return cluster.getName();
-		case VOLUMES:
-			return LABEL_VOLUMES;
-		case SERVERS:
-			return LABEL_SERVERS;
-		case GSN:
-			return LABEL_GSN;
-		default:
-			return null;
-		}
-	}
-
-	private NODE_TYPE getNodeType(Object obj) {
-		if(obj instanceof Cluster) {
-			return NODE_TYPE.CLUSTER;
-		}
-		
-		if (obj instanceof String) {
-			return NODE_TYPE.GSN;
-		}
-
-		if (obj instanceof List) {
-			List<? extends Entity> list = (List<? extends Entity>) obj;
-			if (list.size() == 0) {
-				return null;
-			}
-			Entity firstEntity = list.get(0);
-			return ((firstEntity instanceof Volume) ? NODE_TYPE.VOLUMES
-					: NODE_TYPE.SERVERS);
-		}
-
-		return null;
-	}
-
-	@Override
-	public ImageDescriptor getImageDescriptor(Object object) {
-		String iconPath = null;
-		switch (getNodeType(object)) {
-		case CLUSTER:
-			iconPath = IImageKeys.CLUSTER;
-		case VOLUMES:
-			iconPath = IImageKeys.VOLUMES;
-		case SERVERS:
-			iconPath = IImageKeys.SERVERS;
-		case GSN:
-			iconPath = IImageKeys.GSN;
-		}
-		return AbstractUIPlugin.imageDescriptorFromPlugin(
-				Application.PLUGIN_ID, iconPath);
-	}
-
-	@Override
-	public Object[] getChildren(Object o) {
-		/*switch (getNodeType(o)) {
-		case CLUSTER:
-			return new Object[] {cluster.getVolumes(), cluster.getServers(), "GSN"};
-		case VOLUMES:
-			return cluster.getVolumes().toArray();
-		case GLUSTER_SERVERS:
-			return cluster.getServers().toArray();
-		default:
-			return null;
-		}*/
-		return null;
-	}
-}