Merge branch 'hotfix/3.12.4' into develop

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java - resolved
	eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java - UNRESOLVED!!!!!

diff --cc eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
index daf03e1dfdce2502b5cfd2f1bd5a100571c2dfc9,977e85389a04130827d54638543b695b25ba70fb..dcfff9f24c6ce8ad71b32bbab38ca1125394aa88
--- 1/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
--- 2/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
@@@ -74,9 -75,13 +75,10 @@@ public class CdmServiceCacher extends C
          return load(term);
      }
  
 -    /* (non-Javadoc)
 -     * @see eu.etaxonomy.cdm.model.ICdmCacher#isCachable(eu.etaxonomy.cdm.model.common.CdmBase)
 -     */
      @Override
      public boolean isCachable(CdmBase cdmEntity) {
-         if(cdmEntity != null && cdmEntity instanceof DefinedTermBase) {
+      //   if(cdmEntity != null && cdmEntity instanceof DefinedTermBase) {
+          if(cdmEntity != null && cdmEntity instanceof TermBase) {
              return true;
          }
          return false;

diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index 1795b73afead863711963eec6cdb9840b23b379b,dee02e05f54c0f811794ce51f6d58a26c76ce02d..eb5070d240c4b7d07f9e684db1852bc657e7df43
--- 1/eu.etaxonomy.taxeditor.editor/plugin.xml
--- 2/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -1883,18 -1763,11 +1895,18 @@@
              %wizard.description
           </description>
        </wizard>
-    </extension>
+    </extension-->
     <extension
            point="eu.etaxonomy.taxeditor.store.cdmViewer">
 -       <cdmViewer
 -             class="eu.etaxonomy.taxeditor.editor.EditorCdmViewer">
 -       </cdmViewer>
 +      <viewCommandMapping
 +            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxonNode"
 +            selection="eu.etaxonomy.cdm.model.taxon.TaxonNode"
 +            viewerName="Taxon Editor">
 +      </viewCommandMapping>
 +      <viewCommandMapping
 +            commandId="eu.etaxonomy.taxeditor.editor.openTaxonEditorForTaxon"
 +            selection="eu.etaxonomy.cdm.model.taxon.TaxonBase"
 +            viewerName="TaxonEditor">
 +      </viewCommandMapping>
      </extension>
  </plugin>

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index bc26d72abac1b5b2c325ea397283678bc8d9f2a6,2478bf5a125b6429af38ecd63c1312672728065f..1418de783873e8b328ecf9fb06852c57daf1899f
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@@ -56,8 -56,15 +56,20 @@@ public class NewTaxonNodeWizard extend
              Reference sec = taxon.getSec();
              taxon.setSec(null);
              try{
++<<<<<<< HEAD
 +              UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, parent.getReference(), parent.getMicroReference());
 +                      
++=======
+               UUID parentNodeUuid;
+               if(parent instanceof Classification){
+                   parentNodeUuid = ((Classification) parent).getRootNode().getUuid();
+               }
+               else{
+                   parentNodeUuid = parent.getUuid();
+               }
+                 UpdateResult result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parentNodeUuid, taxon, parent.getReference(), parent.getMicroReference());
+ 
++>>>>>>> hotfix/3.12.4
                  //TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
  
                /*  if(CdmStore.getCurrentSessionManager().isRemoting()) {
@@@ -68,7 -75,7 +80,11 @@@
                generatedTaxonNodeUuid = result.getCdmEntity().getUuid();
                TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);
                taxonNode.getTaxon().setSec(sec);
++<<<<<<< HEAD
 +              CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
++=======
+               CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
++>>>>>>> hotfix/3.12.4
                  Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
                  if (result.getUpdatedObjects().iterator().hasNext()){
                        TaxonNode parentNode = (TaxonNode)result.getUpdatedObjects().iterator().next();
@@@ -79,10 -86,10 +95,16 @@@
                          affectedObjects.add(parentNode);
                      }
                  }
++<<<<<<< HEAD
 +                
  
 +                
++=======
+ 
+ 
+ 
++>>>>>>> hotfix/3.12.4
 +
                  if(CdmStore.getCurrentSessionManager().isRemoting()) {
                      CdmApplicationState.getCurrentDataChangeService()
                          .fireChangeEvent(new CdmChangeEvent(Action.Create, affectedObjects, NewTaxonNodeWizard.class), true);