diff options
10 files changed, 56 insertions, 59 deletions
diff --git a/src/com.gluster.storage.management.console.feature.webstart/feature.xml b/src/com.gluster.storage.management.console.feature.webstart/feature.xml index 94717400..24a76dc9 100644 --- a/src/com.gluster.storage.management.console.feature.webstart/feature.xml +++ b/src/com.gluster.storage.management.console.feature.webstart/feature.xml @@ -50,12 +50,12 @@ <import plugin="org.eclipse.jface.databinding" version="1.3.0" match="compatible"/> <import plugin="org.eclipse.core.databinding.property" version="1.2.0" match="compatible"/> <import plugin="org.eclipse.core.databinding.observable" version="1.2.0" match="compatible"/> - <import plugin="org.eclipse.osgi" version="3.5.0" match="compatible"/> <import plugin="org.eclipse.equinox.common" version="3.5.0" match="compatible"/> <import plugin="org.eclipse.core.jobs" version="3.2.0" match="compatible"/> - <import plugin="org.eclipse.equinox.preferences" version="3.3.0" match="compatible"/> <import plugin="org.eclipse.core.contenttype" version="3.3.0" match="compatible"/> - <import plugin="org.eclipse.equinox.app" version="1.0.0" match="compatible"/> + <import plugin="org.eclipse.osgi" version="3.7.0" match="compatible"/> + <import plugin="org.eclipse.equinox.preferences" version="3.4.0" match="compatible"/> + <import plugin="org.eclipse.equinox.app" version="1.0.0" match="greaterOrEqual"/> </requires> <plugin diff --git a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp b/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp index f87631df..3ac01605 100644 --- a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp +++ b/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp @@ -16,8 +16,8 @@ <all-permissions/> </security> <resources> - <j2se java-vm-args="-XstartOnFirstThread" version="1.5+" /> - <jar href="plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar" main="true"/> + <j2se java-vm-args="-XstartOnFirstThread" version="1.6+" /> + <jar href="plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar" main="true"/> <extension name="Gluster Management Console" href="com.gluster.storage.management.console.feature_1.0.0.jnlp"/> diff --git a/src/com.gluster.storage.management.console.feature/feature.xml b/src/com.gluster.storage.management.console.feature/feature.xml index fdafcd35..aaf4a08c 100644 --- a/src/com.gluster.storage.management.console.feature/feature.xml +++ b/src/com.gluster.storage.management.console.feature/feature.xml @@ -108,13 +108,6 @@ unpack="false"/> <plugin - id="org.eclipse.help" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.equinox.p2.metadata" download-size="0" install-size="0" @@ -786,27 +779,6 @@ version="0.0.0"/> <plugin - id="org.eclipse.help.ui" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.help.webapp" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin - id="org.eclipse.help.base" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.apache.lucene.analysis" download-size="0" install-size="0" @@ -932,4 +904,39 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.apache.lucene.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.help" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.help.base" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.help.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.help.webapp" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> 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 Binary files differnew file mode 100644 index 00000000..af8884e3 --- /dev/null +++ b/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/com.gluster.storage.management.console/plugin.xml index f7f644a5..e7c2c2d4 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"> </command> + <command + categoryId="com.gluster.storage.management.console.category" + description="Settings" + id="com.gluster.storage.management.console.commands.Preferences" + name="Settings"> + </command> </extension> <extension point="org.eclipse.ui.bindings"> @@ -345,7 +351,7 @@ sequence="CTRL+SHIFT+M"> </key> <key - commandId="org.eclipse.ui.window.preferences" + commandId="com.gluster.storage.management.console.commands.Preferences" schemeId="com.gluster.storage.management.console.KeyConfig" sequence="CTRL+SHIFT+P"> </key> @@ -944,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" @@ -1109,7 +1115,7 @@ <action allowLabelUpdate="false" class="com.gluster.storage.management.console.actions.PreferencesAction" - definitionId="org.eclipse.ui.window.preferences" + definitionId="com.gluster.storage.management.console.commands.Preferences" icon="icons/tango/32x32/settings.png" id="com.gluster.storage.management.console.actions.PreferencesAction" label="&Settings" 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(); } } diff --git a/src/com.gluster.storage.management.releng/gluster-management-console.target b/src/com.gluster.storage.management.releng/gluster-management-console.target index 0cf996d8..3fcae362 100644 --- a/src/com.gluster.storage.management.releng/gluster-management-console.target +++ b/src/com.gluster.storage.management.releng/gluster-management-console.target @@ -3,12 +3,11 @@ <target includeMode="feature" name="Gluster Storage Platform Target"> <locations> -<location path="target/com.gluster.storage.management.console.target/rcp.sdk.helios.SR1" type="Directory"/> <location path="target/com.gluster.storage.management.console.target/richclientgui.rcptoolbox" type="Directory"/> -<location path="target/com.gluster.storage.management.console.target/birt.charts.helios" type="Directory"/> -<location path="target/com.gluster.storage.management.console.target/delta.pack.helios" type="Directory"/> -<location path="target/com.gluster.storage.management.console.target/org.eclipse.help" type="Directory"/> <location path="target/com.gluster.storage.management.console.target/org.eclipse.tm.terminal" type="Directory"/> +<location path="target/com.gluster.storage.management.console.target/rcp.sdk.indigo" type="Directory"/> +<location path="target/com.gluster.storage.management.console.target/birt.charts.indigo" type="Directory"/> +<location path="target/com.gluster.storage.management.console.target/delta.pack.indigo" type="Directory"/> </locations> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> </target> |
