Halfway through refactoring upwards from NameComposite, DescriptionElementComposite...

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

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
index 538a96951692ae1d0d27e0f0d79184ac13a5bf4e..7eef59c58e0588d9033506b663c66fe8c51f0af5 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameComposite.java
@@ -143,8 +143,6 @@ public abstract class NameComposite extends GroupedComposite {
 \r
        protected boolean isParsing;\r
 \r
-       protected NameViewer nameViewer;\r
-\r
        /**\r
         * The constructor for a DescriptionElementComposite. Takes a parent Composite on which to\r
         * create itself, and an IManagedForm for Composite life cycle methods, i.e.\r
@@ -158,11 +156,11 @@ public abstract class NameComposite extends GroupedComposite {
                        String compositeType, TaxonBase taxonBase) {\r
                super(parent, managedForm);\r
 \r
-               createNameViewer();\r
+               createTextViewer();\r
                createBorderSupport();\r
                createLineWrapSupport();\r
                \r
-               setDraggableControl(nameViewer.getRulerControl());\r
+               setDraggableControl(textViewer.getRulerControl());\r
                \r
                createParser();\r
                createEmptyViewerPrompt(EMPTY_NAME_PROMPT);\r
@@ -172,20 +170,6 @@ public abstract class NameComposite extends GroupedComposite {
                //      during a session was to open a new taxon, the empty name prompt didn't work\r
                createNameListener(taxonBase.getName());\r
        }\r
-\r
-       protected void createContent() {\r
-               setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB));\r
-               TableWrapLayout layout = new TableWrapLayout();\r
-               layout.leftMargin = 0;\r
-               layout.topMargin = 0;\r
-               layout.bottomMargin = 0;\r
-               layout.verticalSpacing = 0;\r
-               setLayout(layout);\r
-               \r
-               Color groupBackgroundColor = TaxEditorPlugin.getDefault().\r
-                               getColor(ITaxEditorConstants.GROUP_GRAY_BKG_COLOR);\r
-               setBackground(groupBackgroundColor);\r
-       }\r
        \r
        protected String getEmptyTextPrompt() {\r
                return EMPTY_NAME_PROMPT;\r
@@ -297,18 +281,18 @@ public abstract class NameComposite extends GroupedComposite {
        protected abstract TaxonNameBase getName();\r
        \r
        protected void calculateErrors() {\r
-               nameViewer.clearErrors();\r
-               nameViewer.setShowParsingError(getName());\r
+               textViewer.clearErrors();\r
+               textViewer.setShowParsingError(getName());\r
        }\r
        \r
-       private NameViewer createNameViewer() {\r
+       private NameViewer createTextViewer() {\r
                \r
-               nameViewer = new NameViewer(this);\r
+               textViewer = new NameViewer(this);\r
                \r
-               StyledText styledText = nameViewer.getTextWidget();\r
-//             nameViewer.setLineBreakListener(new LineBreakListener() {\r
+               StyledText styledText = textViewer.getTextWidget();\r
+//             textViewer.setLineBreakListener(new LineBreakListener() {\r
                \r
-               setTextViewer(nameViewer);\r
+               setTextViewer(textViewer);\r
                                \r
                LineBreakListener lineBreakListener = new LineBreakListener() {\r
                        @Override\r
@@ -331,9 +315,9 @@ public abstract class NameComposite extends GroupedComposite {
                        }\r
                });\r
                \r
-               // createLineWrapSupport(nameViewer);\r
+               // createLineWrapSupport(textViewer);\r
                \r
-               return nameViewer;\r
+               return textViewer;\r
        }\r
 \r
        private Label nonEditableInfo;\r
@@ -355,28 +339,14 @@ public abstract class NameComposite extends GroupedComposite {
                }\r
                nonEditableInfo.setText(info.toUpperCase());\r
        }\r
-       \r
-       public NameViewer getTextViewer() {\r
-               return this.nameViewer;\r
-       }\r
-       \r
-       public void setTextViewer(NameViewer textViewer) {\r
-               this.nameViewer = textViewer;\r
-       }\r
-       \r
+               \r
        public void createBorderSupport() {\r
                super.createBorderSupport();\r
-               if (nameViewer != null) {\r
-                       borderDecorator.setBorderedComposite(nameViewer.getTextWidget());\r
+               if (textViewer != null) {\r
+                       borderDecorator.setBorderedComposite(textViewer.getTextWidget());\r
                }\r
        }\r
-       \r
-       public void setIcon(Image icon) {\r
-               if (nameViewer != null) {\r
-                       nameViewer.setIcon(icon);\r
-               }\r
-       }\r
-       \r
+               \r
        protected IPropertySource getPropertySourceByName(TaxonNameBase name) {\r
                if (name == null) {\r
                        return null;\r
@@ -396,12 +366,12 @@ public abstract class NameComposite extends GroupedComposite {
        }\r
        \r
        protected ContextMenu createContextMenu() {\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