Project

General

Profile

« Previous | Next » 

Revision bd4c6676

Added by Andreas Müller almost 3 years ago

ref #9678 implement cache strategies for field unit and derived unti within cdmlib model

View differences:

cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategy.java
12 12
import java.util.UUID;
13 13

  
14 14
import org.apache.commons.lang.StringUtils;
15
import org.apache.log4j.Logger;
16 15

  
17 16
import eu.etaxonomy.cdm.common.CdmUtils;
18 17
import eu.etaxonomy.cdm.model.agent.AgentBase;
......
34 33
 *
35 34
 * @author a.mueller
36 35
 * @since 03.06.2010
36
 *
37
 *  * @deprecated with #9678 a similar cache strategy (FieldUnitCacheStrategy)
38
 *      was implemented in cdmlib-model. This class may be removed in future.
37 39
 */
40
@Deprecated
38 41
public class DerivedUnitFacadeFieldUnitCacheStrategy
39 42
        extends StrategyBase
40 43
        implements IIdentifiableEntityCacheStrategy<FieldUnit> {
41 44

  
42 45
    private static final long serialVersionUID = 1578628591216605619L;
43
	private static final Logger logger = Logger.getLogger(DerivedUnitFacadeFieldUnitCacheStrategy.class);
44 46

  
45 47
	private static final UUID uuid = UUID.fromString("df4672c1-ce5c-4724-af6d-91e2b326d4a4");
46 48

  
......
188 190
		}
189 191
	}
190 192

  
191
	private boolean testPrimaryCollectorInCollectorTeam(AgentBase collector, Person primaryCollector) {
192
		if (collector.isInstanceOf(Person.class)){
193
			return collector.equals(primaryCollector);
194
		}else if (collector.isInstanceOf(Team.class)){
195
			Team collectorTeam = CdmBase.deproxy(collector, Team.class);
196
			return collectorTeam.getTeamMembers().contains(primaryCollector);
197
		}else{
198
			logger.warn("Collector is not of type person or team");
199
			return false;
200
		}
201
	}
202

  
203 193
// ************************** GETTER / SETTER ******************************************************
204 194

  
205 195
	public boolean isIncludeSeconds() {

Also available in: Unified diff