Project

General

Profile

« Previous | Next » 

Revision 3ea88987

Added by Katja Luther over 4 years ago

ref #8034: fix handling with recently selected references in s

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/ReferenceSelectionDialog.java
153 153
	@Override
154 154
	protected void callService(String pattern) {
155 155

  
156
	    if (StringUtils.isBlank(pattern) && lastSelectedReferences == null){
156
	    if (StringUtils.isBlank(pattern) ){
157 157
	        lastSelectedReferences = PreferencesUtil.getLastSelectedReferences();
158 158
	        Set<UUID> uuids = new HashSet<>();
159 159
	        for (String uuidString: lastSelectedReferences){
......
161 161
	        }
162 162
	        if (!uuids.isEmpty()){
163 163
	            if (currentReference != null){
164
	                model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCacheForUUIDS(uuids, currentReference.getType());
164
	                uuids.remove(currentReference.getUuid());
165
	                if (isInReference){
166
	                    model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCacheForUUIDS(uuids, currentReference.getType());
167
	                }else{
168
	                    model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCacheForUUIDS(uuids);
169
	                }
165 170
	            }else{
166 171
	                model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCacheForUUIDS(uuids);
167 172
	            }
......
180 185
                    model.add(dto.getCdmEntity());
181 186
                }
182 187
            }else{
188

  
183 189
                model = CdmStore.getService(IReferenceService.class).getUuidAndTitleCache(limitOfInitialElements,pattern, currentReference.getType());
184 190
            }
185 191

  

Also available in: Unified diff