Author: adietish Date: 2010-12-03 08:28:03 -0500 (Fri, 03 Dec 2010) New Revision: 27144 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceFilter.java Log: [JBIDE-7688] removed duplicate methods Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java 2010-12-03 13:27:06 UTC (rev 27143) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java 2010-12-03 13:28:03 UTC (rev 27144) @@ -10,7 +10,11 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core; -public interface ICloudElementFilter { +/** + * @author Jeff Johnston + * @author André Dietisheim + */ +public interface ICloudElementFilter<CLOUDCHILD> { public static final String EXPRESSION_DELIMITER = ";"; // $NON-NLS-1$ @@ -22,6 +26,11 @@ + ALL_MATCHER_EXPRESSION + EXPRESSION_DELIMITER // arch + ALL_MATCHER_EXPRESSION; // desc + public boolean isVisible(CLOUDCHILD cloudChild); + public void setRules(String ruleString); + public IFieldMatcher getNameRule(); + public IFieldMatcher getIdRule(); + } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java 2010-12-03 13:27:06 UTC (rev 27143) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java 2010-12-03 13:28:03 UTC (rev 27144) @@ -10,12 +10,12 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core; -public interface IImageFilter extends ICloudElementFilter { +/** + * @author Jeff Johnston + * @author André Dietisheim + */ +public interface IImageFilter extends ICloudElementFilter<DeltaCloudImage> { - public boolean isVisible(DeltaCloudImage image); - public void setRules(String ruleString); - public IFieldMatcher getNameRule(); - public IFieldMatcher getIdRule(); public IFieldMatcher getArchRule(); public IFieldMatcher getDescRule(); } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceFilter.java 2010-12-03 13:27:06 UTC (rev 27143) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceFilter.java 2010-12-03 13:28:03 UTC (rev 27144) @@ -10,12 +10,12 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core; -public interface IInstanceFilter extends ICloudElementFilter { +/** + * @author Jeff Johnston + * @author André Dietisheim + */ +public interface IInstanceFilter extends ICloudElementFilter<DeltaCloudInstance> { - public boolean isVisible(DeltaCloudInstance instance); - public void setRules(String ruleString); - public IFieldMatcher getNameRule(); - public IFieldMatcher getIdRule(); public IFieldMatcher getImageIdRule(); public IFieldMatcher getOwnerIdRule(); public IFieldMatcher getKeyNameRule();