[jbosstools-commits] JBoss Tools SVN: r28834 - in trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools: internal/deltacloud/ui/wizards and 1 other directory.

Author: adietish Date: 2011-02-01 12:24:20 -0500 (Tue, 01 Feb 2011) New Revision: 28834 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java Log: [JBIDE-8148] moved cloud creation and cloud edit to background jobs Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-02-01 17:11:20 UTC (rev 28833) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/cloudelements/AbstractCloudElementTableView.java 2011-02-01 17:24:20 UTC (rev 28834) @@ -241,7 +241,7 @@ } protected abstract ITableContentAndLabelProvider<CLOUDELEMENT> getContentAndLabelProvider(); - + private void setViewerInput(DeltaCloud cloud) { viewer.setInput(cloud); } @@ -306,9 +306,10 @@ return clouds[cloudIndex]; } - private void createColumns(ITableContentAndLabelProvider<CLOUDELEMENT> provider, TableColumnLayout tableLayout, Table table) { + private void createColumns(ITableContentAndLabelProvider<CLOUDELEMENT> provider, TableColumnLayout tableLayout, + Table table) { Columns<CLOUDELEMENT> columns = provider.getColumns(); - + for (int i = 0; i < columns.getSize(); ++i) { Column<CLOUDELEMENT> c = columns.getColumn(i); TableColumn tc = new TableColumn(table, SWT.NONE); @@ -373,27 +374,33 @@ container.layout(true, true); } - public void cloudsChanged(int type, DeltaCloud cloud) { - DeltaCloud[] clouds = getClouds(); - switch (type) { - case IDeltaCloudManagerListener.REMOVE_EVENT: - onCloudRemoved(cloud, clouds); - break; - default: - } - - int index = getCloudIndex(currentCloud, clouds); - String[] cloudNames = toCloudNames(clouds); - setCloudSelectorItems(cloudNames, currentCloudSelector); + public void cloudsChanged(final int type, final DeltaCloud cloud) { + UIUtils.getActiveShell().getDisplay().syncExec(new Runnable() { - if (cloudNames.length > 0) { - currentCloudSelector.setText(cloudNames[index]); - setViewerInput(currentCloud); - } else { - currentCloudSelector.setText(""); - setViewerInput(null); + @Override + public void run() { + DeltaCloud[] clouds = getClouds(); + switch (type) { + case IDeltaCloudManagerListener.REMOVE_EVENT: + onCloudRemoved(cloud, clouds); + break; + default: + } + + int index = getCloudIndex(currentCloud, clouds); + String[] cloudNames = toCloudNames(clouds); + setCloudSelectorItems(cloudNames, currentCloudSelector); + + if (cloudNames.length > 0) { + currentCloudSelector.setText(cloudNames[index]); + setViewerInput(currentCloud); + } else { + currentCloudSelector.setText(""); + setViewerInput(null); + } + container.layout(true, true); } - container.layout(true, true); + }); } private void onCloudRemoved(DeltaCloud cloud, DeltaCloud[] clouds) { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-02-01 17:11:20 UTC (rev 28833) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-02-01 17:24:20 UTC (rev 28834) @@ -62,7 +62,7 @@ }; try { WizardUtils.runInWizard(job, getContainer()); - return job.getResult().getCode() != IStatus.ERROR; + return job.getResult() != null && job.getResult().getCode() != IStatus.ERROR; } catch (Exception e) { return false; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-02-01 17:11:20 UTC (rev 28833) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-02-01 17:24:20 UTC (rev 28834) @@ -142,7 +142,7 @@ }; try { WizardUtils.runInWizard(job, getContainer()); - return job.getResult().getCode() != IStatus.ERROR; + return job.getResult() != null && job.getResult().getCode() != IStatus.ERROR; } catch (Exception e) { return false; }