Author: adietish Date: 2010-12-03 14:13:35 -0500 (Fri, 03 Dec 2010) New Revision: 27166 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/CVInstancesCategoryElement.java Log: [JBIDE-7688] remove duplicate code and delegate to filter 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-12-03 19:11:47 UTC (rev 27165) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVImagesCategoryElement.java 2010-12-03 19:13:35 UTC (rev 27166) @@ -10,8 +10,6 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; -import java.util.ArrayList; - import org.eclipse.jface.viewers.TreeViewer; import org.jboss.tools.deltacloud.core.DeltaCloud; import org.jboss.tools.deltacloud.core.DeltaCloudImage; @@ -77,17 +75,10 @@ // refresh(); } - public DeltaCloudImage[] filter(DeltaCloudImage[] input) { - ArrayList<DeltaCloudImage> array = new ArrayList<DeltaCloudImage>(); + public DeltaCloudImage[] filter(DeltaCloudImage[] images) { DeltaCloud cloud = (DeltaCloud) getElement(); IImageFilter f = cloud.getImageFilter(); - for (int i = 0; i < input.length; ++i) { - DeltaCloudImage image = input[i]; - if (f.isVisible(image)) - array.add(image); - } - return array.toArray(new DeltaCloudImage[array.size()]); - + return f.filter(images).toArray(new DeltaCloudImage[images.length]); } protected void dispose() { 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-12-03 19:11:47 UTC (rev 27165) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/views/CVInstancesCategoryElement.java 2010-12-03 19:13:35 UTC (rev 27166) @@ -10,8 +10,6 @@ *******************************************************************************/ package org.jboss.tools.deltacloud.ui.views; -import java.util.ArrayList; - import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.swt.widgets.Display; import org.jboss.tools.deltacloud.core.DeltaCloud; @@ -85,16 +83,10 @@ // refresh(); } - private DeltaCloudInstance[] filter(DeltaCloudInstance[] input) { - ArrayList<DeltaCloudInstance> array = new ArrayList<DeltaCloudInstance>(); + public DeltaCloudInstance[] filter(DeltaCloudInstance[] instances) { DeltaCloud cloud = (DeltaCloud) getElement(); IInstanceFilter f = cloud.getInstanceFilter(); - for (int i = 0; i < input.length; ++i) { - DeltaCloudInstance instance = input[i]; - if (f.isVisible(instance)) - array.add(instance); - } - return array.toArray(new DeltaCloudInstance[array.size()]); + return f.filter(instances).toArray(new DeltaCloudInstance[instances.length]); } protected void dispose() {