Halfway through refactoring upwards from NameComposite, DescriptionElementComposite...

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / editor / description / DescriptionLabelComposite.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
index 090572f0a6836a244dd0446389fe8f0e924ccb75..25f481a414f31a64e30fb767c6d36efa5818297f 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionLabelComposite.java
@@ -18,10 +18,13 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;\r
 import org.eclipse.swt.events.FocusAdapter;\r
 import org.eclipse.swt.events.FocusEvent;\r
+import org.eclipse.swt.graphics.Color;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.forms.IManagedForm;\r
+import org.eclipse.ui.forms.widgets.TableWrapData;\r
+import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
 import org.eclipse.ui.views.properties.IPropertySource;\r
 \r
 import eu.etaxonomy.cdm.model.description.Feature;\r
@@ -89,34 +92,29 @@ public class DescriptionLabelComposite extends GroupedComposite {
                \r
                initTextViewer();\r
        }\r
-\r
+       \r
        private void initTextViewer() {\r
-               String text = getDescription().getTitleCache();\r
-               getTextViewer().getTextWidget().setText(text);\r
+               if (textViewer != null) {\r
+                       String text = getDescription().getTitleCache();\r
+                       textViewer.getTextWidget().setText(text);\r
+               } else {\r
+                       logger.warn("TextViewer is null.");\r
+               }\r
        }\r
 \r
        public TaxonDescription getDescription() {\r
                return description;\r
        }\r
-               \r
-       public void setIcon(Image icon) {\r
-               // Adapted from NameComposite\r
-               if (getTextViewer() instanceof NameViewer) {\r
-                       ((NameViewer) getTextViewer()).setIcon(icon);\r
-               }\r
-       }\r
        \r
        protected ContextMenu createContextMenu() {\r
                // Adapted from NameComposite\r
                \r
-               NameViewer nameViewer = (NameViewer) getTextViewer();\r
-               \r
-               if (nameViewer != null) {\r
-                       ContextMenu contextMenu = new ContextMenu(nameViewer.getRulerControl());\r
-                       nameViewer.getTextWidget().setMenu(contextMenu.getMenu());\r
+               if (textViewer != null) {\r
+                       ContextMenu contextMenu = new ContextMenu(textViewer.getRulerControl());\r
+                       textViewer.getTextWidget().setMenu(contextMenu.getMenu());\r
                        return contextMenu;\r
                } else {\r
-                       logger.warn("Can't create menu because nameViewer has not been initalized.");\r
+                       logger.warn("Can't create menu because textViewer has not been initalized.");\r
                        return null;\r
                }\r
        }\r