Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java

diff --combined eu.etaxonomy.taxeditor.application/.classpath
index 0f0d04b90bfb69678c587c34bb3585294306ea2f,4c7e96f59500b4f98198fb4a11bdf511d1107b48..4c0364cadc7a33d0798a7c7813ef92548fe8cb81
--- 1/eu.etaxonomy.taxeditor.application/.classpath
--- 2/eu.etaxonomy.taxeditor.application/.classpath
+++ b/eu.etaxonomy.taxeditor.application/.classpath
@@@ -3,7 -3,6 +3,6 @@@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 -      <classpathentry kind="src" path="src/main/resources"/>
 +      <classpathentry kind="src" path="src/test/java"/>
-       <classpathentry kind="src" path="src/main/resources/"/>
        <classpathentry kind="output" path="target/classes"/>
  </classpath>

diff --combined eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
index bfbdd84477a478f1d9b791b4e2c99d0c2b438824,f434a3b6ceade5bbbe54335ff7659a42965b5798..dbd3353708ca5eed81bb348743c09e3b8d5cd2ee
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
@@@ -10,30 -10,16 +10,16 @@@
  
  package eu.etaxonomy.taxeditor.editor.handler.create;
  
- import java.util.Collections;
- 
  import org.apache.log4j.Logger;
  import org.eclipse.core.commands.AbstractHandler;
  import org.eclipse.core.commands.ExecutionEvent;
  import org.eclipse.core.commands.ExecutionException;
- import org.eclipse.ui.PartInitException;
+ import org.eclipse.jface.wizard.WizardDialog;
+ import org.eclipse.ui.handlers.HandlerUtil;
  
- import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
- import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
- import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeFieldUnitCacheStrategy;
- import eu.etaxonomy.cdm.api.service.IOccurrenceService;
- import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
- import eu.etaxonomy.cdm.model.occurrence.DerivationEventType;
- import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
- import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
- import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
- import eu.etaxonomy.taxeditor.editor.EditorUtil;
- import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
- import eu.etaxonomy.taxeditor.store.CdmStore;
+ import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
  
  /**
-  * <p>NewSpecimenHandler class.</p>
-  *
   * @author n.hoffmann
   * @created Jun 16, 2010
   * @version 1.0
@@@ -42,32 -28,31 +28,32 @@@ public class NewSpecimenHandler extend
        private static final Logger logger = Logger
                        .getLogger(NewSpecimenHandler.class);
  
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-        */
        /** {@inheritDoc} */
        @Override
      public Object execute(ExecutionEvent event) throws ExecutionException {
-           ConversationHolder conversation = CdmStore.createConversation();
-           conversation.bind();
-           FieldUnit fieldUnit = FieldUnit.NewInstance();
-           DerivedUnit derivedUnit = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
-           DerivationEvent.NewSimpleInstance(fieldUnit, derivedUnit, DerivationEventType.GATHERING_IN_SITU());
-         CdmStore.getService(IOccurrenceService.class).merge(fieldUnit);
-         conversation.commit();
-         DerivateViewEditorInput input = new DerivateViewEditorInput(Collections.singleton(fieldUnit.getUuid()));
-         fieldUnit.setCacheStrategy(new DerivedUnitFacadeFieldUnitCacheStrategy());
-         derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
-         try {
-             EditorUtil.open(input);
-         } catch (PartInitException e) {
-             // TODO Auto-generated catch block
-             e.printStackTrace();
-         }
- //            NewDerivedUnitBaseWizard wizard = new NewDerivedUnitBaseWizard();
- //            wizard.init(null, null);
- //            WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
- //            dialog.open();
++
+           //TODO: we need to discuss how specimens should be created and handled #5244
+ //        ConversationHolder conversation = CdmStore.createConversation();
+ //        conversation.bind();
+ //        FieldUnit fieldUnit = FieldUnit.NewInstance();
+ //        DerivedUnit derivedUnit = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);
+ //        DerivationEvent.NewSimpleInstance(fieldUnit, derivedUnit, DerivationEventType.GATHERING_IN_SITU());
+ //        fieldUnit.setCacheStrategy(new DerivedUnitFacadeFieldUnitCacheStrategy());
+ //        derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
+ //        CdmStore.getService(IOccurrenceService.class).save(fieldUnit);
+ //        CdmStore.getService(IOccurrenceService.class).save(derivedUnit);
+ //        conversation.commit();
+ //        DerivateViewEditorInput input = new DerivateViewEditorInput(Collections.singleton(fieldUnit.getUuid()));
+ //        try {
+ //            EditorUtil.open(input);
+ //        } catch (PartInitException e) {
+ //            // TODO Auto-generated catch block
+ //            e.printStackTrace();
+ //        }
+               NewDerivedUnitBaseWizard wizard = new NewDerivedUnitBaseWizard();
+               wizard.init(null, null);
+               WizardDialog dialog = new WizardDialog(HandlerUtil.getActiveShell(event), wizard);
+               dialog.open();
                return null;
        }
  }

diff --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
index 5e32239b79b6a7bf6208453f1c8af9ea372356e6,3b9036faf261b9b7eb15a43d959ec1c6c6b4dae7..836c953c9ef7986fa2edfc4fbcb606eb2b72a380
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
@@@ -29,8 -29,6 +29,6 @@@ import eu.etaxonomy.taxeditor.ui.sectio
  import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
  
  /**
-  * <p>NewDerivedUnitBaseWizard class.</p>
-  *
   * @author n.hoffmann
   * @created Jun 16, 2010
   * @version 1.0
@@@ -70,12 -68,6 +68,6 @@@ public class NewDerivedUnitBaseWizard e
            }
        }
  
-     /*
-      * (non-Javadoc)
-      *
-      * @see eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard#
-      * createNewEntity()
-      */
      /** {@inheritDoc} */
      @Override
      protected SpecimenOrObservationBase createNewEntity() {
@@@ -96,13 -88,10 +88,10 @@@
          }
      }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.editor.newWizard.AbstractNewEntityWizard#saveEntity()
-        */
        /** {@inheritDoc} */
        @Override
        protected void saveEntity() {
 -              CdmStore.getService(IOccurrenceService.class).saveOrUpdate(getEntity());
 +              CdmStore.getService(IOccurrenceService.class).merge(getEntity());
        }
  
        @Override