Author: adietish Date: 2010-12-01 11:46:27 -0500 (Wed, 01 Dec 2010) New Revision: 27067 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/InstanceViewLabelAndContentProvider.java Log: cleanup 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-12-01 16:35:52 UTC (rev 27066) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/ImageViewLabelAndContentProvider.java 2010-12-01 16:46:27 UTC (rev 27067) @@ -31,7 +31,7 @@ private DeltaCloud cloud; private IImageFilter localFilter; - private DeltaCloudImage[] images; + private DeltaCloudImage[] images = new DeltaCloudImage[]{}; public enum Column { NAME(0, 20), @@ -94,7 +94,7 @@ } catch (Exception e) { ErrorUtils.handleError( "Error", - "Could not get images for cloud " + cloud.getName(), + "Could not display 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/InstanceViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-12-01 16:35:52 UTC (rev 27066) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/InstanceViewLabelAndContentProvider.java 2010-12-01 16:46:27 UTC (rev 27067) @@ -33,7 +33,7 @@ ITableLabelProvider { private DeltaCloud cloud; - private DeltaCloudInstance[] instances; + private DeltaCloudInstance[] instances = new DeltaCloudInstance[]{}; public enum Column { NAME(0, 20), @@ -88,11 +88,8 @@ try { instances = filter(cloud.getInstances()); } catch (Exception e) { - if (instances == null) { - instances = new DeltaCloudInstance[]{}; - } // TODO internationalize strings - ErrorUtils.handleError("Instance View Error", "Could not display instances for cloud " + cloud.getName(), + ErrorUtils.handleError("Error", "Could not display instances for cloud " + cloud.getName(), e, Display.getDefault().getActiveShell()); } }