[jbosstools-commits] JBoss Tools SVN: r26742 - in trunk/deltacloud/plugins: org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core and 4 other directories.

Author: adietish Date: 2010-11-19 04:58:49 -0500 (Fri, 19 Nov 2010) New Revision: 26742 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.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/FindImagePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 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/NewInstanceModel.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java Log: [JBIDE-7663] removed loading images and instances on startup (is now done lazyly as soon as they're requested from the user) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-11-19 09:58:49 UTC (rev 26742) @@ -1,3 +1,8 @@ +2010-11-19 André Dietisheim <adietish(a)redhat.com&gt; + + * src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java (loadCloud): + [JBIDE-7663] removed loading of images and instances on startup + 2010-11-18 André Dietisheim <adietish(a)redhat.com&gt; * src/org/jboss/tools/deltacloud/core/ICloudManagerListener.java (cloudsChanged): Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloud.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -228,7 +228,7 @@ this.imageFilter = createImageFilter(ruleString); if (!rules.equals(ruleString)) { // save(); - notifyImageListListeners(getCurrImages()); + notifyImageListListeners(getImages()); } } @@ -422,7 +422,7 @@ } } - public DeltaCloudInstance[] getCurrInstances() throws DeltaCloudException { + public DeltaCloudInstance[] getInstances() throws DeltaCloudException { synchronized (instanceLock) { if (instances == null) { return loadInstances(); @@ -595,7 +595,7 @@ return deltaCloudImage; } - public DeltaCloudImage[] getCurrImages() throws DeltaCloudException { + public DeltaCloudImage[] getImages() throws DeltaCloudException { synchronized (imageLock) { if (images == null) { return loadImages(); @@ -656,7 +656,7 @@ if (instance != null) { DeltaCloudInstance newInstance = new DeltaCloudInstance(this, instance); newInstance.setGivenName(name); - getCurrInstances(); // make sure instances are initialized + getInstances(); // make sure instances are initialized instances.add(newInstance); notifyInstanceListListeners(); return newInstance; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/DeltaCloudManager.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -41,9 +41,9 @@ private DeltaCloudManager() { } - private List<DeltaCloud> loadClouds() throws DeltaCloudException { - List<DeltaCloud> clouds = new ArrayList<DeltaCloud>(); // clear present clouds - DeltaCloudMultiException connectionException = new DeltaCloudMultiException("Errors occurred while loading clouds from the preferences"); + private void loadClouds() throws DeltaCloudException { + this.clouds = new ArrayList<DeltaCloud>(); // clear present clouds + DeltaCloudMultiException connectionException = new DeltaCloudMultiException("Could not load some clouds"); IPath stateLocation = Activator.getDefault().getStateLocation(); File cloudFile = stateLocation.append(CLOUDFILE_NAME).toFile(); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -70,30 +70,31 @@ if (!connectionException.isEmpty()) { throw connectionException; } - return clouds; } private DeltaCloud loadCloud(Node n, List<DeltaCloud> clouds) throws DeltaCloudException { - NamedNodeMap attrs = n.getAttributes(); - String name = attrs.getNamedItem("name").getNodeValue(); // $NON-NLS-1$ - String url = attrs.getNamedItem("url").getNodeValue(); // $NON-NLS-1$ - String username = attrs.getNamedItem("username").getNodeValue(); // $NON-NLS-1$ - String type = attrs.getNamedItem("type").getNodeValue(); // $NON-NLS-1$ - String imageFilterRules = getImageFilterRules(attrs.getNamedItem("imagefilter")); // $NON-NLS-1$ - String instanceFilterRules = getInstanceFilterRules(attrs.getNamedItem("instancefilter")); // $NON-NLS-1$ - String lastKeyName = getLastKeyName(attrs.getNamedItem("lastkeyname")); // $NON-NLS-1$ - String lastImageId = getLastKeyName(attrs.getNamedItem("lastimage")); // $NON-NLS-1$ - DeltaCloud cloud = new DeltaCloud(name, url, username, type, imageFilterRules, instanceFilterRules); - clouds.add(cloud); - cloud.setLastImageId(lastImageId); - cloud.setLastKeyname(lastKeyName); + DeltaCloud cloud = null; + String name = ""; try { - cloud.loadChildren(); + NamedNodeMap attrs = n.getAttributes(); + name = attrs.getNamedItem("name").getNodeValue(); // $NON-NLS-1$ + String url = attrs.getNamedItem("url").getNodeValue(); // $NON-NLS-1$ + String username = attrs.getNamedItem("username").getNodeValue(); // $NON-NLS-1$ + String type = attrs.getNamedItem("type").getNodeValue(); // $NON-NLS-1$ + String imageFilterRules = getImageFilterRules(attrs.getNamedItem("imagefilter")); // $NON-NLS-1$ + String instanceFilterRules = getInstanceFilterRules(attrs.getNamedItem("instancefilter")); // $NON-NLS-1$ + String lastKeyName = getLastKeyName(attrs.getNamedItem("lastkeyname")); // $NON-NLS-1$ + String lastImageId = getLastKeyName(attrs.getNamedItem("lastimage")); // $NON-NLS-1$ + cloud = new DeltaCloud(name, url, username, type, imageFilterRules, instanceFilterRules); + clouds.add(cloud); + cloud.setLastImageId(lastImageId); + cloud.setLastKeyname(lastKeyName); + // cloud.loadChildren(); } catch (DeltaCloudException e) { throw e; } catch (Exception e) { // TODO: internationalize strings - throw new DeltaCloudException(MessageFormat.format("Could not load cloud {0} from preferences", name), e); + throw new DeltaCloudException(MessageFormat.format("Could not load cloud {0}", name), e); } return cloud; } @@ -172,11 +173,11 @@ private List<DeltaCloud> doGetClouds() throws DeltaCloudException { if (clouds == null) { - clouds = loadClouds(); + loadClouds(); } return clouds; } - + public DeltaCloud findCloud(String name) throws DeltaCloudException { for (DeltaCloud cloud : getClouds()) { if (cloud.getName().equals(name)) Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/ErrorUtils.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -24,7 +24,7 @@ * @author Andre Dietisheim */ public class ErrorUtils { - public static IStatus openErrorDialog(final String title, final String message, Throwable e, final Shell shell) { + public static IStatus handleError(final String title, final String message, Throwable e, final Shell shell) { IStatus status = createStatus(e); openErrorDialog(title, status, shell); return status; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/DisconnectCloudHandler.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -101,7 +101,7 @@ } } catch (DeltaCloudException e) { // TODO internationalize strings - ErrorUtils.openErrorDialog("Error", + ErrorUtils.handleError("Error", MessageFormat.format("Could not disconnect cloud {0}", deltaCloud.getName()), e, shell); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -12,16 +12,12 @@ import java.util.ArrayList; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.widgets.Display; -import org.jboss.tools.common.log.StatusFactory; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudImage; import org.jboss.tools.deltacloud.core.IImageFilter; import org.jboss.tools.deltacloud.core.IImageListListener; -import org.jboss.tools.deltacloud.ui.Activator; import org.jboss.tools.deltacloud.ui.ErrorUtils; public class CVImagesCategoryElement extends CVCategoryElement implements IImageListListener { @@ -74,13 +70,13 @@ if (!initialized) { DeltaCloud cloud = (DeltaCloud)getElement(); try { - DeltaCloudImage[] images = filter(cloud.getCurrImages()); + DeltaCloudImage[] images = filter(cloud.getImages()); cloud.removeImageListListener(this); addImages(images); initialized = true; cloud.addImageListListener(this); } catch (Exception e) { - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Colud not get images from cloud " + cloud.getName(), e, Display.getDefault().getActiveShell()); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -71,13 +71,13 @@ DeltaCloud cloud = (DeltaCloud) getElement(); try { cloud.removeInstanceListListener(this); - DeltaCloudInstance[] instances = filter(cloud.getCurrInstances()); + DeltaCloudInstance[] instances = filter(cloud.getInstances()); addInstances(instances); initialized = true; cloud.addInstanceListListener(this); } catch (Exception e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Colud not get instances from cloud " + cloud.getName(), e, Display.getDefault().getActiveShell()); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVRootElement.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -40,22 +40,23 @@ if (!initialized) { DeltaCloudManager m = DeltaCloudManager.getDefault(); m.removeCloudManagerListener(this); + DeltaCloud[] clouds = new DeltaCloud[] {}; try { - DeltaCloud[] clouds = m.getClouds(); - for (int i = 0; i < clouds.length; ++i) { - DeltaCloud cloud = clouds[i]; - CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer); - addChild(e); - } - m.addCloudManagerListener(this); - initialized = true; + clouds = m.getClouds(); } catch (DeltaCloudException e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not get all clouds", e, Display.getDefault().getActiveShell()); } + for (int i = 0; i < clouds.length; ++i) { + DeltaCloud cloud = clouds[i]; + CVCloudElement e = new CVCloudElement(cloud, cloud.getName(), viewer); + addChild(e); + } + m.addCloudManagerListener(this); + initialized = true; } return super.getChildren(); } @@ -86,7 +87,7 @@ }); } catch (DeltaCloudException e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not get all clouds", e, Display.getDefault().getActiveShell()); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageView.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -337,7 +337,7 @@ clouds = DeltaCloudManager.getDefault().getClouds(); } catch (DeltaCloudException e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not get all clouds", e, Display.getDefault().getActiveShell()); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -90,9 +90,9 @@ } else { cloud = (DeltaCloud) newInput; try { - images = filter(cloud.getCurrImages()); + images = filter(cloud.getImages()); } catch (Exception e) { - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not get images for cloud " + cloud.getName(), e, Display.getDefault().getActiveShell()); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstancePropertySource.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -144,7 +144,7 @@ } } } catch (DeltaCloudException e) { - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not get key for instance " + instance.getName(), e, Display.getDefault().getActiveShell()); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceView.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -205,7 +205,7 @@ clouds = DeltaCloudManager.getDefault().getClouds(); } catch (DeltaCloudException e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not get all clouds", e, Display.getDefault().getActiveShell()); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -86,13 +86,13 @@ } else { cloud = (DeltaCloud) newInput; try { - instances = filter(cloud.getCurrInstances()); + instances = filter(cloud.getInstances()); } catch (Exception e) { if (instances == null) { instances = new DeltaCloudInstance[]{}; } // TODO internationalize strings - ErrorUtils.openErrorDialog("Instance View Error", "Could not display instances for cloud " + cloud.getName(), + ErrorUtils.handleError("Instance View Error", "Could not display instances for cloud " + cloud.getName(), e, Display.getDefault().getActiveShell()); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/PerformDestroyInstanceActionThread.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -50,7 +50,7 @@ try { cloud.destroyInstance(instance.getId()); } catch (DeltaCloudException e) { - ErrorUtils.openErrorDialog("Error", + ErrorUtils.handleError("Error", MessageFormat.format("Could not destroy instance {0}", instance.getName()), e, Display.getDefault().getActiveShell()); } 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 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -51,7 +51,7 @@ cloud.getType(), this); addPage(mainPage); } catch (MalformedURLException e) { - ErrorUtils.openErrorDialog(WizardMessages.getString("EditCloudConnectionError.title"), + ErrorUtils.handleError(WizardMessages.getString("EditCloudConnectionError.title"), WizardMessages.getString("EditCloudConnectionError.message"), e, getShell()); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/FindImagePage.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -150,7 +150,7 @@ public void run() { try { contentProvider.setFilter(filter); - viewer.setInput(cloud.getCurrImages()); + viewer.setInput(cloud.getImages()); viewer.refresh(); } catch (Exception e) { IStatus status = StatusFactory.getInstance( Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/ImageFilter.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -41,7 +41,7 @@ DeltaCloudManager.getDefault().saveClouds(); } catch (Exception e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Cloud not get update filters on cloud " + cloud.getName(), e, getShell()); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/InstanceFilter.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -48,7 +48,7 @@ DeltaCloudManager.getDefault().saveClouds(); } catch (Exception e) { // TODO: internationalize strings - ErrorUtils.openErrorDialog( + ErrorUtils.handleError( "Error", "Could not update filters", e, Display.getDefault().getActiveShell()); } 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 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -55,7 +55,7 @@ return newCloud.testConnection(); } catch (DeltaCloudException e) { ErrorUtils - .openErrorDialog(WizardMessages.getString("CloudConnectionAuthError.title"), + .handleError(WizardMessages.getString("CloudConnectionAuthError.title"), WizardMessages.getFormattedString("CloudConnectionAuthError.message", url), e, getShell()); return true; } @@ -75,7 +75,7 @@ } catch (Exception e) { // TODO internationalize strings ErrorUtils - .openErrorDialog("Error", MessageFormat.format("Could not create cloud {0}", name), e, getShell()); + .handleError("Error", MessageFormat.format("Could not create cloud {0}", name), e, getShell()); } return true; } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceModel.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -87,7 +87,7 @@ } private DeltaCloudImage getImage(String imageId, String arch) throws DeltaCloudException { - DeltaCloudImage image = getFromcachedImage(imageId, cloud.getCurrImages()); + DeltaCloudImage image = getFromcachedImage(imageId, cloud.getImages()); if (image == null) { image = cloud.loadImage(imageId); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -205,7 +205,7 @@ } } catch (DeltaCloudException e) { // TODO internationalize strings - ErrorUtils.openErrorDialog("Error", + ErrorUtils.handleError("Error", MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName()), e, getShell()); } } @@ -409,7 +409,7 @@ try { realms = Arrays.asList(cloud.getRealms()); } catch (DeltaCloudException e) { - ErrorUtils.openErrorDialog("Error", + ErrorUtils.handleError("Error", MessageFormat.format("Could not get realms from cloud {0}", cloud.getName()), e, getShell()); } return realms; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstancePage2.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -220,7 +220,7 @@ } } catch (DeltaCloudException e) { // TODO internationalize strings - ErrorUtils.openErrorDialog("Error", + ErrorUtils.handleError("Error", MessageFormat.format("Could not get profiles from cloud {0}", cloud.getName()), e, getShell()); } return profiles.toArray(new DeltaCloudHardwareProfile[profiles.size()]); @@ -557,7 +557,7 @@ try { realms = Arrays.asList(cloud.getRealms()); } catch (DeltaCloudException e) { - ErrorUtils.openErrorDialog("Error", + ErrorUtils.handleError("Error", MessageFormat.format("Could not get realms from cloud {0}", cloud.getName()), e, getShell()); } return realms; Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -106,7 +106,7 @@ IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance)); RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host); } catch (Exception e) { - ErrorUtils.openErrorDialog("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell()); + ErrorUtils.handleError("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell()); return Status.OK_STATUS; } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-11-19 08:46:16 UTC (rev 26741) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewInstanceWizard2.java 2010-11-19 09:58:49 UTC (rev 26742) @@ -102,7 +102,7 @@ IHost host = RSEUtils.createHost(connectionName, RSEUtils.createHostName(instance)); RSEUtils.launchRemoteSystemExplorer(instance.getName(), connectionName, host); } catch (Exception e) { - ErrorUtils.openErrorDialog("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell()); + ErrorUtils.handleError("Error", "Could not launch remote system explorer for instance \"" + instance.getName() + "\"", e, getShell()); return Status.OK_STATUS; } }