Project

General

Profile

« Previous | Next » 

Revision 786696e3

Added by Andreas Müller over 10 years ago

merge trunk into cdm3.3 branch

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/markup/MarkupImportState.java
31 31
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
32 32
import eu.etaxonomy.cdm.model.location.NamedArea;
33 33
import eu.etaxonomy.cdm.model.media.Media;
34
import eu.etaxonomy.cdm.model.reference.Reference;
34 35
import eu.etaxonomy.cdm.model.taxon.Taxon;
35 36

  
36 37
/**
37 38
 * @author a.mueller
38 39
 * @created 11.05.2009
39
 * @version 1.0
40 40
 */
41 41
public class MarkupImportState extends XmlImportState<MarkupImportConfigurator, MarkupDocumentImport>{
42 42
	@SuppressWarnings("unused")
......
65 65
	
66 66
	private String latestGenusEpithet = null;
67 67
	
68
	private TeamOrPersonBase<?> latestAuthorInHomotype = null;
69
	private Reference<?> latestReferenceInHomotype = null;
70
	
68 71
	private boolean isCitation = false;
69 72
	private boolean isNameType = false;
70 73
	private boolean isProParte = false;
......
105 108
		footnoteRefRegister = new HashMap<String, Set<AnnotatableEntity>>();
106 109
		figureRefRegister = new HashMap<String, Set<AnnotatableEntity>>();
107 110
		currentAreas = new HashSet<NamedArea>();
111
		
112
		this.resetUuidTermMaps();
108 113
	}
109 114
	
110 115
		
......
328 333
	 * 
329 334
	 * @param feature
330 335
	 */
331
	public void putFeatureToCharSorterList(Feature feature) {
332
		currentCharFeatureSorterList.add(new FeatureSorterInfo(feature)); 
333
		
336
	public FeatureSorterInfo putFeatureToCharSorterList(Feature feature) {
337
		FeatureSorterInfo featureSorterInfo = new FeatureSorterInfo(feature);
338
		currentCharFeatureSorterList.add(featureSorterInfo);
339
		return featureSorterInfo;
340
	}
341
	
342
	public FeatureSorterInfo getLatestCharFeatureSorterInfo() {
343
		return currentCharFeatureSorterList.get(currentCharFeatureSorterList.size() - 1);
334 344
	}
335 345

  
346
	
336 347
	/**
337 348
	 * 
338 349
	 * @param feature
......
385 396
	}
386 397

  
387 398

  
399
	public TeamOrPersonBase<?> getLatestAuthorInHomotype() {
400
		return latestAuthorInHomotype;
401
	}
402

  
403

  
404
	public void setLatestAuthorInHomotype(TeamOrPersonBase<?> latestAuthorInHomotype) {
405
		this.latestAuthorInHomotype = latestAuthorInHomotype;
406
	}
407

  
408

  
409
	public Reference<?> getLatestReferenceInHomotype() {
410
		return latestReferenceInHomotype;
411
	}
412

  
413

  
414
	public void setLatestReferenceInHomotype(Reference<?> latestReferenceInHomotype) {
415
		this.latestReferenceInHomotype = latestReferenceInHomotype;
416
	}
417

  
418

  
388 419
}

Also available in: Unified diff