Project

General

Profile

Revision 645aca37

ID645aca37b98a1d1c0d2ef213732862add0cec1b0
Parent 12740fe1
Child b996fc8c

Added by Andreas Müller 12 months ago

ref #6794 add TermCollection and subclasses including TermTree

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermGraphBase.java
36 36
    @SuppressWarnings("unused")
37 37
    private static final Logger logger = Logger.getLogger(TermGraphBase.class);
38 38

  
39

  
40 39
 // ******************** CONSTRUCTOR *************************************/
41 40

  
42 41
    @Deprecated
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermRelationBase.java
68 68

  
69 69
    /**
70 70
     * The {@link TermType type} of this term relation.
71
<<<<<<< HEAD
71 72
     * Must be the same type as for the {@link TermCollection term collection}
73
=======
74
     * Must be the same type as for the {@link TermTree term collection}
75
>>>>>>> ref #6794 add TermCollection and subclasses including TermTree
72 76
     * this node belongs to and as the term type of the term this node links to.
73 77
     */
74 78
    @XmlAttribute(name ="TermType")
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTreeNode.java
662 662
	    HHH_9751_Util.removeAllNull(children);
663 663
	    updateSortIndex();
664 664
	}
665

  
666

  
667 665
}
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermVocabulary.java
9 9

  
10 10
package eu.etaxonomy.cdm.model.term;
11 11

  
12

  
13 12
import java.net.URI;
14 13
import java.util.HashSet;
15 14
import java.util.List;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)