Project

General

Profile

« Previous | Next » 

Revision 46b49536

Added by Andreas Müller almost 8 years ago

Add taxon relationship types "unclear" and "not yet worked on" #5895

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java
95 95

  
96 96
	private static final UUID uuidAllRelationships = UUID.fromString("831fcd88-e5c9-49e0-b06e-bbb67d1c05c9");
97 97

  
98
	private static final UUID uuidUnclear = UUID.fromString("4c48ba25-c1d0-4bdd-9260-c1fa2e42a5d3");
99
    private static final UUID uuidNotYetWorkedOn = UUID.fromString("8d47e59a-790d-428f-8060-01d443519166");
100

  
101

  
102

  
103

  
104

  
98 105
	public static TaxonRelationshipType NewInstance(String term, String label, String labelAbbrev, boolean symmetric, boolean transitive) {
99 106
		return new TaxonRelationshipType(term, label, labelAbbrev, symmetric, transitive);
100 107
	}
......
414 421
		return getTermByUuid(uuidIncludedInOrIncludesOrExcludes);
415 422
	}
416 423

  
424
	public static final TaxonRelationshipType UNCLEAR(){
425
	    return getTermByUuid(uuidUnclear);
426
	}
427

  
428
    public static final TaxonRelationshipType NOT_YET_WORKED_ON(){
429
        return getTermByUuid(uuidNotYetWorkedOn);
430
    }
431

  
432

  
417 433
	@Override
418 434
    protected void setDefaultTerms(TermVocabulary<TaxonRelationshipType> termVocabulary) {
419 435
		termMap = new HashMap<UUID, TaxonRelationshipType>();
......
432 448
    public TaxonRelationshipType readCsvLine(Class<TaxonRelationshipType> termClass, List<String> csvLine, Map<UUID,DefinedTermBase> terms, boolean abbrevAsId) {
433 449
        TaxonRelationshipType newInstance = super.readCsvLine(termClass, csvLine, terms, abbrevAsId);
434 450

  
435
        String inverseLabelAbbrev = csvLine.get(7).trim();
436 451
        newInstance.setSymbol(newInstance.getIdInVocabulary());
452
        String inverseLabelAbbrev = csvLine.get(7).trim();
437 453
        newInstance.setInverseSymbol(inverseLabelAbbrev);
438 454
        return newInstance;
439 455
    }
cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv
25 25
"b7153c89-cc6c-4f8c-bf74-216f10feac46",,"Includes or Overlaps or Excludes","Includes or Overlaps or Excludes","⊃⊕!","Included in or Overlaps or Excludes","Included in or Overlaps or Excludes","⊂⊕!",FALSE,FALSE
26 26
"89dffa4e-e004-4d42-b0d1-ae1827529e43",,"Not Included in","Not Included in","≅⊃⊕!","Does Not Include","Does Not Include","≅⊂⊕!",FALSE,FALSE
27 27
"6c16c33b-cfc5-4a00-92bd-a9f9e448f389",,"Not Congruent to","Not Congruent to","⊂⊃⊕!","Not Congruent to","Not Congruent to","⊂⊃⊕!",TRUE,FALSE
28
"831fcd88-e5c9-49e0-b06e-bbb67d1c05c9",,"All Relationships","All Relationships","≅⊂⊃⊕!","All Relationships","All Relationships","≅⊂⊃⊕!",TRUE,FALSE
28
"831fcd88-e5c9-49e0-b06e-bbb67d1c05c9",,"All Relationships","All Relationships","≅⊂⊃⊕!","All Relationships","All Relationships","≅⊂⊃⊕!",TRUE,FALSE
29
"4c48ba25-c1d0-4bdd-9260-c1fa2e42a5d3",,"Unclear","Unclear","??","Unclear","Unclear","??",TRUE,FALSE
30
"8d47e59a-790d-428f-8060-01d443519166",,"Not yet worked on","Not yet worked on","⌛","Unclear","Unclear","⌛",TRUE,FALSE

Also available in: Unified diff