From b7116e8ac18641215337d5691cb50b6706f0e91f Mon Sep 17 00:00:00 2001 From: Dhandapani Date: Wed, 8 Jun 2011 11:59:15 +0530 Subject: Bug 2881 - "Add" button should get disabled once all the Volume options are selected --- .../gui/views/details/VolumeOptionsPage.java | 148 ++++++++++++++------- 1 file changed, 103 insertions(+), 45 deletions(-) (limited to 'src') 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 3e8e8baa..cc37270b 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,6 +18,7 @@ *******************************************************************************/ package com.gluster.storage.management.gui.views.details; +import java.util.List; import java.util.Map.Entry; import org.apache.commons.lang.WordUtils; @@ -68,19 +69,22 @@ public class VolumeOptionsPage extends Composite { private Volume volume; private DefaultClusterListener clusterListener; private Text filterText; + private List defaultVolumeOptions = GlusterDataModelManager.getInstance() + .getVolumeOptionsDefaults(); public enum OPTIONS_TABLE_COLUMN_INDICES { OPTION_KEY, OPTION_VALUE }; private static final String[] OPTIONS_TABLE_COLUMN_NAMES = new String[] { "Option Key", "Option Value" }; - private Button addButton; + private Button addTopButton; + private Button addBottomButton; private TableViewerColumn keyColumn; private OptionKeyEditingSupport keyEditingSupport; public VolumeOptionsPage(final Composite parent, int style, Volume volume) { super(parent, style); - + this.volume = volume; toolkit.adapt(this); @@ -88,52 +92,102 @@ public class VolumeOptionsPage extends Composite { setupPageLayout(); filterText = guiHelper.createFilterText(toolkit, this); - createAddButton(); - setupOptionsTableViewer(filterText); - createAddButton(); + createAddButtonOnTop(); + setupOptionsTableViewer(filterText); + + createAddButtonOnBottom(); + + if (defaultVolumeOptions.size() == volume.getOptions().size()) { + enableOrDisableButtons(false); + } tableViewer.setInput(volume.getOptions().entrySet()); - + parent.layout(); // Important - this actually paints the table registerListeners(parent); } - private void createAddButton() { - addButton = toolkit.createButton(this, "&Add", SWT.FLAT); - addButton.addSelectionListener(new SelectionAdapter() { + private void createAddButtonOnTop() { + addTopButton = toolkit.createButton(this, "&Add", SWT.FLAT); + addTopButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { // add an empty option to be filled up by user volume.setOption("", ""); - + tableViewer.refresh(); tableViewer.setSelection(new StructuredSelection(getEntry(""))); - keyColumn.getViewer().editElement(getEntry(""), 0); // edit newly created entry - + keyColumn.getViewer().editElement(getEntry(""), 0); // edit newly created entry + // disable the add button AND search filter textbox till user fills up the new option - addButton.setEnabled(false); + enableOrDisableButtons(false); filterText.setEnabled(false); } private Entry getEntry(String key) { - for(Entry entry : volume.getOptions().entrySet()) { - if(entry.getKey().equals(key)) { + for (Entry entry : volume.getOptions().entrySet()) { + if (entry.getKey().equals(key)) { return entry; } } return null; } }); - + + // Make sure that add button is enabled only when search filter textbox is empty + filterText.addModifyListener(new ModifyListener() { + @Override + public void modifyText(ModifyEvent e) { + if (filterText.getText().length() > 0) { + enableOrDisableButtons(false); + } else { + enableOrDisableButtons(true); + } + } + }); + } + + private void enableOrDisableButtons(boolean flag) { + addTopButton.setEnabled(flag); + addBottomButton.setEnabled(flag); + } + + private void createAddButtonOnBottom() { + addBottomButton = toolkit.createButton(this, "&Add", SWT.FLAT); + addBottomButton.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + // add an empty option to be filled up by user + volume.setOption("", ""); + + tableViewer.refresh(); + tableViewer.setSelection(new StructuredSelection(getEntry(""))); + keyColumn.getViewer().editElement(getEntry(""), 0); // edit newly created entry + + // disable the add button AND search filter textbox till user fills up the new option + enableOrDisableButtons(false); + filterText.setEnabled(false); + } + + private Entry getEntry(String key) { + for (Entry entry : volume.getOptions().entrySet()) { + if (entry.getKey().equals(key)) { + return entry; + } + } + return null; + } + }); + // Make sure that add button is enabled only when search filter textbox is empty filterText.addModifyListener(new ModifyListener() { @Override public void modifyText(ModifyEvent e) { - if(filterText.getText().length() > 0) { - addButton.setEnabled(false); + if (filterText.getText().length() > 0) { + enableOrDisableButtons(false); } else { - addButton.setEnabled(true); + enableOrDisableButtons(true); } } }); @@ -142,7 +196,7 @@ public class VolumeOptionsPage extends Composite { private void registerListeners(final Composite parent) { addDisposeListener(new DisposeListener() { public void widgetDisposed(DisposeEvent e) { - if(!addButton.isEnabled()) { + if (!(addTopButton.isEnabled() || addBottomButton.isEnabled())) { // user has selected key, but not added value. Since this is not a valid entry, // remove the last option (without value) from the volume volume.getOptions().remove(keyEditingSupport.getEntryBeingAdded().getKey()); @@ -164,12 +218,12 @@ public class VolumeOptionsPage extends Composite { parent.layout(); } }); - + parent.addDisposeListener(new DisposeListener() { - + @Override public void widgetDisposed(DisposeEvent e) { - if(!addButton.isEnabled()) { + if (!(addTopButton.isEnabled() || addBottomButton.isEnabled())) { // user has selected key, but not added value. Since this is not a valid entry, // remove the last option (without value) from the volume Entry entryBeingAdded = keyEditingSupport.getEntryBeingAdded(); @@ -178,27 +232,31 @@ public class VolumeOptionsPage extends Composite { } }); - clusterListener = new DefaultClusterListener() { @SuppressWarnings("unchecked") @Override public void volumeChanged(Volume volume, Event event) { super.volumeChanged(volume, event); - if(event.getEventType() == EVENT_TYPE.VOLUME_OPTIONS_RESET) { - if(!tableViewer.getControl().isDisposed()) { + if (event.getEventType() == EVENT_TYPE.VOLUME_OPTIONS_RESET) { + if (!tableViewer.getControl().isDisposed()) { tableViewer.refresh(); } } - - if(event.getEventType() == EVENT_TYPE.VOLUME_OPTION_SET) { - Entry eventEntry = (Entry)event.getEventData(); + + if (event.getEventType() == EVENT_TYPE.VOLUME_OPTION_SET) { + Entry eventEntry = (Entry) event.getEventData(); if (isNewOption(volume, eventEntry.getKey())) { - // option has been set successfully by the user. re-enable the add button and search filter textbox - addButton.setEnabled(true); + // option has been set successfully by the user. re-enable the add button and search filter + // textbox + enableOrDisableButtons(true); filterText.setEnabled(true); } - if(tableViewer.getTable().getItemCount() < volume.getOptions().size()) { + if (defaultVolumeOptions.size() == volume.getOptions().size()) { + enableOrDisableButtons(false); + } + + if (tableViewer.getTable().getItemCount() < volume.getOptions().size()) { // new volume set from outside this page. refresh the viewer. tableViewer.refresh(); } else { @@ -209,14 +267,14 @@ public class VolumeOptionsPage extends Composite { } private boolean isNewOption(Volume volume, String optionKey) { - if(filterText.getText().length() > 0) { + if (filterText.getText().length() > 0) { // user has been filtering the contents. adding new option is allowed only when contents are NOT // filtered. Thus it's impossible that this is a newly added option return false; } - + // if this is the last option in the volume options, it must be the new option - return optionKey.equals(volume.getOptions().keySet().toArray()[volume.getOptions().size()-1]); + return optionKey.equals(volume.getOptions().keySet().toArray()[volume.getOptions().size() - 1]); } }; GlusterDataModelManager.getInstance().addClusterListener(clusterListener); @@ -240,7 +298,7 @@ public class VolumeOptionsPage extends Composite { 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); @@ -250,7 +308,7 @@ public class VolumeOptionsPage extends Composite { return tableColumnLayout; } - + private TableColumn createValueColumn() { TableViewerColumn valueColumn = new TableViewerColumn(tableViewer, SWT.NONE); valueColumn.getColumn() @@ -262,10 +320,10 @@ public class VolumeOptionsPage extends Composite { return ((Entry) element).getValue(); } }); - + // User can edit value of a volume option valueColumn.setEditingSupport(new OptionValueEditingSupport(valueColumn.getViewer(), volume)); - + return valueColumn.getColumn(); } @@ -278,26 +336,26 @@ public class VolumeOptionsPage extends Composite { public String getText(Object element) { return ((Entry) element).getKey(); } - + @SuppressWarnings("unchecked") @Override public String getToolTipText(Object element) { String key = ((Entry) element).getKey(); - if(key.isEmpty()) { + if (key.isEmpty()) { return "Click to select a volume option key"; } - + VolumeOptionInfo optionInfo = GlusterDataModelManager.getInstance().getVolumeOptionInfo(key); - // Wrap the description before adding to tooltip so that long descriptions are displayed properly + // Wrap the description before adding to tooltip so that long descriptions are displayed properly return WordUtils.wrap(optionInfo.getDescription(), 60) + CoreConstants.NEWLINE + "Default value: " + optionInfo.getDefaultValue(); } }); - + // Editing support required when adding new key keyEditingSupport = new OptionKeyEditingSupport(keyColumn.getViewer(), volume); keyColumn.setEditingSupport(keyEditingSupport); - + return keyColumn.getColumn(); } -- cgit