Creation of concept relationship was not correct. Relationship symbol showed the...
authorn.hoffmann <n.hoffmann@localhost>
Wed, 30 Nov 2011 16:35:46 +0000 (16:35 +0000)
committern.hoffmann <n.hoffmann@localhost>
Wed, 30 Nov 2011 16:35:46 +0000 (16:35 +0000)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/ConceptLabelProvider.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java

index 937147c2d77b02b9382347a1e3018219bbc08143..58add71daf2dab844593c47113ac6a4584b1dbd8 100644 (file)
@@ -65,18 +65,16 @@ public class ConceptLabelProvider extends LabelProvider implements IStyledLabelP
         */
        private String formatRelationship(TaxonRelationship relationship){
                Taxon acceptedTaxon = EditorUtil.getActiveMultiPageTaxonEditor().getTaxon();
-               boolean inverse = relationship.getFromTaxon().equals(acceptedTaxon) ? true : false;
+               boolean inverse = relationship.getFromTaxon().equals(acceptedTaxon) ? false : true;
                
                TaxonRelationshipType type = relationship.getType();
                Representation representation = inverse ? type.getInverseRepresentation(Language.ENGLISH()) : type.getRepresentation(Language.ENGLISH());
                
                Taxon relatedTaxon = inverse ? relationship.getToTaxon() : relationship.getFromTaxon();
                
-               String symbolString = representation.getAbbreviatedLabel();
-               String relatedTaxonString = relatedTaxon.getName().getTitleCache();
-               String secReferenceString = relatedTaxon.getSec().getTitleCache(); 
+               String symbol = representation.getAbbreviatedLabel();
                
-               String string = String.format("%s %s sensu %s", symbolString, relatedTaxonString, secReferenceString);
+               String string = String.format("%s %s", symbol, relatedTaxon);
                
                return string;
        }
index 9e4de5b09e35dc813efccee60926ea66f9552eea..5d5d01b6ad42e56b2243b3263798099b8ef8a7f0 100644 (file)
@@ -61,7 +61,7 @@ public class CreateConceptRelationOperation extends AbstractPostOperation {
 
                monitor.worked(20);
                // add concept to taxon
-               concept.addTaxonRelation(taxon, taxonRelationshipType, null, null);     
+               taxon.addTaxonRelation(concept, taxonRelationshipType, null, null);     
                monitor.worked(40);
                
                // redraw editor if exists