Project

General

Profile

Revision d33f8978

IDd33f89785f97f57a45d94088fe2f3da16c5ddbac
Parent 6e572e21
Child 288cde13

Added by Katja Luther almost 4 years ago

ref #6061: remove the current selection as filter in nomenclatural author selection dialog

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
70 70
	private final Set<T> transientCdmObjects = new HashSet<T>();
71 71
	private final String settings;
72 72
	protected final int limitOfInitialElements = 100;
73

  
73
	
74 74
	protected T cdmBaseToBeFiltered;
75 75

  
76 76

  
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
158 158
			UuidAndTitleCache uuidAndTitleCache = (UuidAndTitleCache) element;
159 159
			String titleCache = uuidAndTitleCache.getTitleCache();
160 160
			String abbrevTitleCache = uuidAndTitleCache.getAbbrevTitleCache();
161
			abbrevTitleCache += " - " + titleCache;
161
			if (!titleCache.equals(abbrevTitleCache)){
162
				abbrevTitleCache += " - " + titleCache;
163
			}
162 164
			if(PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_ID_IN_ENTITY_SELECTION_DIAOLOG)){
163 165
				abbrevTitleCache += " ["+uuidAndTitleCache.getId()+"]";
164 166
			}
......
188 190
			public boolean matchItem(Object item) {
189 191
				String text = null;
190 192
				if(item instanceof UuidAndTitleCache){
191
					text = ((UuidAndTitleCache) item).getAbbrevTitleCache();
193
					if (((UuidAndTitleCache) item).getAbbrevTitleCache() != null){
194
						text = ((UuidAndTitleCache) item).getAbbrevTitleCache();
195
					} else{
196
						text = ((UuidAndTitleCache) item).getTitleCache();
197
					}
192 198
				}else if(item instanceof String){
193 199
					text = (String) item;
194 200
				}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
101 101
                EntitySelectionElement.ALL, style);
102 102
		addElement(selectionBasionymAuthor);
103 103
		selectionExBasionymAuthor = formFactory.createSelectionElementWithAbbreviatedTitle(TeamOrPersonBase.class, getConversationHolder(),
104
		        formElement, "Ex Basionym Author", entity.getExBasionymAuthorship(),
104
		        formElement, "Ex Basionym Author",entity.getExBasionymAuthorship(),
105 105
		        EntitySelectionElement.ALL, style);
106 106

  
107 107
		addElement(selectionExBasionymAuthor);

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)