Project

General

Profile

« Previous | Next » 

Revision cb89f4f7

Added by Andreas Müller almost 5 years ago

ref #6794 adapt TaxEditor to new term structure (rename FeatureNode and FeatureTree)

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
17 17 
import eu.etaxonomy.cdm.api.service.IVocabularyService;
18 18 
import eu.etaxonomy.cdm.model.description.Feature;
19 19 
import eu.etaxonomy.cdm.model.term.DefinedTerm;
20 
import eu.etaxonomy.cdm.model.term.FeatureTree;
20 
import eu.etaxonomy.cdm.model.term.TermTree;
21 21 
import eu.etaxonomy.cdm.model.term.TermType;
22 22 
import eu.etaxonomy.cdm.model.term.TermVocabulary;
23 23 
import eu.etaxonomy.cdm.model.term.VocabularyEnum;
......
39 39 

  		




  40
  40
  
    
	// FIXME: the default feature should be move to CdmApplicationState


  		




  41
  41
  
    
	//        where it is a singleton instance variable


  		




  42
  
  
    
	private static FeatureTree defaultFeatureTree = null;


  		




  43
  
  
    
	private static FeatureTree defaultNameFeatureTree = null;


  		




  
  42
  
    
	private static TermTree<Feature> defaultFeatureTree = null;


  		




  
  43
  
    
	private static TermTree<Feature> defaultNameFeatureTree = null;


  		




  44
  44
  
    

  		




  45
  45
  
    
	private List<String> termClasses = Arrays.asList(new String[]{


  		




  46
  46
  
    
			DefinedTerm.class.getName()


  		




  ......




  98
  98
  
    
        updateDefaultFeatureTree();


  		




  99
  99
  
    
    }


  		




  100
  100
  
    

  		




  101
  
  
    
    public static FeatureTree getDefaultFeatureTree() {


  		




  
  101
  
    
    public static TermTree<Feature> getDefaultFeatureTree() {


  		




  102
  102
  
    
        if(defaultFeatureTree == null) {


  		




  103
  103
  
    
            List<Feature> features = TermStore.getTerms(Feature.class);


  		




  104
  104
  
    
            List<Feature> nameFeatures = CdmStore.getTermManager().getPreferredTerms(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid()), null);


  		




  ......




  108
  108
  
    
                    features.remove(feature);


  		




  109
  109
  
    
                }


  		




  110
  110
  
    
            }


  		




  111
  
  
    
            defaultFeatureTree = FeatureTree.NewInstance(features);


  		




  
  111
  
    
            defaultFeatureTree = TermTree.NewInstance(features);


  		




  112
  112
  
    
        }


  		




  113
  113
  
    
        return defaultFeatureTree;


  		




  114
  114
  
    
    }


  		




  115
  115
  
    

  		




  116
  
  
    
    public static FeatureTree getDefaultNameFeatureTree() {


  		




  
  116
  
    
    public static TermTree<Feature> getDefaultNameFeatureTree() {


  		




  117
  117
  
    
        if(defaultNameFeatureTree == null) {


  		




  118
  118
  
    
            List<Feature> nameFeatures = CdmStore.getTermManager().getPreferredTerms(CdmStore.getService(IVocabularyService.class).load(VocabularyEnum.NameFeature.getUuid()), null);


  		




  119
  
  
    
            defaultNameFeatureTree = FeatureTree.NewInstance(nameFeatures);


  		




  
  119
  
    
            defaultNameFeatureTree = TermTree.NewInstance(nameFeatures);


  		




  120
  120
  
    
        }


  		




  121
  121
  
    
        return defaultNameFeatureTree;


  		




  122
  122
  
    
    }


  		












Also available in:  Unified diff