Merged refactoring from development branch.

[taxeditor.git] / taxeditor-store / src / main / java / eu / etaxonomy / taxeditor / newWizard / NewNonViralNameWizard.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
similarity index 86%
rename from taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java
rename to taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
index 298aa33398a433b170cab3c8af67ec1f3376c298..c82a842be4398b4f31dde650e770daeb2a07e4e7 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/newWizard/NewNonViralNameWizard.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewNonViralNameWizard.java
@@ -8,7 +8,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.editor.newWizard;
+package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.model.name.BotanicalName;
@@ -16,8 +16,8 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.section.name.NonViralNameWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
 
 /**
  * <p>NewNonViralNameWizard class.</p>
@@ -31,7 +31,7 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), entity));
+               addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), getEntity()));
        }
        
        /** {@inheritDoc} */
@@ -49,6 +49,6 @@ public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName>
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
-               CdmStore.getService(INameService.class).saveOrUpdate(entity);
+               CdmStore.getService(INameService.class).saveOrUpdate(getEntity());
        }
 }