Author: adietish Date: 2010-11-09 08:26:57 -0500 (Tue, 09 Nov 2010) New Revision: 26364 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java Log: [JBIDE-7518] removed duplicate code (4x the same filter rule creation code) 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:21:47 UTC (rev 26363) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/ImageFilter.java 2010-11-09 13:26:57 UTC (rev 26364) @@ -29,27 +29,20 @@ @Override public void setRules(String ruleString) throws PatternSyntaxException { + // TODO: replace filter passing (;-delimited string) by list String[] tokens = ruleString.split(";"); - if (tokens[0].equals("*")) { //$NON-NLS-1$ - nameRule = new AllFieldMatcher(); + this.nameRule = createRule(tokens[0]); + this.idRule = createRule(tokens[1]); + this.archRule = createRule(tokens[2]); + this.descRule = createRule(tokens[3]); + } + + private IFieldMatcher createRule(String token) { + if (token.equals("*")) { //$NON-NLS-1$ + return new AllFieldMatcher(); } else { - nameRule = new FieldMatcher(tokens[0]); + return new FieldMatcher(token); } - if (tokens[1].equals("*")) { //$NON-NLS-1$ - idRule = new AllFieldMatcher(); - } else { - idRule = new FieldMatcher(tokens[1]); - } - if (tokens[2].equals("*")) { //$NON-NLS-1$ - archRule = new AllFieldMatcher(); - } else { - archRule = new FieldMatcher(tokens[2]); - } - if (tokens[3].equals("*")) { //$NON-NLS-1$ - descRule = new AllFieldMatcher(); - } else { - descRule = new FieldMatcher(tokens[3]); - } } @Override