Project

General

Profile

« Previous | Next » 

Revision d41c6a72

Added by Katja Luther over 6 years ago

selection dialogs does not use CdmFilteredItemsSelectionDialog anymore

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
54 54
    }
55 55

  
56 56
    @Override
57
    protected void initModel() {
58
        Control control = getPatternControl();
57
    protected void search() {
58
        Control control =getSearchField();
59 59
        String pattern = null;
60 60
        if (control != null){
61 61
            pattern = ((Text)control).getText();
......
65 65
        }else{
66 66
            model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern, null);
67 67
        }
68

  
68 69
    }
69 70

  
70 71
    /** {@inheritDoc} */
......
148 149
	};
149 150

  
150 151
	/** {@inheritDoc} */
151
	@Override
152
	protected ItemsFilter createFilter() {
153
		return new ItemsFilter() {
154

  
155
			/**
156
			 * Always returns false to enforce refiltering even if the pattern is equal
157
			 */
158
			@Override
159
			public boolean equalsFilter(ItemsFilter filter) {
160
				return false;
161
			}
162

  
163
			@Override
164
			public boolean isConsistentItem(Object item) {
165
				return false;
166
			}
167

  
168
			@Override
169
			public boolean matchItem(Object item) {
170
				String textTitleCache = null;
171
				String abbrevTitleCache = null;
172
				if(item instanceof UuidAndTitleCache){
173
					if (((UuidAndTitleCache) item).getAbbrevTitleCache() != null){
174
						abbrevTitleCache = ((UuidAndTitleCache) item).getAbbrevTitleCache();
175
					}
176
					if (((UuidAndTitleCache) item).getTitleCache() != null ){
177
						textTitleCache = ((UuidAndTitleCache) item).getTitleCache();
178
					}
179
				}else if(item instanceof String){
180
					textTitleCache = (String) item;
181
				}
182

  
183
				return  (matches(textTitleCache) || matches(abbrevTitleCache)) ;
184

  
185
			}
186

  
187
		};
188
	}
152
//	@Override
153
//	protected ItemsFilter createFilter() {
154
//		return new ItemsFilter() {
155
//
156
//			/**
157
//			 * Always returns false to enforce refiltering even if the pattern is equal
158
//			 */
159
//			@Override
160
//			public boolean equalsFilter(ItemsFilter filter) {
161
//				return false;
162
//			}
163
//
164
//			@Override
165
//			public boolean isConsistentItem(Object item) {
166
//				return false;
167
//			}
168
//
169
//			@Override
170
//			public boolean matchItem(Object item) {
171
//				String textTitleCache = null;
172
//				String abbrevTitleCache = null;
173
//				if(item instanceof UuidAndTitleCache){
174
//					if (((UuidAndTitleCache) item).getAbbrevTitleCache() != null){
175
//						abbrevTitleCache = ((UuidAndTitleCache) item).getAbbrevTitleCache();
176
//					}
177
//					if (((UuidAndTitleCache) item).getTitleCache() != null ){
178
//						textTitleCache = ((UuidAndTitleCache) item).getTitleCache();
179
//					}
180
//				}else if(item instanceof String){
181
//					textTitleCache = (String) item;
182
//				}
183
//
184
//				return  (matches(textTitleCache) || matches(abbrevTitleCache)) ;
185
//
186
//			}
187
//
188
//		};
189
//	}
189 190

  
190 191
	@Override
191 192
	protected Comparator getItemsComparator() {

Also available in: Unified diff