Story#15 - Volume options

9 files changed, 406 insertions, 34 deletions

diff --git a/src/com.gluster.storage.management.gui/icons/reset-options.png b/src/com.gluster.storage.management.gui/icons/reset-options.png
new file mode 100644
index 00000000..7b93eb05
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/icons/reset-options.png
diff --git a/src/com.gluster.storage.management.gui/plugin.xml b/src/com.gluster.storage.management.gui/plugin.xml
index f5ab3db7..97a60ad1 100644
--- a/src/com.gluster.storage.management.gui/plugin.xml
+++ b/src/com.gluster.storage.management.gui/plugin.xml
@@ -223,6 +223,12 @@
       </command>
       <command
             categoryId="com.gluster.storage.management.gui.category"
+            description="Reset all options of a Volume"
+            id="com.gluster.storage.management.gui.commands.ResetVolumeOptions"
+            name="Reset Options">
+      </command>
+      <command
+            categoryId="com.gluster.storage.management.gui.category"
             description="Rebalance Volume"
             id="com.gluster.storage.management.gui.commands.RebalanceVolume"
             name="Rebalance Volume">
@@ -320,6 +326,11 @@
             id="com.gluster.storage.management.gui.KeyConfig"
             name="Gluster">
       </scheme>
+      <key
+            commandId="com.gluster.storage.management.gui.commands.ResetVolumeOptions"
+            schemeId="com.gluster.storage.management.gui.KeyConfig"
+            sequence="CTRL+SHIFT+O">
+      </key>
    </extension>
    <extension
          id="product"
@@ -504,6 +515,22 @@
          </action>
          <action
                allowLabelUpdate="false"
+               class="com.gluster.storage.management.gui.actions.ResetVolumeOptionsAction"
+               definitionId="com.gluster.storage.management.gui.commands.ResetVolumeOptions"
+               icon="icons/reset-options.png"
+               id="com.gluster.storage.management.gui.actions.ResetVolumeOptionsAction"
+               label="Reset &amp;Options"
+               menubarPath="com.gluster.storage.management.gui.menu.volume/volume"
+               mode="FORCE_TEXT"
+               pulldown="false"
+               retarget="false"
+               state="false"
+               style="push"
+               toolbarPath="Normal"
+               tooltip="Reset all options of the volume">
+         </action>
+         <action
+               allowLabelUpdate="false"
                class="com.gluster.storage.management.gui.actions.RebalanceVolumeAction"
                definitionId="com.gluster.storage.management.gui.commands.RebalanceVolume"
                icon="icons/volume-rebalance.png"
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java
new file mode 100644
index 00000000..9f77fb27
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/actions/ResetVolumeOptionsAction.java
@@ -0,0 +1,64 @@
+package com.gluster.storage.management.gui.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
+
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.model.Status;
+import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+
+public class ResetVolumeOptionsAction extends AbstractActionDelegate {
+	private Volume volume;
+	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
+
+	@Override
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	protected void performAction(IAction action) {
+		final String actionDesc = action.getDescription();
+
+		boolean confirmed = showConfirmDialog(actionDesc,
+				"Are you sure you want to reset all options of the volume [" + volume.getName() + "] ?");
+		if (!confirmed) {
+			return;
+		}
+
+		final Status status = resetVolumeOptions();
+		if (status.isSuccess()) {
+			showInfoDialog(actionDesc, "Volume options for [" + volume.getName() + "] reset successfully!");
+			modelManager.updateVolumeStatus(volume, VOLUME_STATUS.OFFLINE);
+		} else {
+			showErrorDialog(actionDesc, "Volume options for [" + volume.getName() + "] could not be reset! Error: [" + status
+					+ "]");
+		}
+	}
+	
+	private Status resetVolumeOptions() {
+		return new VolumesClient(modelManager.getSecurityToken()).resetVolumeOptions(volume.getName());
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * com.gluster.storage.management.gui.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * , org.eclipse.jface.viewers.ISelection)
+	 */
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		super.selectionChanged(action, selection);
+
+		if (selectedEntity instanceof Volume) {
+			volume = (Volume) selectedEntity;
+			action.setEnabled(volume.getOptions().size() > 0);
+		}
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
index a1be243d..b955f0e3 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/login/LoginDialog.java
@@ -193,16 +193,15 @@ public class LoginDialog extends Dialog {
 		String password = connectionDetails.getPassword();
 
 		UsersClient usersClient = new UsersClient();
-		if (usersClient.authenticate(user, password)) {
+		if (usersClient.authenticate(user, password).isSuccess()) {
 			try {
 				GlusterDataModelManager.getInstance().initializeModel(usersClient.getSecurityToken());
 				super.okPressed();
-			} catch (GlusterRuntimeException e) {
+			} catch (Exception e) {
 				setReturnCode(RETURN_CODE_ERROR);
 				MessageDialog.openError(getShell(), "Initialization Error", e.getMessage());
 				close();
 			}
-
 		} else {
 			MessageDialog.openError(getShell(), "Authentication Failed", "Invalid User ID or password");
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GUIHelper.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GUIHelper.java
index ccd5d8ec..9f5fdfb7 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GUIHelper.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/utils/GUIHelper.java
@@ -36,7 +36,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.TableViewerColumn;
-import org.eclipse.jface.viewers.TreeSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
@@ -57,6 +56,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchSite;
+import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.events.ExpansionAdapter;
 import org.eclipse.ui.forms.events.ExpansionEvent;
@@ -64,9 +64,9 @@ import org.eclipse.ui.forms.widgets.ColumnLayout;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.progress.IProgressConstants;
 
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
+import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.gui.IImageKeys;
 import com.gluster.storage.management.gui.views.NavigationView;
 
@@ -360,4 +360,14 @@ public class GUIHelper {
 		}
 		return null;
 	}
+	
+	public void showProgressView() {
+		try {
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+					.showView(IProgressConstants.PROGRESS_VIEW_ID);
+		} catch (PartInitException e) {
+			e.printStackTrace();
+			throw new GlusterRuntimeException("Could not open the progress view!", e);
+		}
+	}
 }
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractDisksPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractDisksPage.java
index e00fe3f8..593f7ba1 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractDisksPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/AbstractDisksPage.java
@@ -276,13 +276,7 @@ public abstract class AbstractDisksPage extends Composite implements IEntityList
 		@Override
 		public void linkActivated(HyperlinkEvent e) {
 			updateStatus(DISK_STATUS.INITIALIZING, true);
-
-			try {
-				site.getWorkbenchWindow().getActivePage().showView(IProgressConstants.PROGRESS_VIEW_ID);
-			} catch (PartInitException e1) {
-				e1.printStackTrace();
-				throw new GlusterRuntimeException("Could not open the progress view!", e1);
-			}
+			guiHelper.showProgressView();
 
 			new InitializeDiskJob(disk).schedule();
 		}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionKeyEditingSupport.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionKeyEditingSupport.java
new file mode 100644
index 00000000..56f25997
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionKeyEditingSupport.java
@@ -0,0 +1,86 @@
+/**
+ * 
+ */
+package com.gluster.storage.management.gui.views.details;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewer;
+import org.eclipse.jface.viewers.ComboBoxCellEditor;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.swt.widgets.Composite;
+
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.VolumeOptionInfo;
+
+/**
+ * Editing support for the "value" column in volume options table viewer.
+ */
+public class OptionKeyEditingSupport extends EditingSupport {
+	private CellEditor cellEditor;
+	private Volume volume;
+	private List<VolumeOptionInfo> defaults = GlusterDataModelManager.getInstance().getVolumeOptionsDefaults();
+	private String[] allowedKeys;
+
+	public OptionKeyEditingSupport(ColumnViewer viewer, Volume volume) {
+		super(viewer);
+		this.volume = volume;
+		allowedKeys = getAllowedKeys();
+		this.cellEditor = new ComboBoxCellEditor((Composite) viewer.getControl(), allowedKeys);
+	}
+
+	/**
+	 * @return array of option keys that are not already set on the volume
+	 */
+	private String[] getAllowedKeys() {
+		ArrayList<String> keys = new ArrayList<String>();
+		Map<String, String> volumeOptions = volume.getOptions();
+		for(VolumeOptionInfo optionInfo : defaults) {
+			String optionName = optionInfo.getName();
+			if(!volumeOptions.containsKey(optionName)) {
+				keys.add(optionName);
+			}
+		}
+		return keys.toArray(new String[0]);
+	}
+	
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void setValue(final Object element, final Object value) {
+		Integer newValue = (Integer)value;
+		String newKey = allowedKeys[newValue];
+		
+		if (((Entry<String, String>)element).getKey().equals(newKey)) {
+			// selected value is same as old one.
+			return;
+		}
+
+		// value has changed. set volume option at back-end and update model accordingly
+		volume.getOptions().remove("");
+		volume.setOption(newKey, "");
+		getViewer().refresh();
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected Object getValue(Object element) {
+		return cellEditor.getValue();
+	}
+
+	@Override
+	protected CellEditor getCellEditor(Object element) {
+		return cellEditor;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected boolean canEdit(Object element) {
+		Entry<String, String> entry = (Entry<String, String>)element;
+		return (entry.getKey().isEmpty() || entry.getValue().isEmpty()); 
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java
new file mode 100644
index 00000000..f975f1ff
--- /dev/null
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/OptionValueEditingSupport.java
@@ -0,0 +1,103 @@
+/**
+ * 
+ */
+package com.gluster.storage.management.gui.views.details;
+
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnViewer;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.model.Status;
+import com.gluster.storage.management.core.model.Volume;
+import com.gluster.storage.management.core.model.VolumeOptionInfo;
+
+/**
+ * Editing support for the "value" column in volume options table viewer.
+ */
+public class OptionValueEditingSupport extends EditingSupport {
+	private CellEditor cellEditor;
+	private Volume volume;
+	private List<VolumeOptionInfo> defaults = GlusterDataModelManager.getInstance().getVolumeOptionsDefaults();
+
+	public OptionValueEditingSupport(ColumnViewer viewer, Volume volume) {
+		super(viewer);
+		this.volume = volume;
+		this.cellEditor = new TextCellEditor((Composite) viewer.getControl());
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected void setValue(final Object element, final Object value) {
+		final Entry<String, String> entry = (Entry<String, String>) element;
+
+		// It is not allowed to change value to empty string
+		if(((String)value).isEmpty()) {
+			MessageDialog.openError(Display.getDefault().getActiveShell(), "Set Volume Option",
+					"Option value can't be empty! Please enter a valid value.");
+			cellEditor.setFocus();
+			return;
+		}
+
+		if (entry.getValue().equals(value)) {
+			// value is same as that present in the model. return without doing anything.
+			return;
+		}
+		
+		// value has changed. set volume option at back-end and update model accordingly
+		BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
+
+			@Override
+			public void run() {
+				VolumesClient client = new VolumesClient(GlusterDataModelManager.getInstance().getSecurityToken());
+				Status status = client.setVolumeOption(volume.getName(), entry.getKey(), (String) value);
+				if (status.isSuccess()) {
+					volume.setOption(entry.getKey(), (String) value);
+				} else {
+					MessageDialog.openError(Display.getDefault().getActiveShell(), "Set Volume Option",
+							status.getMessage());
+				}
+				getViewer().update(entry, null);
+			}
+		});
+	}
+
+	/**
+	 * @param key Key whose default value is to be fetched
+	 * @return Default value of the volume option with given key
+	 */
+	private String getDefaultValue(String key) {
+		for(VolumeOptionInfo optionInfo : defaults) {
+			if(optionInfo.getName().equals(key)) {
+				return optionInfo.getDefaultValue();
+			}
+		}
+		return "";
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	protected Object getValue(Object element) {
+		Entry<String, String> entry = (Entry<String, String>) element;
+		return entry.getValue().isEmpty() ? getDefaultValue(entry.getKey()) : entry.getValue();
+	}
+
+	@Override
+	protected CellEditor getCellEditor(Object element) {
+		return cellEditor;
+	}
+
+	@Override
+	protected boolean canEdit(Object element) {
+		return true;
+	}
+}
diff --git a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
index baa14a59..349c638a 100644
--- a/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
+++ b/src/com.gluster.storage.management.gui/src/com/gluster/storage/management/gui/views/details/VolumeOptionsPage.java
@@ -18,19 +18,36 @@
  *******************************************************************************/
 package com.gluster.storage.management.gui.views.details;
 
+import java.util.Map.Entry;
+
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.ColumnLayoutData;
+import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.EditingSupport;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TableViewerColumn;
+import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
@@ -38,6 +55,9 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
+import com.gluster.storage.management.client.GlusterDataModelManager;
+import com.gluster.storage.management.client.VolumesClient;
+import com.gluster.storage.management.core.model.Status;
 import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.gui.VolumeOptionsTableLabelProvider;
 import com.gluster.storage.management.gui.utils.GUIHelper;
@@ -47,6 +67,7 @@ public class VolumeOptionsPage extends Composite {
 	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 	private TableViewer tableViewer;
 	private GUIHelper guiHelper = GUIHelper.getInstance();
+	private Volume volume;
 
 	public enum OPTIONS_TABLE_COLUMN_INDICES {
 		OPTION_KEY, OPTION_VALUE
@@ -54,29 +75,55 @@ public class VolumeOptionsPage extends Composite {
 
 	private static final String[] OPTIONS_TABLE_COLUMN_NAMES = new String[] { "Option Key", "Option Value" };
 
-	public VolumeOptionsPage(Composite parent, int style) {
+	public VolumeOptionsPage(final Composite parent, int style, Volume volume) {
 		super(parent, style);
-		addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
-				toolkit.dispose();
-			}
-		});
-
+		
+		this.volume = volume;
 		toolkit.adapt(this);
 		toolkit.paintBordersFor(this);
 
 		setupPageLayout();
 		Text filterText = guiHelper.createFilterText(toolkit, this);
 		setupDiskTableViewer(filterText);
-	}
-
-	public VolumeOptionsPage(final Composite parent, int style, Volume volume) {
-		this(parent, style);
+		
+		createAddButton();
 
-		tableViewer.setInput(volume.getOptions().entrySet().toArray());
+		tableViewer.setInput(volume.getOptions().entrySet());
 		
 		parent.layout(); // Important - this actually paints the table
 
+		registerListeners(parent);
+	}
+
+	private void createAddButton() {
+		Button addButton = toolkit.createButton(this, "&Add", SWT.FLAT);
+		addButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				volume.setOption("", "");
+				
+				tableViewer.refresh();
+				tableViewer.setSelection(new StructuredSelection(getEntry("")));
+			}
+
+			private Entry getEntry(String key) {
+				for(Entry entry : volume.getOptions().entrySet()) {
+					if(entry.getKey().equals(key)) {
+						return entry;
+					}
+				}
+				return null;
+			}
+		});
+	}
+
+	private void registerListeners(final Composite parent) {
+		addDisposeListener(new DisposeListener() {
+			public void widgetDisposed(DisposeEvent e) {
+				toolkit.dispose();
+			}
+		});
+
 		/**
 		 * Ideally not required. However the table viewer is not getting laid out properly on performing
 		 * "maximize + restore" So this is a hack to make sure that the table is laid out again on re-size of the window
@@ -88,7 +135,6 @@ public class VolumeOptionsPage extends Composite {
 				parent.layout();
 			}
 		});
-
 	}
 
 	private void setupPageLayout() {
@@ -98,26 +144,69 @@ public class VolumeOptionsPage extends Composite {
 		setLayout(layout);
 	}
 
-	private void setupDiskTable(Composite parent, Table table) {
+	private void setupDiskTable(Composite parent) {
+		Table table = tableViewer.getTable();
 		table.setHeaderVisible(true);
 		table.setLinesVisible(false);
 
-		TableColumnLayout tableColumnLayout = guiHelper.createTableColumnLayout(table, OPTIONS_TABLE_COLUMN_NAMES);
+		TableColumnLayout tableColumnLayout = createTableColumnLayout();
 		parent.setLayout(tableColumnLayout);
 
 		setColumnProperties(table, OPTIONS_TABLE_COLUMN_INDICES.OPTION_KEY, SWT.CENTER, 100);
 		setColumnProperties(table, OPTIONS_TABLE_COLUMN_INDICES.OPTION_VALUE, SWT.CENTER, 100);
 	}
+	
+	private TableColumnLayout createTableColumnLayout() {
+		TableColumnLayout tableColumnLayout = new TableColumnLayout();
+		ColumnLayoutData defaultColumnLayoutData = new ColumnWeightData(100);
 
-	private TableViewer createDiskTableViewer(Composite parent) {
-		TableViewer tableViewer = CheckboxTableViewer.newCheckList(parent, SWT.FLAT | SWT.FULL_SELECTION | SWT.MULTI);
+		tableColumnLayout.setColumnData(createKeyColumn(), defaultColumnLayoutData);
+		tableColumnLayout.setColumnData(createValueColumn(), defaultColumnLayoutData);
+
+		return tableColumnLayout;
+	}
+	
+	private TableColumn createValueColumn() {
+		TableViewerColumn valueColumn = new TableViewerColumn(tableViewer, SWT.NONE);
+		valueColumn.getColumn()
+				.setText(OPTIONS_TABLE_COLUMN_NAMES[OPTIONS_TABLE_COLUMN_INDICES.OPTION_VALUE.ordinal()]);
+		valueColumn.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return ((Entry<String, String>) element).getValue();
+			}
+		});
+		
+		// User can edit value of a volume option
+		valueColumn.setEditingSupport(new OptionValueEditingSupport(valueColumn.getViewer(), volume));
+		
+		return valueColumn.getColumn();
+	}
+
+	private TableColumn createKeyColumn() {
+		TableViewerColumn keyColumn = new TableViewerColumn(tableViewer, SWT.NONE);
+		keyColumn.getColumn().setText(OPTIONS_TABLE_COLUMN_NAMES[OPTIONS_TABLE_COLUMN_INDICES.OPTION_KEY.ordinal()]);
+		keyColumn.setLabelProvider(new ColumnLabelProvider() {
+			@Override
+			public String getText(Object element) {
+				return ((Entry<String, String>) element).getKey();
+			}
+		});
+		
+		// Editing support required when adding new key
+		keyColumn.setEditingSupport(new OptionKeyEditingSupport(keyColumn.getViewer(), volume));
+		
+		return keyColumn.getColumn();
+	}
+
+	private void createDiskTableViewer(Composite parent) {
+		//tableViewer = CheckboxTableViewer.newCheckList(parent, SWT.FLAT | SWT.FULL_SELECTION | SWT.MULTI);
+		tableViewer = new TableViewer(parent, SWT.FLAT | SWT.FULL_SELECTION | SWT.SINGLE);
 		// TableViewer tableViewer = new TableViewer(parent, SWT.FLAT | SWT.FULL_SELECTION | SWT.MULTI);
 		tableViewer.setLabelProvider(new VolumeOptionsTableLabelProvider());
 		tableViewer.setContentProvider(new ArrayContentProvider());
 
-		setupDiskTable(parent, tableViewer.getTable());
-
-		return tableViewer;
+		setupDiskTable(parent);
 	}
 
 	private Composite createTableViewerComposite() {
@@ -129,7 +218,7 @@ public class VolumeOptionsPage extends Composite {
 
 	private void setupDiskTableViewer(final Text filterText) {
 		Composite tableViewerComposite = createTableViewerComposite();
-		tableViewer = createDiskTableViewer(tableViewerComposite);
+		createDiskTableViewer(tableViewerComposite);
 		// Create a case insensitive filter for the table viewer using the filter text field
 		guiHelper.createFilter(tableViewer, filterText, false);
 	}