(no commit message)

diff --git a/.gitattributes b/.gitattributes
index 01bfcb828459db662f8a76e85b3834e93c56dece..b8db2e79db28aa7a5f847c143feb6875657e0939 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -441,7 +441,6 @@ eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/NameTree
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/PropertySheetNode.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/TaxTreeContentProvider.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/model/TaxonomicTreeContentProvider.java -text
-eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/test/TestDragAndDrop.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/ContextMenu.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/EditorDetailsPage.java -text
 eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/view/EmptyEditorView.java -text

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/test/TestDragAndDrop.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/test/TestDragAndDrop.java
deleted file mode 100644 (file)
index 1629d2b..0000000
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/test/TestDragAndDrop.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package eu.etaxonomy.taxeditor.test;\r
-\r
-import org.apache.log4j.Logger;\r
-import org.eclipse.core.databinding.observable.set.ISetChangeListener;\r
-import org.eclipse.core.databinding.observable.set.SetChangeEvent;\r
-import org.eclipse.swt.SWT;\r
-import org.eclipse.swt.dnd.DND;\r
-import org.eclipse.swt.dnd.DropTarget;\r
-import org.eclipse.swt.dnd.DropTargetAdapter;\r
-import org.eclipse.swt.dnd.DropTargetEvent;\r
-import org.eclipse.swt.dnd.Transfer;\r
-import org.eclipse.swt.layout.FillLayout;\r
-import org.eclipse.swt.layout.GridLayout;\r
-import org.eclipse.swt.widgets.Composite;\r
-import org.eclipse.swt.widgets.Display;\r
-import org.eclipse.swt.widgets.Event;\r
-import org.eclipse.swt.widgets.Listener;\r
-import org.eclipse.swt.widgets.Shell;\r
-\r
-import eu.etaxonomy.cdm.model.name.BotanicalName;\r
-import eu.etaxonomy.cdm.model.taxon.Synonym;\r
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.actions.TaxonTransfer;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.EditorGroupComposite;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.NameComposite;\r
-\r
-public class TestDragAndDrop {\r
-\r
-       private static final Logger logger = Logger.getLogger(TestDragAndDrop.class);\r
-       \r
-       protected Shell shell;\r
-       /**\r
-        * Launch the application\r
-        * @param args\r
-        */\r
-       public static void main(String[] args) {\r
-               try {\r
-                       TestDragAndDrop window = new TestDragAndDrop();\r
-                       window.open();\r
-               } catch (Exception e) {\r
-                       e.printStackTrace();\r
-               }\r
-       }\r
-\r
-       /**\r
-        * Open the window\r
-        */\r
-       public void open() {\r
-               final Display display = Display.getDefault();\r
-               createContents(display);\r
-               shell.open();\r
-               shell.layout();\r
-               while (!shell.isDisposed()) {\r
-                       if (!display.readAndDispatch())\r
-                               display.sleep();\r
-               }\r
-       }\r
-       Taxon taxon;\r
-       Composite composite;\r
-       /**\r
-        * Create contents of the window\r
-        */\r
-       protected void createContents(Display display) {\r
-//             if (logger.isDebugEnabled()){  logger.debug("Creating contents" );}\r
-//                             \r
-//             shell = new Shell();\r
-//             shell.setLayout(new FillLayout());\r
-//             shell.setSize(500, 375);\r
-//             shell.setText("SWT Application");\r
-//             \r
-//             composite = new Composite(shell, SWT.NONE);\r
-//             GridLayout gridLayout = new GridLayout();\r
-//             gridLayout.verticalSpacing = 10;\r
-//             composite.setLayout(gridLayout);\r
-//             composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
-//             \r
-//             taxon = new Taxon();\r
-//             taxon.setName(BotanicalName.PARSED_NAME("Accepted name"));\r
-//                             \r
-//             EditorGroupComposite homoGroupComposite = new EditorGroupComposite(composite);\r
-//             homoGroupComposite.setTaxon(taxon);\r
-//             \r
-//             new NameComposite(homoGroupComposite, taxon);\r
-//             \r
-//             Synonym homosyn = new Synonym();\r
-//             \r
-//             homosyn.setName(BotanicalName.PARSED_NAME("Homotypic synonym"));\r
-//             taxon.addSynonym(homosyn, SynonymRelationshipType.HOMOTYPIC_SYNONYM_OF());\r
-//             new NameComposite(homoGroupComposite, homosyn, taxon);\r
-//     \r
-//             homoGroupComposite.drawRect();\r
-//             \r
-//             createSynAndHetGroup("Heterotypic synonym 1");\r
-//             createSynAndHetGroup("Heterotypic synonym 2");\r
-//             createSynAndHetGroup("Heterotypic synonym 3");\r
-//             createSynAndHetGroup("Heterotypic synonym 4");\r
-//\r
-//             TesterooWritableSet.getInstance().addSetChangeListener\r
-//             (new ISetChangeListener() {\r
-//                     public void handleSetChange(SetChangeEvent event) {\r
-//                             for ( Object addition: event.diff.getAdditions()) {\r
-//                                     if (addition instanceof Synonym)\r
-//                                             createHeterotypicalGroup((Synonym) addition);\r
-//                             }\r
-//                             composite.layout();\r
-//                     }\r
-//             });\r
-//             \r
-//             // Drop functionality\r
-//             Transfer[] types = new Transfer[] {TaxonTransfer.getInstance()};\r
-//             int operations = DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT;\r
-//             DropTarget target = new DropTarget(composite, operations);\r
-//             target.setTransfer(types);\r
-//             target.addDropListener(dropTargetAdapter);\r
-//             \r
-//             composite.addListener(SWT.Modify, new Listener() {\r
-//\r
-//                     public void handleEvent(Event event) {\r
-//                             System.out.println("!");\r
-//                             \r
-//                     }\r
-//\r
-//                     \r
-//             });\r
-                               \r
-       }\r
-       \r
-       private void createSynAndHetGroup(String synonymNameCache) {\r
-//             Synonym heterosyn = new Synonym();\r
-//             heterosyn.setName(BotanicalName.PARSED_NAME(synonymNameCache)); \r
-//             taxon.addSynonym(heterosyn, SynonymRelationshipType.HETEROTYPIC_SYNONYM_OF());\r
-//                             \r
-//             createHeterotypicalGroup(heterosyn);\r
-       }\r
-       \r
-       private void createHeterotypicalGroup(Synonym heterosyn) {\r
-\r
-//             EditorGroupComposite heteroGroupComposite = new EditorGroupComposite(composite);\r
-//             heteroGroupComposite.setTaxon(taxon);\r
-//             \r
-//             new NameComposite(heteroGroupComposite, heterosyn, taxon).setFocus();\r
-//\r
-//             heteroGroupComposite.layout();\r
-//             heteroGroupComposite.drawRect();\r
-//             heteroGroupComposite.layout();\r
-       }\r
-       \r
-       DropTargetAdapter dropTargetAdapter = new DropTargetAdapter() {\r
-               \r
-               public void drop(DropTargetEvent event) {\r
-                       \r
-//                     Synonym synonym = \r
-//                                     (Synonym) event.data; \r
-//                     \r
-//                     EditorGroupComposite heteroGroupComposite = new EditorGroupComposite(composite);\r
-//                     heteroGroupComposite.setTaxon(taxon);\r
-//                     \r
-//                     new NameComposite(heteroGroupComposite, synonym, taxon).setFocus();\r
-//                     \r
-//                     TestDragAndDrop.this.composite.layout();\r
-               }               \r
-       };\r
-}\r
-\r