Author: adietish Date: 2010-12-03 14:35:02 -0500 (Fri, 03 Dec 2010) New Revision: 27168 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementTableView.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementViewLabelAndContentProvider.java Log: [JBIDE-7688] cleanup Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementTableView.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementTableView.java 2010-12-03 19:13:50 UTC (rev 27167) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementTableView.java 2010-12-03 19:35:02 UTC (rev 27168) @@ -373,7 +373,7 @@ } String[] cloudNames = toCloudNames(clouds); - setCloudSelectorItems(cloudNames); + setCloudSelectorItems(cloudNames, currentCloudSelector); this.currentCloud = getCurrentCloud(index, clouds); if (cloudNames.length > 0) { @@ -395,10 +395,10 @@ return (String[]) cloudNames.toArray(new String[cloudNames.size()]); } - private void setCloudSelectorItems(String[] cloudNames) { - currentCloudSelector.removeModifyListener(cloudModifyListener); - currentCloudSelector.setItems(cloudNames); - currentCloudSelector.addModifyListener(cloudModifyListener); + private void setCloudSelectorItems(String[] cloudNames, Combo cloudSelector) { + cloudSelector.removeModifyListener(cloudModifyListener); + cloudSelector.setItems(cloudNames); + cloudSelector.addModifyListener(cloudModifyListener); } /** Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementViewLabelAndContentProvider.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementViewLabelAndContentProvider.java 2010-12-03 19:13:50 UTC (rev 27167) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/AbstractCloudElementViewLabelAndContentProvider.java 2010-12-03 19:35:02 UTC (rev 27168) @@ -80,14 +80,14 @@ return null; } - ICloudElementFilter<CLOUDELEMENT> filter = null; - filter = getCloudFilter(cloud); + CLOUDELEMENT[] cloudElements = getCloudElements(cloud); + ICloudElementFilter<CLOUDELEMENT> filter = getCloudFilter(cloud); if (filter == null) { - return Arrays.asList(getCloudElements(cloud)); + return Arrays.asList(cloudElements); + } else { + return filter.filter(cloudElements); } - - return filter.filter(getCloudElements(cloud)); } private ICloudElementFilter<CLOUDELEMENT> getFilter(DeltaCloud cloud) {