From 79b9396a4bb1b6115f58e05e445262e84e2f890d Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Mon, 16 Nov 2009 09:31:51 +0000
Subject: [PATCH] fixed a couple of issues that surfaced through testing

---
 .../detailpage/DistributionMapDetailsPage.java            | 2 ++
 .../detailpage/DistributionMapDetailsSection.java         | 2 ++
 .../io/wizard/ImportFromFileDataSourceWizardPage.java     | 8 +++++---
 .../taxeditor/operations/MoveTaxonOperation.java          | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsPage.java
index be5a0306a..b14d442b0 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsPage.java
@@ -4,6 +4,7 @@
 package eu.etaxonomy.taxeditor.editor.descriptiontree.detailpage;
 
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
 /**
@@ -27,5 +28,6 @@ public class DistributionMapDetailsPage extends AbstractDescriptionDetailsPage {
 	@Override
 	protected void createDescriptionContents(Composite parent) {
 		descriptionSection = new DistributionMapDetailsSection(parent, this, SWT.WRAP);
+		descriptionSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 	}
 }
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsSection.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsSection.java
index 74088ca79..fbf70be25 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsSection.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiontree/detailpage/DistributionMapDetailsSection.java
@@ -14,6 +14,7 @@ import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ControlAdapter;
 import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 
 import eu.etaxonomy.cdm.ext.EditGeoServiceUtilities;
@@ -56,6 +57,7 @@ public class DistributionMapDetailsSection extends AbstractDescriptionDetailSect
 				updateSection();
 			}
 		});
+		imageComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 	}
 
 	/* (non-Javadoc)
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
index b832068fb..3fe42fc8b 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ImportFromFileDataSourceWizardPage.java
@@ -15,6 +15,8 @@ import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -87,13 +89,13 @@ public class ImportFromFileDataSourceWizardPage extends WizardPage {
 		Button button = new Button(composite, SWT.PUSH);
 		button.setText("Browse...");
 		
-		button.addMouseListener(new MouseAdapter(){
+		button.addSelectionListener(new SelectionAdapter(){
 
 			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.MouseAdapter#mouseUp(org.eclipse.swt.events.MouseEvent)
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
 			 */
 			@Override
-			public void mouseUp(MouseEvent e) {
+			public void widgetSelected(SelectionEvent e) {
 				String path = fileDialog.open();
 				text_file.setText(path);
 				setPageComplete(true);
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java
index 91ddd259b..8fd92f30b 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/operations/MoveTaxonOperation.java
@@ -116,7 +116,9 @@ public class MoveTaxonOperation extends AbstractPostOperation {
 			}
 			return null;
 		}finally{
-			conversation.close();
+			// FIXME closing this conversation also closes the conversation of the 
+			// taxonomic tree. Removing the close call for sage of a smooth presentation
+//			conversation.close();
 		}
 	}
 }
-- 
2.34.1