Revision 3018 org.gvsig.raster/trunk/org.gvsig.raster/org.gvsig.raster.app/org.gvsig.raster.app.common/src/main/java/org/gvsig/raster/mainplugin/toolbar/BinarySearch.java

View differences:

BinarySearch.java
38 38
 */
39 39
public class BinarySearch implements ILookUp {
40 40
	public List<Object> doLookUpConsideringCaseSensitive(String text, Vector<Object> sortOrderedItems, StringComparator comp) {
41
		Vector<Object> list = new Vector<Object>();
42
                if( !StringUtils.isEmpty(text) ) {
43
                    for (int i = 0; i < sortOrderedItems.size(); i++) {
44
                        Object cur_o = sortOrderedItems.get(i);
45
                        if( cur_o!=null ) {
46
                            String cur_s = cur_o.toString();
41
                Vector<Object> list = new Vector<Object>();
42
                for (int i = 0; i < sortOrderedItems.size(); i++) {
43
                    Object cur_o = sortOrderedItems.get(i);
44
                    if( cur_o!=null ) {
45
                        String cur_s = cur_o.toString();
46
                        if( StringUtils.isEmpty(text) ) {
47
                                list.add(cur_o);
48
                        } else {
47 49
                            if (cur_s.indexOf(text) != -1) {
48 50
                                    list.add(cur_o);
49 51
                            }
50 52
                        }
51 53
                    }
52
                }                
54
                }
53 55
		return Arrays.asList(list.toArray());
54
	}
56
        }
55 57

  
56 58
	public List<Object> doLookUpIgnoringCaseSensitive(String text, Vector<Object> sortOrderedItems, StringComparator comp) {
57
		Vector<Object> list = new Vector<Object>();
58
                if( !StringUtils.isEmpty(text) ) {
59
                    for (int i = 0; i < sortOrderedItems.size(); i++) {
60
                        Object cur_o = sortOrderedItems.get(i);
61
                        if( cur_o!=null ) {
62
                            String cur_s = cur_o.toString();
59
                Vector<Object> list = new Vector<Object>();
60
                for (int i = 0; i < sortOrderedItems.size(); i++) {
61
                    Object cur_o = sortOrderedItems.get(i);
62
                    if( cur_o!=null ) {
63
                        String cur_s = cur_o.toString();
64
                        if( StringUtils.isEmpty(text) ) {
65
                                list.add(cur_o);
66
                        } else {
63 67
                            if (cur_s.toLowerCase().indexOf(text.toLowerCase()) != -1) {
64 68
                                    list.add(cur_o);
65 69
                            }

Also available in: Unified diff