Author: adietish Date: 2010-11-09 08:40:04 -0500 (Tue, 09 Nov 2010) New Revision: 26366 Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java 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/IInstanceFilter.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java Log: [JBIDE-7518] removed duplicate code in filters (expressions, etc.) Added: 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 (rev 0) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java 2010-11-09 13:40:04 UTC (rev 26366) @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.deltacloud.core; + +public interface ICloudElementFilter { + + public static final String RULE_DELIMITER = ";"; // $NON-NLS-1$ + + public static final String ALL_MATCHER = "*"; //$NON-NLS-1$ + + public static final String ALL_STRING = + ALL_MATCHER + RULE_DELIMITER // name + + ALL_MATCHER + RULE_DELIMITER // id + + ALL_MATCHER + RULE_DELIMITER // arch + + ALL_MATCHER; // desc + + + +} Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ICloudElementFilter.java ___________________________________________________________________ Name: svn:mime-type + text/plain 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-11-09 13:32:09 UTC (rev 26365) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IImageFilter.java 2010-11-09 13:40:04 UTC (rev 26366) @@ -10,9 +10,7 @@ ******************************************************************************/ package org.jboss.tools.deltacloud.core; -public interface IImageFilter { - - public final static String ALL_STRING = "*;*;*;*"; //$NON-NLS-1$ +public interface IImageFilter extends ICloudElementFilter { public boolean isVisible(DeltaCloudImage image); public void setRules(String ruleString); 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-11-09 13:32:09 UTC (rev 26365) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/IInstanceFilter.java 2010-11-09 13:40:04 UTC (rev 26366) @@ -1,8 +1,16 @@ +/******************************************************************************* + * Copyright (c) 2010 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ package org.jboss.tools.deltacloud.core; -public interface IInstanceFilter { - - public final static String ALL_STRING = "*;*;*;*;*;*;*"; //$NON-NLS-1$ +public interface IInstanceFilter extends ICloudElementFilter { public boolean isVisible(DeltaCloudInstance instance); public void setRules(String ruleString); Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-11-09 13:32:09 UTC (rev 26365) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-11-09 13:40:04 UTC (rev 26366) @@ -14,7 +14,6 @@ public class ImageFilter implements IImageFilter { - private static final String ALL_MATCHER = "*"; private IFieldMatcher nameRule; private IFieldMatcher idRule; private IFieldMatcher archRule;