implemented user management, fixes #803. Minor refactorings.

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
index 5c82a784a488635ffb99d4155e161a522b769fcd..b532e2b4b18864e47e2a971548d7cad851bf429c 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
@@ -26,16 +26,19 @@ import eu.etaxonomy.taxeditor.propertysheet.name.MisapplicationPropertySource;
  * @created 13.01.2009\r
  * @version 1.0\r
  */\r
-public class MisappliedNameComposite extends NameComposite {\r
-       \r
-       private Taxon misappliedName;\r
+public class MisappliedNameComposite extends NameComposite<Taxon> {\r
        \r
        public MisappliedNameComposite(TaxonNameEditor editor, Composite parent, Taxon misappliedName) {\r
-               super(editor, parent, NameComposite.MISAPPLIED_NAME, misappliedName);\r
-               \r
-               this.taxon = editor.getTaxon();\r
-               this.misappliedName = misappliedName;\r
-               \r
+               super(editor, parent, misappliedName);\r
+\r
+       }\r
+       \r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.taxeditor.editor.name.NameComposite#initializeComposite()\r
+        */\r
+       @Override\r
+       protected void initializeComposite() {\r
                setIsDraggable(true);\r
                setIcon(MISAPPLIEDNAME_ICON);\r
                setFont(getViewerFont());\r
@@ -43,23 +46,23 @@ public class MisappliedNameComposite extends NameComposite {
                \r
                showSec();              \r
                \r
-               initTextViewer(misappliedName);\r
+               initTextViewer(getMisappliedName());\r
        }\r
 \r
        private void showSec() {\r
-               if (misappliedName == null) {\r
+               if (getMisappliedName() == null) {\r
                        return;\r
                }\r
                \r
-               if (misappliedName.getSec() == null) {\r
+               if (getMisappliedName().getSec() == null) {\r
                        setNonEditableInfo("sec. ???");\r
                } else {\r
-                       setNonEditableInfo("sec. " + misappliedName.getSec().getTitleCache());\r
+                       setNonEditableInfo("sec. " + getMisappliedName().getSec().getTitleCache());\r
                }\r
        }\r
        \r
        public Taxon getMisappliedName() {\r
-               return misappliedName;\r
+               return getTaxonBase();\r
        }\r
                \r
        public boolean setParent(Composite parent) {\r
@@ -73,7 +76,7 @@ public class MisappliedNameComposite extends NameComposite {
                                        ((HomotypicalGroupComposite)parent).getGroup();\r
                        \r
                        IUndoableOperation operation = new ChangeConceptToSynonymOperation\r
-                                       ("change misapplication to synonym", editor.getUndoContext(), taxon, misappliedName, homotypicalGroup, editor);\r
+                                       ("change misapplication to synonym", editor.getUndoContext(), taxon, getMisappliedName(), homotypicalGroup, editor);\r
                        EditorUtil.executeOperation(operation);\r
                        \r
                        doSetParent = true;\r
@@ -82,7 +85,7 @@ public class MisappliedNameComposite extends NameComposite {
        }\r
        \r
        public IPropertySource getPropertySource() {\r
-               return new MisapplicationPropertySource(misappliedName);\r
+               return new MisapplicationPropertySource(getMisappliedName());\r
        }\r
 \r
        @Override\r
@@ -93,15 +96,16 @@ public class MisappliedNameComposite extends NameComposite {
        protected void calculateErrors() {\r
                super.calculateErrors();\r
                \r
-               textViewer.setShowSecError(misappliedName);\r
+               textViewer.setShowSecError(getMisappliedName());\r
        }\r
 \r
        @Override\r
        protected TaxonNameBase<?, ?> getName() {\r
-               return misappliedName.getName();\r
+               return getMisappliedName().getName();\r
        }\r
        \r
        public Object getData () {\r
                return getMisappliedName();\r
        }\r
+\r
 }
\ No newline at end of file