Added focus listeners to DescriptionElementComposite, DescriptionLabelComposite to...

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
index 2b4491f79796d8517b85d7fb8e1ebb745d51bbcc..f3923dbcecd18f113cd6b1d28673e37c4f95bb1e 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/description/DescriptionElementComposite.java
@@ -15,6 +15,8 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.text.Document;\r
 import org.eclipse.jface.text.source.SourceViewer;\r
 import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.events.FocusAdapter;\r
+import org.eclipse.swt.events.FocusEvent;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
@@ -167,6 +169,11 @@ public class DescriptionElementComposite extends EditorGroupedComposite {
                                setDirty(true);\r
                        }\r
                });\r
+               this.textViewer.getTextWidget().addFocusListener(new FocusAdapter() {\r
+                       public void focusGained(FocusEvent e) {\r
+                               setFocus();\r
+                       }                       \r
+               });\r
        }\r
 \r
        private void createMenu() {\r

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 bf33c57a6f2d4c1e8821d41d6680e5217752f006..a3b9fbbb6be75c3d8a51c8a4cadf529e7c8bc166 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,6 +18,8 @@ import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.text.Document;\r
 import org.eclipse.jface.text.source.SourceViewer;\r
 import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.events.FocusAdapter;\r
+import org.eclipse.swt.events.FocusEvent;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.graphics.Image;\r
 import org.eclipse.swt.widgets.Composite;\r
@@ -132,6 +134,10 @@ public class DescriptionLabelComposite extends EditorGroupedComposite {
                        }\r
                        \r
                });\r
+               this.textViewer.getTextWidget().addFocusListener(new FocusAdapter() {\r
+                       public void focusGained(FocusEvent e) {\r
+                               setFocus();\r
+                       }                       \r
+               });             \r
        }\r
-\r
 }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/PropertySourceAdapter.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/PropertySourceAdapter.java
index 93d9ebc209659884f9f855b577404029616eafc6..c57f136d700eec732429e9d35bbc94238576e508 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/PropertySourceAdapter.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/propertysheet/PropertySourceAdapter.java
@@ -50,9 +50,12 @@ public class PropertySourceAdapter {
                if (clazz == TaxonDescription.class) {\r
                        return new TaxonDescriptionPropertySource((TaxonDescription) propertyObject);\r
                }               \r
-               if ((clazz == DescriptionElementBase.class) || (clazz == TextData.class)) {\r
+//             if ((clazz == DescriptionElementBase.class) || (clazz == TextData.class)) {\r
+//                     return new DescriptionElementPropertySource((DescriptionElementBase) propertyObject);\r
+//             }\r
+               if (propertyObject instanceof DescriptionElementBase) {\r
                        return new DescriptionElementPropertySource((DescriptionElementBase) propertyObject);\r
-               }\r
+               }               \r
                \r
                // Property sources for names\r
                if (clazz == BotanicalName.class) {\r