From 35efcd3b07f1cc445da9abc19227aa35bb5f439b Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Thu, 8 Sep 2011 20:07:06 +0530 Subject: Moved to eclipse 3.7 (indigo) --- src/com.gluster.storage.management.console/plugin.xml | 10 ++++++++-- .../console/actions/AbstractActionDelegate.java | 17 ++--------------- .../console/actions/DownloadVolumeLogsAction.java | 2 -- 3 files changed, 10 insertions(+), 19 deletions(-) (limited to 'src/com.gluster.storage.management.console') diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml index f7f644a5..3cb0e1e3 100644 --- a/src/com.gluster.storage.management.console/plugin.xml +++ b/src/com.gluster.storage.management.console/plugin.xml @@ -296,6 +296,12 @@ id="com.gluster.storage.management.console.commands.Terminal" name="Terminal"> + + @@ -345,7 +351,7 @@ sequence="CTRL+SHIFT+M"> @@ -1109,7 +1115,7 @@ Date: Fri, 9 Sep 2011 14:21:29 +0530 Subject: Corrected the disabled icon for "clear task" --- .../icons/tango/32x32/clear-task-disabled.png | Bin 0 -> 1416 bytes src/com.gluster.storage.management.console/plugin.xml | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png (limited to 'src/com.gluster.storage.management.console') diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png new file mode 100644 index 00000000..af8884e3 Binary files /dev/null and b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png differ diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml index 3cb0e1e3..e7c2c2d4 100644 --- a/src/com.gluster.storage.management.console/plugin.xml +++ b/src/com.gluster.storage.management.console/plugin.xml @@ -950,7 +950,7 @@ allowLabelUpdate="false" class="com.gluster.storage.management.console.actions.ClearTaskAction" definitionId="com.gluster.storage.management.console.commands.Clear" - disabledIcon="icons/tango/32x32/create-volume-disabled.png" + disabledIcon="icons/tango/32x32/clear-task-disabled.png" icon="icons/tango/32x32/clear-task.png" id="com.gluster.storage.management.console.actions.Clear" label="&Clear Task" -- cgit From d30bb2f75086fe788f4af0a646e98ebf2bf2f40f Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Mon, 12 Sep 2011 11:26:13 +0530 Subject: Revert "Modified to show success/error dialog using Display.asyncExec" This reverts commit 4234869fd2ef5df138a27443f5f923a3540b0013. --- .../console/actions/DownloadVolumeLogsAction.java | 23 +++++++++------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/com.gluster.storage.management.console') diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java index edf09f33..81abb01f 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java @@ -39,28 +39,23 @@ public class DownloadVolumeLogsAction extends AbstractActionDelegate { @Override protected void performAction(IAction action) { final VolumesClient client = new VolumesClient(); - final Volume volume = guiHelper.getSelectedEntity(getWindow(), Volume.class); + Volume volume = guiHelper.getSelectedEntity(getWindow(), Volume.class); FileDialog dialog = new FileDialog(getShell(), SWT.SAVE); dialog.setFilterNames(new String[] { "GZipped Tar (*.tar.gz)" }); dialog.setFilterExtensions(new String[] { "*.tar.gz" }); - final String filePath = dialog.open(); + String filePath = dialog.open(); if (filePath == null) { return; } - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - String title = "Download Volume Logs [" + volume.getName() + "]"; - try { - client.downloadLogs(volume.getName(), filePath); - showInfoDialog(title, "Volume logs downloaded successfully to [" + filePath + "]"); - } catch (Exception e) { - showErrorDialog(title, e.getMessage()); - } - } - }); + String title = "Download Volume Logs [" + volume.getName() + "]"; + try { + client.downloadLogs(volume.getName(), filePath); + showInfoDialog(title, "Volume logs downloaded successfully to [" + filePath + "]"); + } catch (Exception e) { + showErrorDialog(title, e.getMessage()); + } } } -- cgit From 1bf322500c6d9ecd3f74b5bbc26d0332353be74e Mon Sep 17 00:00:00 2001 From: Shireesh Anjal Date: Wed, 21 Sep 2011 11:50:50 +0530 Subject: Removed unnecessary imports --- .../storage/management/console/actions/AbstractActionDelegate.java | 1 - .../gluster/storage/management/console/actions/ExportSshKeysAction.java | 2 -- .../storage/management/console/actions/RebalanceVolumeAction.java | 1 - .../gluster/storage/management/console/dialogs/CreateVolumeWizard.java | 1 - .../gluster/storage/management/console/dialogs/MigrateBrickPage1.java | 1 - .../gluster/storage/management/console/views/ClusterSummaryView.java | 2 +- .../storage/management/console/views/pages/AbstractDisksPage.java | 1 - 7 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src/com.gluster.storage.management.console') diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java index 0893952f..29481286 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java @@ -22,7 +22,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java index ac61709d..51cf49c1 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java @@ -22,8 +22,6 @@ package com.gluster.storage.management.console.actions; import org.eclipse.jface.action.IAction; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.BusyIndicator; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.FileDialog; import com.gluster.storage.management.client.KeysClient; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java index aeed223f..5ae93ede 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java @@ -21,7 +21,6 @@ package com.gluster.storage.management.console.actions; import java.net.URI; import org.eclipse.jface.action.IAction; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; import com.gluster.storage.management.client.TasksClient; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java index 87f8ccd4..227c60b7 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java @@ -29,7 +29,6 @@ import com.gluster.storage.management.console.IImageKeys; import com.gluster.storage.management.console.utils.GUIHelper; import com.gluster.storage.management.console.utils.GlusterLogger; import com.gluster.storage.management.core.constants.CoreConstants; -import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.Volume; import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS; import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java index 2f271186..0dc06f6d 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java @@ -49,7 +49,6 @@ import com.gluster.storage.management.console.TableLabelProviderAdapter; import com.gluster.storage.management.console.utils.GUIHelper; import com.gluster.storage.management.core.model.Brick; import com.gluster.storage.management.core.model.Device; -import com.gluster.storage.management.core.model.Entity; import com.gluster.storage.management.core.model.Volume; import com.gluster.storage.management.core.utils.NumberUtil; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java index 48cec9f8..6187d5ad 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java @@ -47,9 +47,9 @@ import com.gluster.storage.management.console.IImageKeys; import com.gluster.storage.management.console.actions.ActionConstants; import com.gluster.storage.management.console.preferences.PreferenceConstants; import com.gluster.storage.management.console.utils.ChartUtil; +import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener; import com.gluster.storage.management.console.utils.ChartViewerComposite; import com.gluster.storage.management.console.utils.GUIHelper; -import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener; import com.gluster.storage.management.core.constants.CoreConstants; import com.gluster.storage.management.core.constants.GlusterConstants; import com.gluster.storage.management.core.model.Alert; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java index 9fefc034..43853752 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java @@ -53,7 +53,6 @@ import com.gluster.storage.management.core.model.Disk; import com.gluster.storage.management.core.model.Entity; import com.gluster.storage.management.core.model.Event; import com.gluster.storage.management.core.model.Event.EVENT_TYPE; -import com.gluster.storage.management.core.model.GlusterDataModel; import com.gluster.storage.management.core.model.GlusterServer; import com.gluster.storage.management.core.model.Status; import com.gluster.storage.management.core.model.TaskInfo; -- cgit