Project

General

Profile

« Previous | Next » 

Revision 86a8b79e

Added by Patrick Plitzner over 7 years ago

Add fallback label and icon in specimen editor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
160 160
    public static final String AMPLIFICATION_DERIVATE = "amplification_derivate";
161 161
    public static final String SINGLE_READ_DERIVATE = "single_read_derivate";
162 162
    public static final String SINGLE_READ_DERIVATE_MULTILINK = "single_read_derivate_multilink";
163
    public static final String DEFAULT_DERIVATIVE = "default_derivate";
163 164

  
164 165
    public static final String CHARACTER_DATA_DERIVATE = "character_data_derivate";
165 166

  
......
388 389
		        "single_read_derivate_multilink-16x16-32.png");
389 390
		registerImage(registry, CHARACTER_DATA_DERIVATE,
390 391
		        "character_data_derivate-16x16-32.png");
392
		registerImage(registry, DEFAULT_DERIVATIVE,
393
				"default_derivate-16x16-32.png");
391 394

  
392 395
		registerImage(registry, WEB,
393 396
		        "web.gif");
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
27 27
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
28 28
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
29 29
import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
30
import eu.etaxonomy.cdm.common.CdmUtils;
30 31
import eu.etaxonomy.cdm.format.CdmFormatterFactory;
31 32
import eu.etaxonomy.cdm.format.ICdmFormatter.FormatKey;
32 33
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
33 34
import eu.etaxonomy.cdm.model.common.CdmBase;
34 35
import eu.etaxonomy.cdm.model.common.DefinedTerm;
36
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
35 37
import eu.etaxonomy.cdm.model.common.Identifier;
36 38
import eu.etaxonomy.cdm.model.molecular.DnaSample;
37 39
import eu.etaxonomy.cdm.model.molecular.Sequence;
......
151 153
                FormatKey.MEDIA_TITLE, FormatKey.SPACE,
152 154
                FormatKey.MEDIA_ARTIST, FormatKey.SPACE
153 155
        };
154
        return CdmFormatterFactory.format(element, formatKeys);
156
        String text = CdmFormatterFactory.format(element, formatKeys);
157
        if(element instanceof IdentifiableEntity){
158
        	IdentifiableEntity identifiableEntity = (IdentifiableEntity) element;
159
        	if(identifiableEntity.isProtectedTitleCache()){
160
        		text = identifiableEntity.getTitleCache();
161
        	}
162
        }
163
        if(CdmUtils.isBlank(text)){
164
        	return "[-]";
165
        }
166
		return text;
155 167
    }
156 168

  
157 169
    /** {@inheritDoc} */
......
397 409
                }
398 410
            }
399 411
        }
400
        return super.getImage(element);
412
        return ImageResources.getImage(ImageResources.DEFAULT_DERIVATIVE);
401 413
    }
402 414

  
403 415
    public static Identifier<DnaSample> getCurrentSampleDesignation(CdmBase entity) {

Also available in: Unified diff