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 caebbee49d8f0f3f6db5bda815ed2c962f933ab7..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
@@ -1,9 +1,9 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@ -38,7 +38,7 @@ 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.FieldObservationWizardPage;
+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;
@@ -48,7 +48,7 @@ import eu.etaxonomy.taxeditor.ui.section.user.UserDetailWizardPage;
  * <p>
  * EditFromSelectionWizard class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Jun 1, 2010
  * @version 1.0
@@ -62,7 +62,7 @@ public class EditFromSelectionWizard extends Wizard implements
         * <p>
         * Constructor for EditFromSelectionWizard.
         * </p>
-        * 
+        *
         * @param selectionElement
         *            a
         *            {@link eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement}
@@ -111,7 +111,7 @@ public class EditFromSelectionWizard extends Wizard implements
                                        selectionElement.getConversationHolder(), facade));
                        addPage(new GatheringEventWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));
-                       addPage(new FieldObservationWizardPage(formFactory,
+                       addPage(new FieldUnitWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));
                        addPage(new DerivedUnitBaseWizardPage(formFactory,
                                        selectionElement.getConversationHolder(), facade));
@@ -124,19 +124,19 @@ public class EditFromSelectionWizard extends Wizard implements
                                        selectionElement.getConversationHolder(),
                                        (Institution) entity));
                } else if (entity instanceof User) {
-                       addPage(new UserDetailWizardPage(formFactory, 
-                                       selectionElement.getConversationHolder(), 
+                       addPage(new UserDetailWizardPage(formFactory,
+                                       selectionElement.getConversationHolder(),
                                        (User) entity));
                } else {
                        StoreUtil.warningDialog("Missing interface", this,
                                        "No detail element for current selection");
-               } 
+               }
 
        }
 
        /*
         * (non-Javadoc)
-        * 
+        *
         * @see org.eclipse.jface.wizard.Wizard#performFinish()
         */
        /** {@inheritDoc} */