merge-update of trunk and disabling GUI-Control separation

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / selection / EditFromSelectionWizard.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index 1b6552d7084fed82bbc638311f6079421db226ae..b794ee6e3687bd38bf89bf7bea8c10365367993b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -31,7 +31,6 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.model.TextHelper;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.campanula.compatibility.IEntitySelectionElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.section.agent.InstitutionWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.agent.PersonWizardPage;
@@ -39,9 +38,9 @@ import eu.etaxonomy.taxeditor.ui.section.agent.TeamWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.CollectionWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationDetailsWizardPage;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailsWizardPage;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldObservationGeneralWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.GeneralWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceWizardPage;
 import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
 
@@ -57,7 +56,7 @@ import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
 public class EditFromSelectionWizard extends Wizard implements
                SelectionListener {
 
-       private final IEntitySelectionElement selectionElement;
+       private final EntitySelectionElement selectionElement;
 
        /**
         * <p>
@@ -69,7 +68,7 @@ public class EditFromSelectionWizard extends Wizard implements
         *            {@link eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement}
         *            object.
         */
-       public EditFromSelectionWizard(IEntitySelectionElement selectionElement) {
+       public EditFromSelectionWizard(EntitySelectionElement selectionElement) {
                this.selectionElement = selectionElement;
                this.setWindowTitle(String.format("Edit %s", TextHelper.deproxyClassName(selectionElement.getEntity().getClass())));
        }
@@ -108,11 +107,11 @@ public class EditFromSelectionWizard extends Wizard implements
                                throw new IllegalStateException();
                        }
 
-                       addPage(new FieldObservationGeneralWizardPage(formFactory,
+                       addPage(new GeneralWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));
-                       addPage(new GatheringEventDetailsWizardPage(formFactory,
+                       addPage(new GatheringEventWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));
-                       addPage(new FieldObservationDetailsWizardPage(formFactory,
+                       addPage(new FieldUnitWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));
                        addPage(new DerivedUnitBaseWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));