About to try fooling around w DND.

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
index 16b4b13f0be469cf5e23f685fa1239112ff8c6f8..321a85be107fa3c317b860e5c94dbaa485b78938 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupComposite.java
@@ -49,7 +49,6 @@ public class GroupComposite extends Composite {
 \r
                // Drop functionality\r
                this.setDroppable(true);\r
-\r
        }\r
        \r
        public void setDroppable(boolean droppable) {\r
@@ -88,14 +87,11 @@ public class GroupComposite extends Composite {
        \r
        public void dispose() {\r
                \r
-               target.removeDropListener(dropListener);\r
-               \r
-//             for (Control control : getChildren()) {\r
-//                     if (!control.isDisposed()) {\r
-//                             control.dispose();\r
-//                     }\r
-//             }\r
-               \r
+               if (target != null) {\r
+                       target.removeDropListener(dropListener);\r
+                       target.dispose();\r
+               }\r
+                               \r
                super.dispose();\r
        }\r
 }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
index 3329e715bddd56c2df1c35152f5d938bbaf80bdb..027a301c8fd21170f4771d812383dcc129fded1b 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupCompositeLabel.java
@@ -28,6 +28,8 @@ public class GroupCompositeLabel extends Composite {
        public GroupCompositeLabel(Composite parent, String labelText) {\r
                super(parent, SWT.NONE);\r
                \r
+               // TODO move to group composite?\r
+               \r
                TableWrapLayout tableWrapLayout = new TableWrapLayout();\r
                tableWrapLayout.horizontalSpacing = 1;\r
                tableWrapLayout.rightMargin = 10;\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
index c42c1cfe4eae6e6da8b599800a97c9809f4d73b7..6afd4d5c402d976a8cf1a30da67814230aab6727 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/GroupedComposite.java
@@ -29,7 +29,6 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Label;\r
-import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.ui.forms.IManagedForm;\r
 import org.eclipse.ui.forms.widgets.TableWrapData;\r
 import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
@@ -251,20 +250,7 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
        private FocusListener getFocusListener() {\r
                return focusListener;\r
        }\r
-       \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.swt.widgets.Control#getMenu()\r
-        */\r
-//     public Menu getMenu () {\r
-//             \r
-//             Menu menu = draggableLabel.getMenu();\r
-//             if (menu == null) {\r
-//                     menu = new Menu(draggableLabel);\r
-//                     draggableLabel.setMenu(menu);\r
-//             }\r
-//             return menu;\r
-//     }\r
-       \r
+               \r
        /**\r
         * \r
         */\r
@@ -350,24 +336,15 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
        DragSourceListener dragSourceListener = new DragSourceAdapter() {\r
 \r
                public void dragStart(DragSourceEvent event) {\r
-//                     GroupedComposite.this.setFocus();\r
-\r
                        if (getTextViewer() != null) {\r
                                getTextViewer().getTextWidget().setFocus();\r
                        }\r
-                       \r
                        event.doit = true;\r
                }\r
                \r
                public void dragSetData(DragSourceEvent event) {\r
                        WidgetTransfer.getInstance().setWidget(GroupedComposite.this);\r
                }\r
-               \r
-               public void dragFinished(DragSourceEvent event){\r
-//                     WidgetTransfer.getInstance().setWidget(null);\r
-                       dragSource = null;\r
-//                     ((DragSource) event.widget).dispose();\r
-               }\r
        };\r
        \r
        /* (non-Javadoc)\r
@@ -375,15 +352,10 @@ abstract public class GroupedComposite extends Composite implements IHasProperty
         */\r
        public void dispose () {\r
                \r
-               logger.warn("disposing");\r
-               \r
-               // Nullify decorator to stop its listener to listening for\r
-               //      composite focus\r
-//             borderDecorator.dispose();\r
-               \r
                if (dragSource != null) {\r
                        dragSource.removeDragListener(dragSourceListener);\r
-               }\r
+                       dragSource.dispose();\r
+               }               \r
                \r
                if (getFocusListener() != null && getTextViewer() != null \r
                                && getTextViewer().getTextWidget() != null) {\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
index 1bee97f7bfd9d3f1d756ff98e7c292943ed9aabb..dea038a43844dba4323e422ba01b1355a474130d 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/MisappliedNameComposite.java
@@ -12,8 +12,6 @@ package eu.etaxonomy.taxeditor.editor.name;
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.commands.operations.IUndoContext;\r
 import org.eclipse.core.commands.operations.IUndoableOperation;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
 import org.eclipse.swt.graphics.Font;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.ui.forms.IManagedForm;\r
@@ -23,14 +21,11 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;\r
-import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
-import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
 import eu.etaxonomy.taxeditor.actions.name.RemoveConceptAction;\r
 import eu.etaxonomy.taxeditor.controller.EditorController;\r
 import eu.etaxonomy.taxeditor.controller.GlobalController;\r
 import eu.etaxonomy.taxeditor.editor.ContextMenu;\r
 import eu.etaxonomy.taxeditor.operations.name.ChangeMisappliedNameToSynonymOperation;\r
-import eu.etaxonomy.taxeditor.operations.name.RemoveConceptRelationOperation;\r
 import eu.etaxonomy.taxeditor.propertysheet.name.TaxonBasePropertySource;\r
 \r
 /**\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameViewer.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
index a974634e56c7209bed8d4c7870a196c860b947f5..d12dbdc29c8cc501f16ed92a04021f25ed12e76a 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/name/NameViewer.java
@@ -338,9 +338,6 @@ public class NameViewer extends SourceViewer {
                                \r
                        }\r
                }\r
-       }       \r
-//     public boolean isMultiLine(Annotation annotation) {\r
-//         return true;\r
-//     }\r
+       }\r
 }\r
 \r