merge master into develop

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
index fc2edc93400f634bb22bab72fbd71d251397dacf..b322a88ddc763d87ecf69be8d2cd5bcd17da4e41 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
@@ -80,7 +80,10 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.description.WorkingSet;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.Rights;
+<<<<<<< HEAD
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
+=======
+>>>>>>> master
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.cdm.model.name.Registration;
@@ -712,7 +715,7 @@ public class CdmStore {
             }
             else if (cdmBase instanceof Amplification) {
                 service = (IService<T>) getService(IAmplificationService.class);
-            } 
+            }
             else if (cdmBase instanceof PolytomousKey) {
                 service = (IService<T>) getService(IPolytomousKeyService.class);
             }
@@ -752,12 +755,15 @@ public class CdmStore {
             else if (cdmBase instanceof Rights) {
                 service = (IService<T>) getService(IRightsService.class);
             }
+<<<<<<< HEAD
 //            else if (cdmBase instanceof AuditEvent) {
 //                service = (IService<T>) getService(IAuditEventService.class);
 //            }
 //            else if (cdmBase instanceof CdmPreference) {
 //                service = (IService<T>) getService(IPreferenceService.class);
 //            }
+=======
+>>>>>>> master
             else{
                String message = "Service for entity of class %s not yet implemented in TaxEditor";
                message = String.format(message, cdmBase.getClass().getSimpleName());