Taxonomic tree provider substantially re-programmed, cleaned up.

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / view / nameviewersupport / NameComposite.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java
index 47ee60a99253e6518a37c732227d4d4f163a558d..4a7dcc23fe571150f579c4c7f0a673f5b973a93f 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/nameviewersupport/NameComposite.java
@@ -1,64 +1,34 @@
 package eu.etaxonomy.taxeditor.view.nameviewersupport;\r
 \r
+import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
 \r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-import eu.etaxonomy.taxeditor.Activator;\r
-import eu.etaxonomy.taxeditor.view.NameViewer;\r
+import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
+import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
 \r
-public class NameComposite extends GroupedComposite {\r
-       \r
-       public static final int ACCEPTED = 0;\r
-       public static final int HOMOTYPIC_SYNONYM = 1;\r
-       public static final int HETEROTYPIC_SYNONYM = 2;\r
+public class NameComposite extends EditableGroupedComposite {\r
+               \r
+       // TODO is there any reason not to get these directly from Plugin\r
+       public static final int ACCEPTED_INDENT = 0;\r
+       public static final int SYNONYM_INDENT = 15;\r
+       public static final int MISAPPLIEDNAME_INDENT = 15;\r
        \r
-       int compositeType = HETEROTYPIC_SYNONYM;\r
-\r
-       public NameComposite(Composite parent, Object data, boolean draggable) {\r
-               super(parent, data, draggable);\r
-       }\r
+       public static final Font ACCEPTED_FONT = TaxEditorPlugin.getDefault().getFont(ITaxEditorConstants.ACCEPTED_TAXON_FONT);\r
+       public static final Font SYNONYM_FONT = TaxEditorPlugin.getDefault().getFont(ITaxEditorConstants.SYNONYM_FONT);\r
+       public static final Font MISAPPLIEDNAME_FONT = TaxEditorPlugin.getDefault().getFont(ITaxEditorConstants.MISAPPLIEDNAME_FONT);\r
        \r
-       /**\r
-        * \r
-        */\r
-       public void createNameComposite() {\r
-                                               \r
-               if (getData() instanceof Taxon) {\r
-                       mainentry = true;\r
-                       compositeType = ACCEPTED;\r
-               }\r
-               \r
-               super.createNameComposite();\r
-               \r
-               setIcon(compositeType);\r
-               \r
-               setViewer(new NameViewer(this));\r
-\r
-               initialize();\r
-       }\r
-\r
+       public static final Image ACCEPTED_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.ACCEPTED_TAXON_ICON);\r
+       public static final Image HOMOTYPIC_SYNONYM_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.HOMOTYPIC_SYN_ICON);\r
+       public static final Image HOMOTYPIC_SYNONYM_ORIGINAL_COMBINATION_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.HOMOTYPIC_SYN_ORIGINAL_ICON);\r
+       public static final Image HETEROTYPIC_SYNONYM_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.HETEROTYPIC_SYN_ICON);\r
+       public static final Image HETEROTYPIC_SYNONYM_ORIGINAL_COMBINATION_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.HETEROTYPIC_SYN_ORIGINAL_ICON);\r
+       public static final Image MISAPPLIEDNAME_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.MISAPPLIED_NAME_ICON);\r
+       public static final Image AUTONYM_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.AUTONYM_ICON);\r
+       public static final Image BASIONYM_ICON = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.BASIONYM_ICON);\r
+       public static final Image MOVE = TaxEditorPlugin.getDefault().getImage(ITaxEditorConstants.MOVE_ICON);\r
        \r
-       protected void initialize() {\r
-               if (getData() instanceof TaxonBase) {\r
-                       ((NameViewer) dataViewer).initialize((TaxonBase) getData());\r
-               }\r
-               super.initialize();\r
-       }\r
-\r
-       public void setIcon(int type) {\r
-               Image icon;\r
-               switch (type) {\r
-                       case ACCEPTED:\r
-                               icon = Activator.getDefault().getImageRegistry().get(Activator.ACCEPTED_TAXON);\r
-                               break;\r
-                       case HOMOTYPIC_SYNONYM:\r
-                               icon = Activator.getDefault().getImageRegistry().get(Activator.HOMOTYPIC_SYN);\r
-                               break;\r
-                       default:\r
-                               icon = Activator.getDefault().getImageRegistry().get(Activator.HETEROTYPIC_SYN);                        \r
-               }\r
-               super.setIcon(icon);\r
+       public NameComposite(Composite parent) {\r
+               super(parent);\r
        }\r
 }
\ No newline at end of file