From: n.hoffmann Date: Tue, 15 Feb 2011 10:34:49 +0000 (+0000) Subject: Fixes an issue with derived unit editing where the editor was using deprecated interf... X-Git-Tag: rcp.ss-first-working-version~196 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/fee5e28234816eba9ed13a082678715860192f32 Fixes an issue with derived unit editing where the editor was using deprecated interface elements. --- diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java index b8cbdd700..c9aed5ddb 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewDerivedUnitBaseWizard.java @@ -41,13 +41,10 @@ public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard { - private static final Logger logger = Logger - .getLogger(DerivedUnitBaseSelectionElement.class); - /** *

Constructor for DerivedUnitBaseSelectionElement.

* diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java index 27151e176..69279a821 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/forms/selection/EditFromSelectionWizard.java @@ -11,11 +11,14 @@ package eu.etaxonomy.taxeditor.forms.selection; import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; +import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.agent.Institution; import eu.etaxonomy.cdm.model.agent.Person; @@ -26,14 +29,17 @@ import eu.etaxonomy.cdm.model.occurrence.Collection; import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage; import eu.etaxonomy.taxeditor.forms.CdmFormFactory; +import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.section.agent.InstitutionWizardPage; import eu.etaxonomy.taxeditor.section.agent.PersonWizardPage; import eu.etaxonomy.taxeditor.section.agent.TeamWizardPage; import eu.etaxonomy.taxeditor.section.name.NonViralNameWizardPage; import eu.etaxonomy.taxeditor.section.occurrence.CollectionWizardPage; -import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitFacadeWizardPage; +import eu.etaxonomy.taxeditor.section.occurrence.DerivedUnitBaseWizardPage; +import eu.etaxonomy.taxeditor.section.occurrence.FieldObservationWizardPage; +import eu.etaxonomy.taxeditor.section.occurrence.GatheringEventWizardPage; +import eu.etaxonomy.taxeditor.section.occurrence.GeneralWizardPage; import eu.etaxonomy.taxeditor.section.reference.ReferenceWizardPage; /** @@ -46,9 +52,6 @@ import eu.etaxonomy.taxeditor.section.reference.ReferenceWizardPage; public class EditFromSelectionWizard extends Wizard implements SelectionListener { private AbstractSelectionElement selectionElement; - - - AbstractCdmEntityWizardPage page; /** *

Constructor for EditFromSelectionWizard.

@@ -68,31 +71,45 @@ public class EditFromSelectionWizard extends Wizard implements SelectionListener IdentifiableEntity entity = (IdentifiableEntity) HibernateProxyHelper.deproxy(selectionElement.getEntity()); if(entity instanceof Reference){ - page = new ReferenceWizardPage(formFactory, selectionElement.getConversationHolder(), (Reference) entity); + addPage(new ReferenceWizardPage(formFactory, selectionElement.getConversationHolder(), (Reference) entity)); } else if(entity instanceof Team){ - page = new TeamWizardPage(formFactory, selectionElement.getConversationHolder(), (Team) entity); + addPage(new TeamWizardPage(formFactory, selectionElement.getConversationHolder(), (Team) entity)); } else if(entity instanceof Person){ - page = new PersonWizardPage(formFactory, selectionElement.getConversationHolder(), (Person) entity); + addPage(new PersonWizardPage(formFactory, selectionElement.getConversationHolder(), (Person) entity)); } else if(entity instanceof NonViralName){ - page = new NonViralNameWizardPage(formFactory, selectionElement.getConversationHolder(), (NonViralName) entity); + addPage(new NonViralNameWizardPage(formFactory, selectionElement.getConversationHolder(), (NonViralName) entity)); } else if (entity instanceof DerivedUnitBase){ - page = new DerivedUnitFacadeWizardPage(formFactory, selectionElement.getConversationHolder(), (DerivedUnitBase) entity); + + +// addPage(new DerivedUnitFacadeWizardPage(formFactory, selectionElement.getConversationHolder(), (DerivedUnitBase) entity)); + + DerivedUnitFacade facade; + try { + facade = DerivedUnitFacade.NewInstance((DerivedUnitBase) entity, PreferencesUtil.getDerivedUnitConfigurator()); + } catch (DerivedUnitFacadeNotSupportedException e) { + // we should never get here + throw new IllegalStateException(); + } + + addPage(new GeneralWizardPage(formFactory, selectionElement.getConversationHolder(), facade)); + addPage(new GatheringEventWizardPage(formFactory, selectionElement.getConversationHolder(), facade)); + addPage(new FieldObservationWizardPage(formFactory, selectionElement.getConversationHolder(), facade)); + addPage(new DerivedUnitBaseWizardPage(formFactory, selectionElement.getConversationHolder(), facade)); } else if(entity instanceof Collection){ - page = new CollectionWizardPage(formFactory, selectionElement.getConversationHolder(), (Collection) entity); + addPage(new CollectionWizardPage(formFactory, selectionElement.getConversationHolder(), (Collection) entity)); } else if(entity instanceof Institution){ - page = new InstitutionWizardPage(formFactory, selectionElement.getConversationHolder(), (Institution) entity); + addPage(new InstitutionWizardPage(formFactory, selectionElement.getConversationHolder(), (Institution) entity)); } else{ EditorUtil.warningDialog("Missing interface", this, "No detail element for current selection"); } - addPage(page); } /* (non-Javadoc) @@ -101,7 +118,9 @@ public class EditFromSelectionWizard extends Wizard implements SelectionListener /** {@inheritDoc} */ @Override public boolean performFinish() { - page.dispose(); + for(IWizardPage page : getPages()){ + page.dispose(); + } return true; } diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java index 7e529b167..07edae2da 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeWizardPage.java @@ -27,6 +27,7 @@ import eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement; * @created Jun 16, 2010 * @version 1.0 */ +@Deprecated // use the specific pages instead (e.g. GeneralWizardPage, GatheringEventPage, s.o.) public class DerivedUnitFacadeWizardPage extends AbstractCdmEntityWizardPage { /**