Refactored description editor per #577

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / editor / name / TaxonNameEditor.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
index b51e4dc209b7b2caa7ac48e15e7bb98755631168..347f6953221976213657c4818ea9d38afcd43427 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
@@ -44,7 +44,6 @@ import eu.etaxonomy.taxeditor.controller.EditorController;
 import eu.etaxonomy.taxeditor.controller.GlobalController;\r
 import eu.etaxonomy.taxeditor.editor.AbstractTaxonEditor;\r
 import eu.etaxonomy.taxeditor.editor.FreeTextElementFactory;\r
-import eu.etaxonomy.taxeditor.editor.INameEditorCompositeRepository;\r
 import eu.etaxonomy.taxeditor.operations.name.ChangeHomotypicGroupOperation;\r
 import eu.etaxonomy.taxeditor.operations.name.ChangeMisappliedNameToSynonymOperation;\r
 \r
@@ -54,7 +53,7 @@ import eu.etaxonomy.taxeditor.operations.name.ChangeMisappliedNameToSynonymOpera
  * @version 1.0\r
  */\r
 public class TaxonNameEditor extends AbstractTaxonEditor \r
-               implements INameEditorCompositeRepository{\r
+               implements INameEditorCompositeRepository {\r
        private static final Logger logger = Logger.getLogger(TaxonNameEditor.class);\r
                \r
        /**\r
@@ -82,8 +81,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
                super.init(site, input);\r
                \r
                Taxon taxon = getTaxon();\r
-       \r
-               EditorController.addEditor(taxon, this);\r
+               EditorController.addNameEditor(taxon, this);\r
                \r
                // Register listeners for any change in accepted name or set of relations\r
                taxon.getName().addPropertyChangeListener(taxonChangeListener);\r
@@ -99,17 +97,20 @@ public class TaxonNameEditor extends AbstractTaxonEditor
        public boolean isSaveAsAllowed() {\r
                return false;\r
        }\r
-                       \r
+       \r
+       @Override\r
        protected void createManagedForm(Composite composite) {\r
                \r
                super.createManagedForm(composite);\r
                \r
                Taxon taxon = getTaxon();\r
                \r
+               // Draw accepted name element\r
                NameComposite acceptedNameComposite = \r
                                (NameComposite) FreeTextElementFactory.getDefault().\r
                                                createAcceptedTaxon(managedForm, taxon);\r
                                \r
+               // Draw synonym and misapplied name elements\r
                for (TaxonBase taxonBase : new IterableSynonymyList(taxon)) {\r
                        if (taxonBase instanceof Synonym) {\r
                                FreeTextElementFactory.getDefault().createSynonym(taxon, (Synonym) taxonBase);                          \r
@@ -118,6 +119,7 @@ public class TaxonNameEditor extends AbstractTaxonEditor
                        }\r
                }\r
 \r
+               // Draw concept relation elements\r
                Set<TaxonRelationship> taxonRelations = taxon.getTaxonRelations();\r
                for (TaxonRelationship relationship : taxonRelations) {\r
                        \r
@@ -167,28 +169,13 @@ public class TaxonNameEditor extends AbstractTaxonEditor
                        }               \r
                });\r
                                \r
-               // We've added elements to the managed form, so redraw it\r
+               // Redraw composite\r
                composite.layout();\r
                \r
                setSelection(acceptedNameComposite);\r
                acceptedNameComposite.drawBorder();\r
-               \r
        }\r
-       \r
-       public boolean redraw(){\r
                \r
-               this.selectedObject = null;\r
-               \r
-               managedForm.getForm().dispose();\r
-                               \r
-               createManagedForm(partComposite);\r
-               \r
-               return true;\r
-       }\r
-       \r
-\r
-\r
-       \r
        private HashSet<Composite> getAllComposites(){\r
                HashSet<Composite> composites = new HashSet<Composite>();\r
                composites.add(parent);\r
@@ -210,7 +197,6 @@ public class TaxonNameEditor extends AbstractTaxonEditor
        \r
        @Override\r
        public Composite getAcceptedName() {\r
-               \r
                for(Composite c : getAllComposites()){\r
                        if(c instanceof AcceptedNameComposite){\r
                                return c;\r