Project

General

Profile

« Previous | Next » 

Revision f555d4cc

Added by Patrick Plitzner about 7 years ago

fix #6488 Always have any text fallback for derivative labels

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
44 44
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
45 45
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
46 46
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
47
import eu.etaxonomy.cdm.strategy.cache.common.IdentifiableEntityDefaultCacheStrategy;
47 48
import eu.etaxonomy.taxeditor.model.ImageResources;
48 49
import eu.etaxonomy.taxeditor.store.CdmStore;
49 50

  
......
157 158
                FormatKey.MEDIA_ARTIST, FormatKey.SPACE
158 159
        };
159 160
        String text = CdmFormatterFactory.format(element, formatKeys);
160
        if(element instanceof IdentifiableEntity){
161
        if(element instanceof MediaSpecimen){
162
            formatKeys = new FormatKey[]{FormatKey.MEDIA_TITLE_CACHE};
163
            text = CdmFormatterFactory.format(element, formatKeys);
164
        }
165
        else if(element instanceof IdentifiableEntity){
161 166
        	IdentifiableEntity identifiableEntity = (IdentifiableEntity) element;
162 167
        	if(identifiableEntity.isProtectedTitleCache()){
163 168
        		text = identifiableEntity.getTitleCache();
164 169
        	}
165 170
        }
166
        if(CdmUtils.isBlank(text)){
167
        	return "[-]";
171
        if(CdmUtils.isBlank(text) || text.equals(IdentifiableEntityDefaultCacheStrategy.TITLE_CACHE_GENERATION_NOT_IMPLEMENTED)){
172
            if(element instanceof CdmBase){
173
                text = ((CdmBase) element).getUuid().toString();
174
            }
175
            else{
176
                text = element.toString();
177
            }
168 178
        }
169 179
		return text;
170 180
    }

Also available in: Unified diff