Project

General

Profile

« Previous | Next » 

Revision dd49afb6

Added by Andreas Müller over 4 years ago

ref #6794 TermTreeNode-> TermNode in cdmlib-apps

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/AlgaTerraActivator.java
29 29
import eu.etaxonomy.cdm.io.common.Source;
30 30
import eu.etaxonomy.cdm.model.description.Feature;
31 31
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
32
import eu.etaxonomy.cdm.model.term.FeatureNode;
33
import eu.etaxonomy.cdm.model.term.FeatureTree;
32
import eu.etaxonomy.cdm.model.term.TermNode;
33
import eu.etaxonomy.cdm.model.term.TermTree;
34 34

  
35 35

  
36 36
/**
......
208 208
	 * @param app
209 209
	 */
210 210
	private void makeTaxonFeatureTree(AlgaTerraImportConfigurator config, ICdmRepository app) {
211
		FeatureTree<Feature> tree = TreeCreator.flatTree(featureTreeUuid, config.getFeatureMap(), featureKeyList);
211
	    TermTree<Feature> tree = TreeCreator.flatTree(featureTreeUuid, config.getFeatureMap(), featureKeyList);
212 212
		tree.setTitleCache("AlgaTerra Taxon Feature Tree", true);
213 213

  
214 214
		tree.getRoot().addChild(Feature.HABITAT());
......
236 236
	 */
237 237
	private void makeSpecimenFeatureTree(AlgaTerraImportConfigurator config, ICdmRepository app) {
238 238
		ITermService termService = app.getTermService();
239
		FeatureTree<Feature> specimenTree = FeatureTree.NewInstance(specimenFeatureTreeUuid);
239
		TermTree<Feature> specimenTree = TermTree.NewFeatureInstance(specimenFeatureTreeUuid);
240 240
//		FeatureTree specimenTree = TreeCreator.flatTree(specimenFeatureTreeUuid, config.getFeatureMap(), featureKeyList);
241 241
		specimenTree.setTitleCache("AlgaTerra Specimen Feature Tree", true);
242
		FeatureNode<Feature> root = specimenTree.getRoot();
242
		TermNode<Feature> root = specimenTree.getRoot();
243 243

  
244 244

  
245 245
		root.addChild(Feature.IMAGE());
......
256 256
		addFeatureNodeByUuid(root, termService, AlgaTerraImportTransformer.uuidFeatureConductivity);
257 257
		addFeatureNodeByUuid(root, termService, AlgaTerraImportTransformer.uuidFeatureWaterTemperature);
258 258
		addFeatureNodeByUuid(root, termService, AlgaTerraImportTransformer.uuidFeatureSilica);
259
		FeatureNode nitrogenNode = makeNitrogenNode(root, termService);
259
		TermNode<Feature> nitrogenNode = makeNitrogenNode(root, termService);
260 260
		addFeatureNodeByUuid(nitrogenNode, termService, AlgaTerraImportTransformer.uuidFeatureNitrate);
261 261
		addFeatureNodeByUuid(nitrogenNode, termService, AlgaTerraImportTransformer.uuidFeatureNitrite);
262 262
		addFeatureNodeByUuid(nitrogenNode, termService, AlgaTerraImportTransformer.uuidFeatureAmmonium);
......
272 272
		app.getFeatureTreeService().saveOrUpdate(specimenTree);
273 273
	}
274 274

  
275
	private FeatureNode<Feature> makeNitrogenNode(FeatureNode<Feature> root, ITermService termService) {
275
	private TermNode<Feature> makeNitrogenNode(TermNode<Feature> root, ITermService termService) {
276 276
		Feature nFeature = Feature.NewInstance("Supra feature for all Nitrogen related subfeatures", "Nitrogen", "N");
277 277
		termService.save(nFeature);
278
		FeatureNode<Feature> nNode = root.addChild(nFeature);
278
		TermNode<Feature> nNode = root.addChild(nFeature);
279 279
		return nNode;
280 280
	}
281 281

  
......
295 295
	 * @param termService
296 296
	 * @param featureUuid
297 297
	 */
298
	private void addFeatureNodeByUuid(FeatureNode<Feature> root, ITermService termService, UUID featureUuid) {
298
	private void addFeatureNodeByUuid(TermNode<Feature> root, ITermService termService, UUID featureUuid) {
299 299
		Feature feature = (Feature)termService.find(featureUuid);
300 300
		if (feature != null){
301 301
			root.addChild(feature);

Also available in: Unified diff