(no commit message)
[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor.designproposal1 / src / eu / etaxonomy / taxeditor / designproposal1 / view / NameEditorView.java
index 8e37efaea4e24437c54e3addbe09deb09e614de4..0146a2078af070348b3bd55b727d2312e0be442c 100644 (file)
@@ -60,11 +60,11 @@ import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;
 \r
 public class NameEditorView extends EditorPart implements ICdmEventListener {\r
 \r
+       private Table table_1;\r
+       private Text text_3;\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
 \r
@@ -140,21 +140,14 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
 //                             \r
 //                     }\r
 //             });\r
-\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
+               parent.setLayout(new GridLayout());\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(composite, SWT.NONE);\r
+               final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);\r
+               taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));\r
                taxonomicallyIncludedInLabel.setText("Higher taxon: \"Pilosella fuscoatra coll.\"");\r
 \r
-               final ToolBar toolBar = new ToolBar(composite, SWT.NONE);\r
+               final ToolBar toolBar = new ToolBar(parent, SWT.NONE);\r
 //             toolBar.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GRAY));\r
 \r
                final ToolItem itemSave = new ToolItem(toolBar, SWT.PUSH);\r
@@ -287,34 +280,101 @@ 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
-               Composite container = new Composite(composite, SWT.NONE);\r
-               container.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+\r
+               final Composite composite = new Composite(parent, SWT.NONE);\r
+               composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));\r
+               composite.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+               final GridLayout gridLayout_2 = new GridLayout();\r
+               gridLayout_2.horizontalSpacing = 3;\r
+               gridLayout_2.numColumns = 3;\r
+               composite.setLayout(gridLayout_2);\r
+\r
+               text_3 = new Text(composite, SWT.WRAP);\r
+               text_3.setText("Pilosella fuscoatra (Nägeli & Peter) Soják in Preslia 43: 184. 1971 ");\r
+               text_3.setFont(SWTResourceManager.getFont("Georgia", 12, SWT.NONE));\r
+               text_3.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1));\r
+\r
+               table_1 = new Table(composite, SWT.BORDER);\r
+               table_1.setLinesVisible(true);\r
+               table_1.setLayoutData(new GridData(SWT.RIGHT, SWT.FILL, true, true, 1, 5));\r
+\r
+               final TableColumn newColumnTableColumn = new TableColumn(table_1, SWT.NONE);\r
+               newColumnTableColumn.setWidth(100);\r
+               newColumnTableColumn.setText("New column");\r
+\r
+               final TableColumn newColumnTableColumn_1 = new TableColumn(table_1, SWT.NONE);\r
+               newColumnTableColumn_1.setWidth(100);\r
+               newColumnTableColumn_1.setText("New column");\r
+\r
+               final TableItem newItemTableItem = new TableItem(table_1, SWT.BORDER);\r
+               newItemTableItem.setText(0, "Rank");\r
+               newItemTableItem.setText(1, "species");\r
+               newItemTableItem.setText("Rank");\r
+               \r
+               final TableItem newItemTableItem_1 = new TableItem(table_1, SWT.BORDER);\r
+               newItemTableItem_1.setText(1, "Pilosella");\r
+               newItemTableItem_1.setText(0, "Genus");\r
+\r
+               final TableItem newItemTableItem_2 = new TableItem(table_1, SWT.BORDER);\r
+               newItemTableItem_2.setText(1, "fuscoatra");\r
+               newItemTableItem_2.setText(0, "Species epithet");\r
+\r
+               final TableItem newItemTableItem_3 = new TableItem(table_1, SWT.BORDER);\r
+               newItemTableItem_3.setText(1, "Nägeli & Peter");\r
+               newItemTableItem_3.setText(0, "Author team");\r
+\r
+               final TableItem newItemTableItem_4 = new TableItem(table_1, SWT.BORDER);\r
+               newItemTableItem_4.setText("...");\r
+//             newItemTableItem_3.setText("Author team");\r
+//             newItemTableItem_2.setText("Species epithet");\r
+//             newItemTableItem_1.setText("Genus");\r
+\r
+               final Label labelWithMenu = new Label(composite, SWT.NONE);\r
+               labelWithMenu.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));\r
+               labelWithMenu.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/homosyn_no_bg.gif"));\r
+               final GridData gd_labelWithMenu = new GridData(SWT.LEFT, SWT.TOP, false, false);\r
+               labelWithMenu.setLayoutData(gd_labelWithMenu);\r
+               \r
+               text_1 = new Text(composite, SWT.WRAP);\r
+               final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_text_1.widthHint = 444;\r
+               text_1.setLayoutData(gd_text_1);\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
+\r
+               final Label label_1 = new Label(composite, SWT.NONE);\r
+               label_1.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\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(composite, SWT.WRAP);\r
+               final GridData gd_hieraciumAurantiacumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_hieraciumAurantiacumSubspText.widthHint = 441;\r
+               hieraciumAurantiacumSubspText.setLayoutData(gd_hieraciumAurantiacumSubspText);\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
+\r
+               final Label label_2 = new Label(composite, SWT.NONE);\r
+               label_2.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\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(composite, SWT.WRAP);\r
+               final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);\r
+               gd_hieraciumFuscoatrumSubspText.widthHint = 447;\r
+               hieraciumFuscoatrumSubspText.setLayoutData(gd_hieraciumFuscoatrumSubspText);\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
+\r
+               final Label label_4 = new Label(composite, SWT.NONE);\r
+               label_4.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false));\r
+               label_4.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/unknown_no_bg.gif"));\r
+               label_4.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 Menu menu1 = new Menu(labelWithMenu);\r
+               labelWithMenu.setMenu(menu1);\r
 \r
                final MenuItem deletehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);\r
                deletehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));\r
@@ -367,87 +427,17 @@ public class NameEditorView extends EditorPart implements ICdmEventListener {
                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 sourceviewer = new SourceViewer(composite, 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.TOP, \r
-                               true, true);\r
-               gd_styledText_1.heightHint = 21;\r
-               gd_styledText_1.widthHint = 353;\r
-               styledText.setLayoutData(gd_styledText_1);\r
+               final GridData gd_styledText = new GridData(SWT.FILL, SWT.TOP, true, false);\r
+               gd_styledText.heightHint = 41;\r
+               gd_styledText.widthHint = 450;\r
+               styledText.setLayoutData(gd_styledText);\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
-               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
-               newColumnTableColumn.setText("New column");\r
-\r
-               final TableColumn newColumnTableColumn_1 = new TableColumn(table, SWT.NONE);\r
-               newColumnTableColumn_1.setWidth(100);\r
-               newColumnTableColumn_1.setText("New column");\r
-\r
-               final TableItem newItemTableItem = new TableItem(table, SWT.BORDER);\r
-               newItemTableItem.setText(0, "Rank");\r
-               newItemTableItem.setText(1, "species");\r
-               newItemTableItem.setText("Rank");\r
-               \r
-               final TableItem newItemTableItem_1 = new TableItem(table, SWT.BORDER);\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(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