diff options
author | Selvasundaram <selvam@gluster.com> | 2011-09-09 14:50:19 +0530 |
---|---|---|
committer | Selvasundaram <selvam@gluster.com> | 2011-09-09 14:50:19 +0530 |
commit | 7a457286e33620c838ef5e87b8db5f4ba0ec22f6 (patch) | |
tree | 76a5753e079b3c8c477bfc09422a7a8a1bbcd013 /src/com.gluster.storage.management.console/src | |
parent | a8ae219a2652a51c69f8651ee4aac91d058979f6 (diff) | |
parent | ed353681543956ec09c9ef6652d3ccb77cff96b2 (diff) |
Merge branch '1.0.0' of github.com:gluster/console
Diffstat (limited to 'src/com.gluster.storage.management.console/src')
4 files changed, 4 insertions, 19 deletions
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java index c9995517..fcbe3fcf 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java @@ -78,7 +78,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { } private void setupBackgroundJobs() { - syncJob = new DataSyncJob("Retrieving Management Information"); + syncJob = new DataSyncJob("Retrieving Management Info"); syncJob.schedule(JOB_INTERVAL); syncJob.addJobChangeListener(new JobChangeAdapter() { @Override 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 9a5a3437..0893952f 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 @@ -46,25 +46,12 @@ public abstract class AbstractActionDelegate implements IWorkbenchWindowActionDe @Override public void run(final IAction action) { - // Real action code must be executed using Display#asyncExec. - // Otherwise the system can hang when opening new dialog boxes on linux platform try { - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - performAction(action); - } - }); + performAction(action); } catch (final Exception e) { final String actionDesc = action.getDescription(); logger.error("Exception while running action [" + actionDesc + "]", e); - - Display.getDefault().asyncExec(new Runnable() { - @Override - public void run() { - showErrorDialog(actionDesc, e.getMessage()); - } - }); + showErrorDialog(actionDesc, e.getMessage()); } } 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 8a42951a..edf09f33 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 @@ -20,8 +20,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.VolumesClient; diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java index 49b4f7d0..4d492f8d 100644 --- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java +++ b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java @@ -38,6 +38,6 @@ public class RefreshDataAction extends AbstractActionDelegate { */ @Override protected void performAction(IAction action) { - new DataSyncJob("Retrieving Management Information").schedule(); + new DataSyncJob("Retrieving Management Info").schedule(); } } |