Now works with cdmLibrary 0.2.5.

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
index 101098103e7b1c86403d19e1afeb9acc0944fba4..9a19250aedd3651925f7830cf27b9d983120754f 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/Activator.java
@@ -30,6 +30,7 @@ public class Activator extends AbstractUIPlugin {
         * The constructor\r
         */\r
        public Activator() {\r
+               objectList.setObjectList(cdmApp.getNameService().getAllNames());\r
 //             makeNames();\r
 \r
        }\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
index d5e6bdc04bd34d6567e68c68f31e6b52d074ac40..04e3f985ab83031fa323be273c2db05b8d201bee 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/controller/CreateNameAction.java
@@ -3,14 +3,18 @@ package eu.etaxonomy.taxeditor.prototype1.controller;
 import org.eclipse.jface.action.Action;\r
 \r
 import eu.etaxonomy.taxeditor.prototype1.Activator;\r
-import eu.etaxonomy.taxeditor.prototype1.model.TaxonName;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
 \r
 public class CreateNameAction extends Action {\r
 \r
        private TaxonName tn;\r
        \r
        public CreateNameAction(String genus, String spEpithet) {\r
-               this.tn = new TaxonName(genus, spEpithet, null);\r
+               this.tn = new TaxonName();\r
+               this.tn.setGenus(genus);\r
+               this.tn.setSpecificEpithet(spEpithet);\r
+               this.tn.setFullName(genus + " " + spEpithet);\r
+               this.tn.setName(genus + " " + spEpithet);\r
        }\r
        \r
        public void run() {\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
index 02ee61f614c71455fc9c67379045d17614662270..4be3f25411063c8db42a4e68726c32ad41246869 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameEditorView.java
@@ -160,7 +160,6 @@ public class NameEditorView extends EditorPart {
                final Button createNewNameButton = new Button(newTaxonAreaGroup, SWT.NONE);\r
                createNewNameButton.addMouseListener(new MouseAdapter() {\r
                        public void mouseDown(final MouseEvent e) {\r
-                               \r
                                new CreateNameAction(g.getText(),se.getText()).run();\r
                        }                       \r
                });\r

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
index cdec9b714a9edadcc6781ef7ac847d824dbd9cdf..4bfebf32947f7834df57a78d04d7cfc70f9ebbe2 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.prototype1/src/eu/etaxonomy/taxeditor/prototype1/view/NameListView.java
@@ -61,7 +61,7 @@ public class NameListView extends ViewPart {
         * \r
         */\r
        private void createExpandBar() {\r
-               expandBar = new ExpandBar(top, SWT.V_SCROLL);\r
+               expandBar = new ExpandBar(top, SWT.NONE);\r
                GridData gridData = new GridData();\r
                gridData.horizontalAlignment = GridData.FILL;\r
                gridData.grabExcessHorizontalSpace = true;\r
@@ -80,6 +80,8 @@ public class NameListView extends ViewPart {
        \r
        private void createNameListComposite() {\r
                nameListExpandItem = new ExpandItem(expandBar, SWT.NONE, 0);\r
+               nameListExpandItem.setHeight(500);\r
+               \r
                nameListExpandItem.setText("Name List");\r
                nameListExpandItem.setExpanded(true);\r
 //             Image image = FileArrangerImages.getImageRegistry().get(\r
@@ -87,15 +89,23 @@ public class NameListView extends ViewPart {
 //             nameListExpandItem.setImage(image);\r
                \r
                nameListComposite = new Composite(expandBar, SWT.NONE);\r
+//             nameListExpandItem.setHeight(nameListComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);\r
                GridLayout layout = new GridLayout();\r
-               layout.marginLeft = layout.marginTop = layout.marginRight = layout.marginBottom = 10;\r
-               layout.verticalSpacing = 5;\r
+               layout.verticalSpacing = 0;\r
+               layout.marginWidth = 0;\r
+               layout.marginHeight = 0;\r
+               layout.horizontalSpacing = 0;\r
+//             layout.marginLeft = layout.marginTop = layout.marginRight = layout.marginBottom = 10;\r
+//             layout.verticalSpacing = 5;\r
                nameListComposite.setLayout(layout);\r
                \r
-               viewer = new TableViewer(nameListComposite, SWT.MULTI | SWT.H_SCROLL\r
+               viewer = new TableViewer(nameListComposite, SWT.H_SCROLL\r
                                | SWT.V_SCROLL);\r
                table = viewer.getTable();\r
-               table.setLayoutData(new GridData(443, SWT.DEFAULT));\r
+               final GridData gd_table = new GridData(SWT.FILL, SWT.FILL, true, true);\r
+//             gd_table.heightHint = 238;\r
+//             gd_table.widthHint = 443;\r
+               table.setLayoutData(gd_table);\r
                                \r
                viewer.addDoubleClickListener(new IDoubleClickListener(){\r
 \r
@@ -111,8 +121,6 @@ public class NameListView extends ViewPart {
                        }\r
                });             \r
 \r
-               nameListExpandItem.setHeight(nameListComposite.computeSize(\r
-                               SWT.DEFAULT, SWT.DEFAULT).y);\r
                nameListExpandItem.setControl(nameListComposite);\r
                \r
        }\r