Author: sebb Date: Sat Sep 19 17:50:00 2009 New Revision: 816945 URL: http://svn.apache.org/viewvc?rev=816945&view=rev Log: Fix bug: an empty filter should pass everything Restrict use to package
Modified: jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java Modified: jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java?rev=816945&r1=816944&r2=816945&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java (original) +++ jakarta/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/control/gui/ClassFilter.java Sat Sep 19 17:50:00 2009 @@ -21,28 +21,20 @@ import java.util.Iterator; import java.util.List; -public class ClassFilter { +class ClassFilter { - protected String[] pkgs = new String[0]; - /** - * - */ - public ClassFilter() { + private String[] pkgs = new String[0]; + + ClassFilter() { super(); } - public void setPackges(String[] pk) { + void setPackges(String[] pk) { this.pkgs = pk; } - public void addPackage(String pkg) { - String[] newpkg = new String[pkgs.length + 1]; - System.arraycopy(pkgs,0,newpkg,0,pkgs.length); - newpkg[pkgs.length] = pkg; - pkgs = newpkg; - } - - public boolean include(String text) { + private boolean include(String text) { + if (pkgs.length == 0) return true; // i.e. no filter boolean inc = false; for (int idx=0; idx < pkgs.length; idx++) { if (text.startsWith(pkgs[idx])){ @@ -53,7 +45,7 @@ return inc; } - public Object[] filterArray(List<String> items) { + Object[] filterArray(List<String> items) { Iterator<String> itr = items.iterator(); ArrayList<Object> newlist = new ArrayList<Object>(); while (itr.hasNext()) { @@ -69,7 +61,7 @@ } } - public int size(){ + int size(){ return pkgs.length; } } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org