From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 14 Sep 2015 14:37:41 +0000 (+0200)
Subject: Merge branch 'develop' into remoting-4.0
X-Git-Tag: remoting-3.9.0~2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/667025a545eb8a1553ec97e1bd3d4fe3a0101f36

Merge branch 'develop' into remoting-4.0

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

667025a545eb8a1553ec97e1bd3d4fe3a0101f36
diff --cc eu.etaxonomy.taxeditor.application/.classpath
index 0f0d04b90,4c7e96f59..4c0364cad
--- a/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 --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java
index bfbdd8447,f434a3b6c..dbd335370
--- a/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
@@@ -45,29 -31,28 +31,29 @@@ public class NewSpecimenHandler extend
  	/** {@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;
  	}
  }