Project

General

Profile

« Previous | Next » 

Revision ba527935

Added by Niels Hoffmann over 12 years ago

Creation of concept relationship was not correct. Relationship symbol showed the inverse of actual relation.

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptLabelProvider.java
65 65 
	 */
66 66 
	private String formatRelationship(TaxonRelationship relationship){
67 67 
		Taxon acceptedTaxon = EditorUtil.getActiveMultiPageTaxonEditor().getTaxon();
68 
		boolean inverse = relationship.getFromTaxon().equals(acceptedTaxon) ? true : false;
68 
		boolean inverse = relationship.getFromTaxon().equals(acceptedTaxon) ? false : true;
69 69
70 70 
		TaxonRelationshipType type = relationship.getType();
71 71 
		Representation representation = inverse ? type.getInverseRepresentation(Language.ENGLISH()) : type.getRepresentation(Language.ENGLISH());
72 72
73 73 
		Taxon relatedTaxon = inverse ? relationship.getToTaxon() : relationship.getFromTaxon();
74 74
75 
		String symbolString = representation.getAbbreviatedLabel();
76 
		String relatedTaxonString = relatedTaxon.getName().getTitleCache();
77 
		String secReferenceString = relatedTaxon.getSec().getTitleCache();
75 
		String symbol = representation.getAbbreviatedLabel();
78 76
79 
		String string = String.format("%s %s sensu %s", symbolString, relatedTaxonString, secReferenceString);
77 
		String string = String.format("%s %s", symbol, relatedTaxon);
80 78
81 79 
		return string;
82 80 
	}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
61 61 

  		




  62
  62
  
    
		monitor.worked(20);


  		




  63
  63
  
    
		// add concept to taxon


  		




  64
  
  
    
		concept.addTaxonRelation(taxon, taxonRelationshipType, null, null);	


  		




  
  64
  
    
		taxon.addTaxonRelation(concept, taxonRelationshipType, null, null);	


  		




  65
  65
  
    
		monitor.worked(40);


  		




  66
  66
  
    
		


  		




  67
  67
  
    
		// redraw editor if exists


  		












Also available in:  Unified diff