Fixed bug #482. 1) cleanly dispose of form w/ "managedForm.getForm().dispose();"...

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / editor / AbstractTaxonEditor.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
index a59bc876d1d2a6a0178fadb088dc5b497970eff4..b42a79a0cc1f0b943534aae766cd62ad4220e2af 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/editor/AbstractTaxonEditor.java
@@ -32,7 +32,6 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPartReference;\r
 import org.eclipse.ui.PartInitException;\r
 import org.eclipse.ui.actions.ActionFactory;\r
-import org.eclipse.ui.forms.IManagedForm;\r
 import org.eclipse.ui.forms.ManagedForm;\r
 import org.eclipse.ui.forms.widgets.ScrolledForm;\r
 import org.eclipse.ui.forms.widgets.TableWrapLayout;\r
@@ -44,8 +43,8 @@ import org.eclipse.ui.views.properties.IPropertySource;
 import org.eclipse.ui.views.properties.PropertySheetPage;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.taxeditor.controller.PropertySheetController;\r
 import eu.etaxonomy.taxeditor.controller.GlobalController;\r
+import eu.etaxonomy.taxeditor.controller.PropertySheetController;\r
 import eu.etaxonomy.taxeditor.propertysheet.CustomSortPropertySheetEntry;\r
 \r
 /**\r
@@ -80,6 +79,8 @@ public abstract class AbstractTaxonEditor extends EditorPart implements
        protected IUndoContext undoContext;\r
 \r
        protected IHasPropertySource selectedObject;\r
+\r
+       protected Composite partComposite;\r
        \r
        /* (non-Javadoc)\r
         * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)\r
@@ -190,6 +191,8 @@ public abstract class AbstractTaxonEditor extends EditorPart implements
         */\r
        public void createPartControl(Composite composite) {\r
 \r
+               this.partComposite = composite;\r
+               \r
                initUndoContext();\r
                \r
                createManagedForm(composite);\r
@@ -211,7 +214,7 @@ public abstract class AbstractTaxonEditor extends EditorPart implements
                scrolledForm = managedForm.getForm();\r
                parent = scrolledForm.getBody();\r
                                \r
-               Taxon taxon = getTaxon();\r
+//             Taxon taxon = getTaxon();\r
                parent.setData(taxon);\r
                \r
                parent.setLayout(new TableWrapLayout());                \r