From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 29 Jun 2015 13:20:33 +0000 (+0200)
Subject: Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
X-Git-Tag: remoting-3.9.0~115
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/410227bb31f3f88bf087c92ce84bd9e4d0feeb28

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
	eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
---

410227bb31f3f88bf087c92ce84bd9e4d0feeb28
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index 90ae5f0ba,e9803317c..66d18dee7
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@@ -1170,4 -1170,4 +1170,5 @@@ public class TransientDescriptionServic
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
++
  }
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index a74d73b5b,92fbdb1b4..428165d01
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@@ -1189,9 -1189,10 +1189,4 @@@ public class TransientNameService imple
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
 -
--
--
--
--
--
  }
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
index 1a6612cb1,3e28bf56c..399b42bb2
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
@@@ -725,6 -725,6 +725,4 @@@ public class TransientReferenceService 
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
--
--
  }
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 49237b718,08c3e7ecb..5692a93f1
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@@ -1480,5 -1477,5 +1480,4 @@@ public class TransientTaxonService impl
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
--
  }
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
index c3251691d,48c3673e8..4cbef62c4
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
@@@ -887,6 -887,6 +887,4 @@@ public class TransientTermService imple
      public DeleteResult delete(Collection<UUID> arg0) {
          return defaultService.delete(arg0);
      }
--
--
  }