implemented user management, fixes #803. Minor refactorings.

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / editor / name / ConceptComposite.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
index 5914b94216d8e0ceb47db229928ab00f77c42a0b..e213376870ae678d4f74e899ebaa3f07ad1ffda3 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/ConceptComposite.java
@@ -22,8 +22,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
 import eu.etaxonomy.taxeditor.operations.ChangeConceptRelationshipTypeOperation;\r
 import eu.etaxonomy.taxeditor.operations.ChangeConceptToSynonymOperation;\r
-import eu.etaxonomy.taxeditor.operations.ChangeHomotypicGroupOperation;\r
-import eu.etaxonomy.taxeditor.operations.ChangeSynonymToMisapplicationOperation;\r
 import eu.etaxonomy.taxeditor.propertysheet.name.ConceptPropertySource;\r
 \r
 /**\r
@@ -31,7 +29,7 @@ import eu.etaxonomy.taxeditor.propertysheet.name.ConceptPropertySource;
  * @created 26.01.2009\r
  * @version 1.0\r
  */\r
-public class ConceptComposite extends NameComposite {\r
+public class ConceptComposite extends NameComposite<Taxon> {\r
        \r
        private Taxon relatedTaxon;\r
        private TaxonRelationshipType relationshipType;\r
@@ -44,12 +42,18 @@ public class ConceptComposite extends NameComposite {
        private ConceptComposite(TaxonNameEditor editor, Composite parent,\r
                        Taxon relatedTaxon, TaxonRelationshipType relationshipType, \r
                        boolean acceptedTaxonIsFromTaxon) {\r
-               super(editor, parent, NameComposite.CONCEPTRELATION, relatedTaxon);\r
-               \r
-               this.taxon = editor.getTaxon();\r
+               super(editor, parent, relatedTaxon);\r
+\r
                this.relatedTaxon = relatedTaxon;\r
                this.relationshipType = relationshipType;\r
                this.setAcceptedTaxonIsFromTaxon(acceptedTaxonIsFromTaxon);\r
+       }\r
+       \r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.name.NameComposite#initializeComposite()\r
+        */\r
+       @Override\r
+       protected void initializeComposite() {\r
                \r
                setIsDraggable(true);\r
                setIcon(CONCEPT_ICON);\r