Merge branch 'develop' into remoting-4.0

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
index fb2682fb9a8d71bf186412a5d4decd62ca21490b..02012cdbb023b2670ad4cc66e5cf982ded21293f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
@@ -21,21 +21,12 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplification> {
 
     private AmplificationGeneralWizardPage amplificationGeneralPage;
-    private AmplificationPrimerWizardPage amplificationPrimerPage;
-    private AmplificationCloningWizardPage amplificationCloningPage;
-    private AmplificationGelPhotoWizardPage amplificationGelPhotoWizardPage;
 
     /** {@inheritDoc} */
     @Override
     public void addPages() {
         amplificationGeneralPage = new AmplificationGeneralWizardPage(formFactory, getConversationHolder(), getEntity());
         addPage(amplificationGeneralPage);
-        amplificationPrimerPage = new AmplificationPrimerWizardPage(formFactory, getConversationHolder(), getEntity());
-        addPage(amplificationPrimerPage);
-        amplificationCloningPage = new AmplificationCloningWizardPage(formFactory, getConversationHolder(), getEntity());
-        addPage(amplificationCloningPage);
-        amplificationGelPhotoWizardPage = new AmplificationGelPhotoWizardPage(formFactory, getConversationHolder(), getEntity());
-        addPage(amplificationGelPhotoWizardPage);
     }
 
     /** {@inheritDoc} */
@@ -47,7 +38,7 @@ public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplificati
     /** {@inheritDoc} */
     @Override
     protected void saveEntity() {
-        CdmStore.getService(IAmplificationService.class).saveOrUpdate(getEntity());
+        CdmStore.getService(IAmplificationService.class).merge(getEntity());
     }
 
     /** {@inheritDoc} */
@@ -55,9 +46,6 @@ public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplificati
     public void setEntity(Amplification entity) {
         super.setEntity(entity);
         amplificationGeneralPage.getDetailElement().setEntity(entity);
-        amplificationPrimerPage.getDetailElement().setEntity(entity);
-        amplificationCloningPage.getDetailElement().setEntity(entity);
-        amplificationGelPhotoWizardPage.getDetailElement().setEntity(entity);
     }
 
     @Override