Project

General

Profile

Revision b72678a6

IDb72678a6498fa892bd8af7dcf69a04f92d0778a4
Parent ec978653
Child def33852

Added by Andreas Müller 12 months ago

ref #6794 change FeatureTree to TermTree

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java
115 115
		List<Reference> references;
116 116
		List<TaxonName> taxonomicNames;
117 117
		List<DescriptionBase> descriptions;
118
		List<TypeDesignationBase<?>> typeDesignations;

118
		List<TypeDesignationBase<?>> typeDesignations;
119 119
		List<SpecimenOrObservationBase> occurrences;
120 120
		List<TermTree> featureTrees;
121 121
		List<TermTreeNode> featureNodes;
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDataSet.java
132 132
    protected List<VersionableEntity> agentData;
133 133

  
134 134
    @XmlElementWrapper(name = "FeatureData")
135
        @XmlElements({

135
        @XmlElements({
136 136
        @XmlElement(name = "FeatureNode", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = TermTreeNode.class),
137 137
        @XmlElement(name = "FeatureTree", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = TermTree.class)
138 138
    })
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/out/SDDDocumentBuilder.java
78 78
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
79 79
import eu.etaxonomy.cdm.model.term.DefinedTerm;
80 80
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
81
<<<<<<< HEAD
82
=======
83
import eu.etaxonomy.cdm.model.term.TermTreeNode;
84
import eu.etaxonomy.cdm.model.term.TermTree;
85
>>>>>>> ref #6794 change FeatureTree to TermTree
81 86
import eu.etaxonomy.cdm.model.term.Representation;
82 87
import eu.etaxonomy.cdm.model.term.TermBase;
83 88
import eu.etaxonomy.cdm.model.term.TermTree;
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/term/TermTreeNode.java
664 664
	    updateSortIndex();
665 665
	}
666 666

  
667

  
667 668
}
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/term/FeatureTreeTest.java
14 14

  
15 15
import eu.etaxonomy.cdm.model.description.Feature;
16 16

  
17

  
17 18
public class FeatureTreeTest {
18 19
	@SuppressWarnings("unused")
19 20
	private static final Logger logger = Logger.getLogger(FeatureTreeTest.class);
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureTreeDao.java
23 23
 * @since 10.07.2008
24 24
 */
25 25
public interface IFeatureTreeDao extends IIdentifiableDao<TermTree> {
26

  
26

  
27 27
    public List<TermTree> list();
28 28

  
29 29
    public UUID DefaultFeatureTreeUuid = UUID.fromString("ac8d4e58-926d-4f81-ac77-cebdd295df7c");
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/TermTreeDaoImpl.java
128 128
        }
129 129
        return getUuidAndTitleCache(query);
130 130
    }
131
}
131
}
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java
25 25
import eu.etaxonomy.cdm.model.term.TermTree;
26 26
import eu.etaxonomy.cdm.model.term.TermTreeNode;
27 27

  
28

  
29 28
/**
30 29
 * @author cmathew
31 30
 * @since 23 Sep 2015
cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hibernate.cfg.xml
199 199
      <!-- Term Package -->
200 200
      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTerm"/>
201 201
      <mapping class="eu.etaxonomy.cdm.model.term.DefinedTermBase"/>
202
      <mapping class="eu.etaxonomy.cdm.model.term.FeatureTree"/>
203 202
      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTerm"/>
204 203
      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermBase"/>
205 204
      <mapping class="eu.etaxonomy.cdm.model.term.OrderedTermVocabulary"/>
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java
24 24
import eu.etaxonomy.cdm.model.term.TermTree;
25 25
import eu.etaxonomy.cdm.model.term.TermTreeNode;
26 26

  
27

  
28 27
/**
29 28
 * Generator of natural language descriptions from TaxonDescriptions.
30 29
 *
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/validation/batch/BatchValidationUtil.java
77 77
        services.add(new EntityValidationUnit(Classification.class, appConfig.getClassificationService()));
78 78
        services.add(new EntityValidationUnit(Collection.class, appConfig.getCollectionService()));
79 79
//        services.add(new EntityValidationUnit(OriginalSourceBase.class, appConfig.getCommonService()));
80
        services.add(new EntityValidationUnit(DescriptionBase.class, appConfig.getDescriptionService()));

80
        services.add(new EntityValidationUnit(DescriptionBase.class, appConfig.getDescriptionService()));
81 81
        services.add(new EntityValidationUnit(TermTreeNode.class, appConfig.getFeatureNodeService()));
82 82
        services.add(new EntityValidationUnit(TermTree.class, appConfig.getFeatureTreeService()));
83

  
83 84
        services.add(new EntityValidationUnit(Group.class, appConfig.getGroupService()));
84 85
        // Causes some AOP-related error when calling list() method on it
85 86
        //services.add(new EntityValidationUnit(DefinedTermBase.class, appConfig.getLocationService()));

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)