About to try to fiddle with the layout again to get autosize working.

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
index 0ee7a4a89d94e2d8bc71a0f8193f45bc233b3093..8e37efaea4e24437c54e3addbe09deb09e614de4 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/NameEditorView.java
@@ -60,6 +60,10 @@ import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;
 \r
 public class NameEditorView extends EditorPart implements ICdmEventListener {\r
 \r
+       private Text hieraciumFuscoatrumSubspText;\r
+       private Text hieraciumAurantiacumSubspText;\r
+       private Text text_1;\r
+       private Text text;\r
        private Table table;\r
        private StyledText styledText;\r
        private TaxonName taxonname;\r
@@ -72,7 +76,6 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
         */\r
        @Override\r
        public void createPartControl(Composite parent) {\r
-               System.currentTimeMillis();\r
                //\r
                \r
                \r
@@ -138,23 +141,21 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
 //                     }\r
 //             });\r
 \r
-               Document doc = new Document(taxonname.getName());\r
-;\r
-               Composite container = new Composite(parent, SWT.NONE);\r
-               //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
-               final GridLayout gridLayout = new GridLayout();\r
-               gridLayout.numColumns = 2;\r
-               container.setLayout(gridLayout);\r
+               final FillLayout fillLayout = new FillLayout();\r
+               fillLayout.type = SWT.VERTICAL;\r
+               parent.setLayout(fillLayout);\r
+//             Document doc = new Document(taxonname.getName());\r
+//             Document doc = new Document("Hieracium chaetodermum (Pohle & Zahn) Üksip in Komarov, Fl. SSSR 30: 661. 1960");\r
+               Document doc = new Document("");\r
+               \r
+               final Composite composite = new Composite(parent, SWT.NONE);\r
+               composite.setLayout(new GridLayout());\r
 \r
-               final Label taxonomicallyIncludedInLabel = new Label(container, SWT.NONE);\r
-               taxonomicallyIncludedInLabel.setLayoutData(new GridData());\r
-//             taxonomicallyIncludedInLabel.setBackground(SWTResourceManager.getColor(255, 255, 255));\r
+               final Label taxonomicallyIncludedInLabel = new Label(composite, SWT.NONE);\r
                taxonomicallyIncludedInLabel.setText("Higher taxon: \"Pilosella fuscoatra coll.\"");\r
-               new Label(container, SWT.NONE);\r
 \r
-               final ToolBar toolBar = new ToolBar(container, SWT.NONE);\r
-               toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
-               toolBar.setLayoutData(new GridData());\r
+               final ToolBar toolBar = new ToolBar(composite, SWT.NONE);\r
+//             toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
 \r
                final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);\r
                itemSave.setToolTipText("Save taxon \"Pilosella fuscoatra (Nägeli & Peter) Soják\"");\r
@@ -286,22 +287,136 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
 \r
                final MenuItem addNewTaxonMenuItem = new MenuItem(menuAdd, SWT.NONE);\r
                addNewTaxonMenuItem.setText("Add new taxon to \"Pilosella fuscoatra coll.\"");\r
-               new Label(container, SWT.NONE);\r
+               Composite container = new Composite(composite, SWT.NONE);\r
+               container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+               //container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
+               final GridLayout gridLayout = new GridLayout();\r
+               gridLayout.numColumns = 2;\r
+               container.setLayout(gridLayout);\r
+\r
+               final Composite taxonComposite = new Composite(container, SWT.NONE);\r
+               taxonComposite.setBackground(SWTResourceManager.getColor(255, 255, 255));\r
+               final GridData gd_taxonComposite = new GridData(SWT.LEFT, SWT.TOP, false, false);\r
+               gd_taxonComposite.widthHint = 414;\r
+               taxonComposite.setLayoutData(gd_taxonComposite);\r
+               final GridLayout gridLayout_1 = new GridLayout();\r
+               gridLayout_1.numColumns = 2;\r
+               taxonComposite.setLayout(gridLayout_1);\r
+\r
+               text = new Text(taxonComposite, SWT.WRAP);\r
+               text.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));\r
+               text.setText("Pilosella fuscoatra (Nägeli & Peter) Soják in Preslia 43: 184. 1971 ");\r
+               text.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 2, 1));\r
+\r
+               final Label label = new Label(taxonComposite, SWT.NONE);\r
+               label.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
+               label.setLayoutData(new GridData());\r
+               label.setBackground(SWTResourceManager.getColor(255, 255, 255));\r
+\r
+               final Menu menu1 = new Menu(label);\r
+               label.setMenu(menu1);\r
+\r
+               final MenuItem deletehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
+               deletehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));\r
+               deletehieraciumFuscoatrumMenuItem.setText("Delete \"Hieracium fuscoatrum Nägeli & Peter\" from this taxon");\r
+\r
+               new MenuItem(menu1, SWT.SEPARATOR);\r
+\r
+               final MenuItem moveMenuItem = new MenuItem(menu1, SWT.NONE);\r
+               moveMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/move_no_bg.gif"));\r
+               moveMenuItem.setText("Move \"Hieracium fuscoatrum Nägeli & Peter\" to another taxon");\r
+\r
+               final MenuItem makehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
+               makehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/a_no_bg.gif"));\r
+               makehieraciumFuscoatrumMenuItem.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into an accepted name");\r
+\r
+               new MenuItem(menu1, SWT.SEPARATOR);\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a synonym (type unknown)");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_1 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_1.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a homotypic synonym");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_2 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_2.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a heterotypic synoynm");\r
 \r
-               SourceViewer sourceviewer = new SourceViewer(container, null, SWT.WRAP | SWT.FULL_SELECTION);           sourceviewer.setTabsToSpacesConverter(null);\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_3 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/basionym_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_3.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a basionym");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_4 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_4.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/repsyn_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_4.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a replaced synonym");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_5 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_5.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homonym_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_5.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a homonym");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_6 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_6.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/orthovariant_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_6.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a orthographic variant");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_7 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_7.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/misapplied_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_7.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a misapplied name");\r
+\r
+               final MenuItem turnhieraciumFuscoatrumMenuItem_8 = new MenuItem(menu1, SWT.NONE);\r
+               turnhieraciumFuscoatrumMenuItem_8.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/concept_no_bg.gif"));\r
+               turnhieraciumFuscoatrumMenuItem_8.setText("Turn \"Hieracium fuscoatrum Nägeli & Peter\" into a concept relation");\r
+               \r
+               text_1 = new Text(taxonComposite, SWT.WRAP);\r
+               text_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));\r
+               text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
+               text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");\r
+               text_1.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));\r
+\r
+               final Label label_1 = new Label(taxonComposite, SWT.NONE);\r
+               label_1.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
+               label_1.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+\r
+               hieraciumAurantiacumSubspText = new Text(taxonComposite, SWT.WRAP);\r
+               hieraciumAurantiacumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
+               hieraciumAurantiacumSubspText.setText("Hieracium aurantiacum subsp. chaetodermum Pohle & Zahn in Allg. Bot. Z. Syst. 13: 110. 1907");\r
+               final GridData gd_hieraciumAurantiacumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_hieraciumAurantiacumSubspText.widthHint = 435;\r
+               hieraciumAurantiacumSubspText.setLayoutData(gd_hieraciumAurantiacumSubspText);\r
+\r
+               final Label label_2 = new Label(taxonComposite, SWT.NONE);\r
+               label_2.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+               label_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));\r
+\r
+               hieraciumFuscoatrumSubspText = new Text(taxonComposite, SWT.WRAP);\r
+               hieraciumFuscoatrumSubspText.setText("Hieracium fuscoatrum subsp. chaetodermum (Pohle & Zahn) Zahn in Engler, Pflanzenr. 82: 1267. 1923");\r
+               hieraciumFuscoatrumSubspText.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));\r
+               final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_hieraciumFuscoatrumSubspText.heightHint = 39;\r
+               hieraciumFuscoatrumSubspText.setLayoutData(gd_hieraciumFuscoatrumSubspText);\r
+\r
+               final Label label_3 = new Label(taxonComposite, SWT.NONE);\r
+               label_3.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+               label_3.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
+\r
+               SourceViewer sourceviewer = new SourceViewer(taxonComposite, null, SWT.WRAP | SWT.FULL_SELECTION);\r
                sourceviewer.setAnnotationHover(null);\r
                styledText = sourceviewer.getTextWidget();\r
-               final GridData gd_styledText_1 = new GridData(SWT.FILL, SWT.CENTER, \r
+               final GridData gd_styledText_1 = new GridData(SWT.FILL, SWT.TOP, \r
                                true, true);\r
-               gd_styledText_1.heightHint = 472;\r
+               gd_styledText_1.heightHint = 21;\r
                gd_styledText_1.widthHint = 353;\r
                styledText.setLayoutData(gd_styledText_1);\r
                sourceviewer.setDocument(doc);\r
                sourceviewer.configure(new MySourceViewerConfig());\r
+               sourceviewer.setTabsToSpacesConverter(null);\r
 \r
                table = new Table(container, SWT.MULTI | SWT.BORDER);\r
                table.setLinesVisible(true);\r
-               table.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true));\r
+               final GridData gd_table = new GridData(SWT.RIGHT, SWT.FILL, true, true);\r
+               gd_table.heightHint = 291;\r
+               table.setLayoutData(gd_table);\r
 \r
                final TableColumn newColumnTableColumn = new TableColumn(table, SWT.NONE);\r
                newColumnTableColumn.setWidth(100);\r
@@ -315,13 +430,24 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
                newItemTableItem.setText(0, "Rank");\r
                newItemTableItem.setText(1, "species");\r
                newItemTableItem.setText("Rank");\r
-\r
+               \r
                final TableItem newItemTableItem_1 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_1.setText("New item");\r
+               newItemTableItem_1.setText(1, "Pilosella");\r
+               newItemTableItem_1.setText(0, "Genus");\r
+//             newItemTableItem_1.setText("Genus");\r
 \r
                final TableItem newItemTableItem_2 = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem_2.setText("New item");\r
-               new Label(container, SWT.NONE);\r
+               newItemTableItem_2.setText(1, "fuscoatra");\r
+               newItemTableItem_2.setText(0, "Species epithet");\r
+//             newItemTableItem_2.setText("Species epithet");\r
+\r
+               final TableItem newItemTableItem_3 = new TableItem(table, SWT.BORDER);\r
+               newItemTableItem_3.setText(1, "Nägeli & Peter");\r
+               newItemTableItem_3.setText(0, "Author team");\r
+//             newItemTableItem_3.setText("Author team");\r
+\r
+               final TableItem newItemTableItem_4 = new TableItem(table, SWT.BORDER);\r
+               newItemTableItem_4.setText("...");\r
                \r
 //             final Menu menu = new Menu(toolBar);\r
 //             addDropDown(newItemToolItem, menu);\r
@@ -331,21 +457,6 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
 //             testAction.setImageDescriptor(ResourceManager.getPluginImageDescriptor(Activator.getDefault(), "icons/edit_16x16.gif"));\r
 //             testAction.setToolTipText("Add relation");\r
 //             toolBar.add(testAction);\r
-\r
-               final Button btnSaveName = new Button(container, SWT.NONE);\r
-\r
-               btnSaveName.addMouseListener(new MouseAdapter() {\r
-                       public void mouseDown(final MouseEvent e) {\r
-                               \r
-//                             taxonname.setGenus(txtGenus.getText());\r
-//                             taxonname.setSpecificEpithet(txtSpEpi.getText());\r
-                               \r
-                               new SaveNameAction(taxonname).run();\r
-                       }\r
-               });\r
-               final GridData gd_btnSaveName = new GridData(SWT.RIGHT, SWT.CENTER, false, false);\r
-               btnSaveName.setLayoutData(gd_btnSaveName);\r
-               btnSaveName.setText("Save Name");\r
                \r
                populateForm();         \r
        }\r