Removed preferred network feature

4 files changed, 24 insertions, 24 deletions

diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java
index c07a6c8e..3fc2dfa0 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/GlusterServerTableLabelProvider.java
@@ -64,7 +64,7 @@ public class GlusterServerTableLabelProvider extends TableLabelProviderAdapter {
 		
 		return (columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.NAME.ordinal() ? server.getName()
 			: columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.STATUS.ordinal() ? server.getStatusStr()
-			: columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK.ordinal() ? server.getPreferredNetworkInterface().getName()
+			// : columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK.ordinal() ? server.getPreferredNetworkInterface().getName()
 			: columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS.ordinal() ? "" + server.getNumOfCPUs()
 			//: columnIndex == SERVER_DISK_TABLE_COLUMN_INDICES.CPU_USAGE.ordinal() ? "" + server.getCpuUsage()
 			: columnIndex == GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY.ordinal() ? "" + server.getTotalMemory()
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java
index 98da1019..d7b700d4 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/NetworkInterfaceTableLabelProvider.java
@@ -34,7 +34,7 @@ public class NetworkInterfaceTableLabelProvider extends TableLabelProviderAdapte
 			: columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.IP_ADDRESS.ordinal() ? networkInterface.getIpAddress()
 			: columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.NETMASK.ordinal() ? networkInterface.getNetMask()
 			: columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.GATEWAY.ordinal() ? networkInterface.getDefaultGateway()
-			: columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED.ordinal() ? (networkInterface.isPreferred() ? "Yes" : "No")
+			// : columnIndex == NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED.ordinal() ? (networkInterface.isPreferred() ? "Yes" : "No")
 			: "Invalid");
 	}
 }
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java
index c8b33f83..01766115 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/GlusterServersPage.java
@@ -51,11 +51,11 @@ public class GlusterServersPage extends Composite {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
 
 	public enum GLUSTER_SERVER_TABLE_COLUMN_INDICES {
-		NAME, PREFERRED_NETWORK, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_DISK_SPACE, STATUS
+		NAME, IP_ADDRESSES, NUM_OF_CPUS, TOTAL_MEMORY, TOTAL_DISK_SPACE, STATUS // Removed PREFERRED_NETWORK 
 	};
 
-	private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", "Preferred\nNetwork",
-			"IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Total Disk\n Space (GB)", "Status" };
+	private static final String[] GLUSTER_SERVER_TABLE_COLUMN_NAMES = new String[] { "Name", 
+			"IP Address(es)", "Number\nof CPUs", "Total\nMemory (GB)", "Total Disk\n Space (GB)", "Status" }; // Removed "Preferred\nNetwork", 
 
 	public GlusterServersPage(Composite parent, int style) {
 		super(parent, style);
@@ -112,7 +112,7 @@ public class GlusterServersPage extends Composite {
 
 		setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.NAME, SWT.CENTER, 100);
 		setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.STATUS, SWT.CENTER, 70);
-		setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK, SWT.CENTER, 90);
+		// setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.PREFERRED_NETWORK, SWT.CENTER, 90);
 		setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.NUM_OF_CPUS, SWT.CENTER, 90);
 		//setColumnProperties(table, SERVER_DISK_TABLE_COLUMN_INDICES.CPU_USAGE, SWT.CENTER, 90);
 		setColumnProperties(table, GLUSTER_SERVER_TABLE_COLUMN_INDICES.TOTAL_MEMORY, SWT.CENTER, 90);
diff --git a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java
index 4f97290d..e1aa59ff 100644
--- a/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java
+++ b/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/tabcreators/GlusterServerTabCreator.java
@@ -58,18 +58,18 @@ import com.richclientgui.toolbox.gauges.CoolGauge;
 
 public class GlusterServerTabCreator implements TabCreator {
 	public enum NETWORK_INTERFACE_TABLE_COLUMN_INDICES {
-		INTERFACE, IP_ADDRESS, NETMASK, GATEWAY, PREFERRED
+		INTERFACE, IP_ADDRESS, NETMASK, GATEWAY
 	};
 
 	private static final String[] NETWORK_INTERFACE_TABLE_COLUMN_NAMES = { "Interface", "IP Address", "Netmask",
-			"Gateway", "Preferred?" };
+			"Gateway" };
 	private static final GUIHelper guiHelper = GUIHelper.getInstance();
 
 	private void createServerSummarySection(GlusterServer server, FormToolkit toolkit, final ScrolledForm form) {
 		Composite section = guiHelper.createSection(form, toolkit, "Summary", null, 2, false);
 
-		toolkit.createLabel(section, "Preferred Network: ", SWT.NONE);
-		toolkit.createLabel(section, server.getPreferredNetworkInterface().getName(), SWT.NONE);
+//		toolkit.createLabel(section, "Preferred Network: ", SWT.NONE);
+//		toolkit.createLabel(section, server.getPreferredNetworkInterface().getName(), SWT.NONE);
 
 		boolean online = server.getStatus() == SERVER_STATUS.ONLINE;
 
@@ -171,7 +171,7 @@ public class GlusterServerTabCreator implements TabCreator {
 		setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.IP_ADDRESS, SWT.CENTER, 100);
 		setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.NETMASK, SWT.CENTER, 70);
 		setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.GATEWAY, SWT.CENTER, 70);
-		setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED, SWT.CENTER, 70);
+		// setColumnProperties(table, NETWORK_INTERFACE_TABLE_COLUMN_INDICES.PREFERRED, SWT.CENTER, 70);
 	}
 
 	/**
@@ -217,19 +217,19 @@ public class GlusterServerTabCreator implements TabCreator {
 	private Composite createNetworkInterfacesSection(GlusterServer server, FormToolkit toolkit, ScrolledForm form) {
 		final Composite section = guiHelper.createSection(form, toolkit, "Network Interfaces", null, 1, false);
 		createNetworkInterfacesTableViewer(createTableViewerComposite(section), server);
-		Hyperlink changePreferredNetworkLink = toolkit.createHyperlink(section, "Change Preferred Network", SWT.NONE);
-		changePreferredNetworkLink.addHyperlinkListener(new HyperlinkAdapter() {
-
-			@Override
-			public void linkActivated(HyperlinkEvent e) {
-				new MessageDialog(
-						section.getShell(),
-						"Gluster Storage Platform",
-						guiHelper.getImage(IImageKeys.SERVER),
-						"This will show additional controls to help user choose a new network interface. TO BE IMPLEMENTED.",
-						MessageDialog.INFORMATION, new String[] { "OK" }, 0).open();
-			}
-		});
+//		Hyperlink changePreferredNetworkLink = toolkit.createHyperlink(section, "Change Preferred Network", SWT.NONE);
+//		changePreferredNetworkLink.addHyperlinkListener(new HyperlinkAdapter() {
+//
+//			@Override
+//			public void linkActivated(HyperlinkEvent e) {
+//				new MessageDialog(
+//						section.getShell(),
+//						"Gluster Storage Platform",
+//						guiHelper.getImage(IImageKeys.SERVER),
+//						"This will show additional controls to help user choose a new network interface. TO BE IMPLEMENTED.",
+//						MessageDialog.INFORMATION, new String[] { "OK" }, 0).open();
+//			}
+//		});
 		return section;
 	}