Project

General

Profile

« Previous | Next » 

Revision 56a4e7d4

Added by Andreas Müller almost 4 years ago

cleanup

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
43 43
    private CacheLoader cacheLoader;
44 44

  
45 45
    @Autowired
46
    ConfigFileUtil configFileUtil = null;
46
    private ConfigFileUtil configFileUtil = null;
47 47

  
48 48
    @Override
49 49
    protected void setup() {
......
136 136
        // first we check in the active session cache if the
137 137
        // entity has been loaded there
138 138
        // FIXME:Remoting do we really need the cdmTransientEntityCacher
139
        // here. Is it not guarenteed that all every entity which 'isCachable'
139
        // here. Is it not guaranteed that all every entity which 'isCachable'
140 140
        // by this cacher is cached only in this cacher ?
141 141
        if(!isCachable(cdmBase) && cdmTransientEntityCacher != null) {
142 142
            CdmEntityCacheKey<T> key = CdmTransientEntityCacher.generateKey(cdmBase);
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/ConversationalTransientEntityCacher.java
13 13
import java.util.Set;
14 14

  
15 15
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
16
import eu.etaxonomy.cdm.api.service.ICommonService;
16 17
import eu.etaxonomy.cdm.api.service.UpdateResult;
17 18
import eu.etaxonomy.cdm.api.service.dto.CdmEntityIdentifier;
18 19
import eu.etaxonomy.cdm.cache.CdmEntityCacheKey;
......
20 21
import eu.etaxonomy.cdm.model.common.CdmBase;
21 22

  
22 23
/**
23
 * Note: Currently this class can not be moved to CdmApplicationState
24
 * due to dependency on CdmApplicationState.
24
 * Note: The methods of this class were originally found in the {@link CdmTransientEntityCacher}.
25
 * Once that class was moved to cdmlib it was not possible to move these methods, too,
26
 * because of the current dependency on CdmApplicationState.
27
 * In future it should be tried to move them also to cdmlib by replacing the
28
 * {@link CdmApplicationState} dependency e.g. by adding {@link ICommonService} as parameter
29
 * to the method  {@link #load(CdmEntityIdentifier)}
25 30
 *
26 31
 * @author k.luther
27 32
 * @date 15.03.2018
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
45 45
	@Override
46 46
	public Image getImage(Object element) {
47 47
	    if(element instanceof DescriptionBase){
48
	        DescriptionBase description = (DescriptionBase)element;
48
	        DescriptionBase<?> description = (DescriptionBase<?>)element;
49 49
	        if(description.getTypes().contains(DescriptionType.AGGREGATED_STRUC_DESC)){
50 50
	            return MatrixUtility.getAggregatedDescriptionIcon();
51 51
	        }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
700 700

  
701 701
    private static String getTemporalDataText(TemporalData element) {
702 702
        String result = "";
703

  
704 703
        ExtendedTimePeriod period = element.getPeriod();
705

  
706 704
        if (period != null){
707 705
            result = period.toString();
708 706
        }
709

  
710 707
        return result;
711 708
    }
712 709

  

Also available in: Unified diff