From d71e450b250d7394aeb20a1ee634597981d6d5cf Mon Sep 17 00:00:00 2001
From: "p.ciardelli" <p.ciardelli@localhost>
Date: Wed, 7 Nov 2007 12:12:27 +0000
Subject: [PATCH] Now works with cdmLibrary 0.2.5.

---
 .../taxeditor/prototype1/Activator.java       |  1 +
 .../controller/CreateNameAction.java          |  8 +++++--
 .../prototype1/view/NameEditorView.java       |  1 -
 .../prototype1/view/NameListView.java         | 22 +++++++++++++------
 4 files changed, 22 insertions(+), 10 deletions(-)

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 101098103..9a19250ae 100644
--- 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
 	 */
 	public Activator() {
+		objectList.setObjectList(cdmApp.getNameService().getAllNames());
 //		makeNames();
 
 	}
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 d5e6bdc04..04e3f985a 100644
--- 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;
 
 import eu.etaxonomy.taxeditor.prototype1.Activator;
-import eu.etaxonomy.taxeditor.prototype1.model.TaxonName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
 
 public class CreateNameAction extends Action {
 
 	private TaxonName tn;
 	
 	public CreateNameAction(String genus, String spEpithet) {
-		this.tn = new TaxonName(genus, spEpithet, null);
+		this.tn = new TaxonName();
+		this.tn.setGenus(genus);
+		this.tn.setSpecificEpithet(spEpithet);
+		this.tn.setFullName(genus + " " + spEpithet);
+		this.tn.setName(genus + " " + spEpithet);
 	}
 	
 	public void run() {
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 02ee61f61..4be3f2541 100644
--- 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);
 		createNewNameButton.addMouseListener(new MouseAdapter() {
 			public void mouseDown(final MouseEvent e) {
-				
 				new CreateNameAction(g.getText(),se.getText()).run();
 			}			
 		});
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 cdec9b714..4bfebf329 100644
--- 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 {
 	 * 
 	 */
 	private void createExpandBar() {
-		expandBar = new ExpandBar(top, SWT.V_SCROLL);
+		expandBar = new ExpandBar(top, SWT.NONE);
 		GridData gridData = new GridData();
 		gridData.horizontalAlignment = GridData.FILL;
 		gridData.grabExcessHorizontalSpace = true;
@@ -80,6 +80,8 @@ public class NameListView extends ViewPart {
 	
 	private void createNameListComposite() {
 		nameListExpandItem = new ExpandItem(expandBar, SWT.NONE, 0);
+		nameListExpandItem.setHeight(500);
+		
 		nameListExpandItem.setText("Name List");
 		nameListExpandItem.setExpanded(true);
 //		Image image = FileArrangerImages.getImageRegistry().get(
@@ -87,15 +89,23 @@ public class NameListView extends ViewPart {
 //		nameListExpandItem.setImage(image);
 		
 		nameListComposite = new Composite(expandBar, SWT.NONE);
+//		nameListExpandItem.setHeight(nameListComposite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
 		GridLayout layout = new GridLayout();
-		layout.marginLeft = layout.marginTop = layout.marginRight = layout.marginBottom = 10;
-		layout.verticalSpacing = 5;
+		layout.verticalSpacing = 0;
+		layout.marginWidth = 0;
+		layout.marginHeight = 0;
+		layout.horizontalSpacing = 0;
+//		layout.marginLeft = layout.marginTop = layout.marginRight = layout.marginBottom = 10;
+//		layout.verticalSpacing = 5;
 		nameListComposite.setLayout(layout);
 		
-		viewer = new TableViewer(nameListComposite, SWT.MULTI | SWT.H_SCROLL
+		viewer = new TableViewer(nameListComposite, SWT.H_SCROLL
 				| SWT.V_SCROLL);
 		table = viewer.getTable();
-		table.setLayoutData(new GridData(443, SWT.DEFAULT));
+		final GridData gd_table = new GridData(SWT.FILL, SWT.FILL, true, true);
+//		gd_table.heightHint = 238;
+//		gd_table.widthHint = 443;
+		table.setLayoutData(gd_table);
 				
 		viewer.addDoubleClickListener(new IDoubleClickListener(){
 
@@ -111,8 +121,6 @@ public class NameListView extends ViewPart {
 			}
 		});		
 
-		nameListExpandItem.setHeight(nameListComposite.computeSize(
-				SWT.DEFAULT, SWT.DEFAULT).y);
 		nameListExpandItem.setControl(nameListComposite);
 		
 	}
-- 
2.34.1