fixed a couple of issues that surfaced through testing

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 be5a0306a1241da49af642910a3325d1ad2b60af..b14d442b0f9fe3eaf28499163c1ba78e0834503e 100644 (file)
--- 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;\r
 \r
 import org.eclipse.swt.SWT;\r
+import org.eclipse.swt.layout.GridData;\r
 import org.eclipse.swt.widgets.Composite;\r
 \r
 /**\r
@@ -27,5 +28,6 @@ public class DistributionMapDetailsPage extends AbstractDescriptionDetailsPage {
        @Override\r
        protected void createDescriptionContents(Composite parent) {\r
                descriptionSection = new DistributionMapDetailsSection(parent, this, SWT.WRAP);\r
+               descriptionSection.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));\r
        }\r
 }\r

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 74088ca798cea8d2eed1ef43c5302af8c4ecbf71..fbf70be250ab7d73d25ebaf2c9b896be1264ec7d 100644 (file)
--- 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 b832068fb76adc7a4a748e65676a5ceeb533c9cb..3fe42fc8b7c609b9572f31085ace020df5bad1e4 100644 (file)
--- 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 91ddd259b66694f383516dafa93acf5c8eddad16..8fd92f30b3df3e164aae455aae551a334ba6cd05 100644 (file)
--- 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 {
                        }\r
                        return null;\r
                }finally{\r
-                       conversation.close();\r
+                       // FIXME closing this conversation also closes the conversation of the \r
+                       // taxonomic tree. Removing the close call for sage of a smooth presentation\r
+//                     conversation.close();\r
                }\r
        }\r
 }\r