Project

General

Profile

« Previous | Next » 

Revision 39ec02fa

Added by Patrick Plitzner over 10 years ago

  • unified specimen and field observation controller and view elements

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
21 21
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
22 22
import eu.etaxonomy.taxeditor.store.CdmStore;
23 23
import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
24
import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationWizardPage;
25
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
26
import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
24
import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailsWizardPage;
25
import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationGeneralWizardPage;
26
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailsWizardPage;
27
import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenDetailsWizardPage;
28
import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenGeneralWizardPage;
27 29

  
28 30
/**
29 31
 * <p>NewDerivedUnitBaseWizard class.</p>
......
51 53
            if (getEntity() != null) {
52 54
                if(getEntity() instanceof FieldUnit){
53 55
                    derivedUnitFacade = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.FieldUnit, (FieldUnit)getEntity());
54
                    addPage(new GeneralWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
55
                    addPage(new GatheringEventWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
56
                    addPage(new FieldObservationWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
56

  
57
                    addPage(new FieldObservationGeneralWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
58
                    addPage(new GatheringEventDetailsWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
59
                    addPage(new FieldObservationDetailsWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
57 60
                }
58 61
                else if(getEntity() instanceof DerivedUnit){
59 62
                    derivedUnitFacade = DerivedUnitFacade.NewInstance((DerivedUnit)getEntity(), PreferencesUtil.getDerivedUnitConfigurator());
63

  
64
                    addPage(new SpecimenGeneralWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
65
                    addPage(new SpecimenDetailsWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
60 66
                    addPage(new DerivedUnitBaseWizardPage(formFactory, getConversationHolder(), derivedUnitFacade));
61 67
                }
62 68
            }

Also available in: Unified diff