merge master into develop

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());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
index 3dbb8705e94ebaf32cda603a4d35ed39989d2ac6..d02a89e4decf4216a974ad48daecce225e693adc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
@@ -15,6 +15,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.apache.log4j.Logger;
+import org.apache.lucene.search.similarities.Distribution;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.PersistState;
 import org.eclipse.e4.ui.di.UISynchronize;
@@ -27,12 +28,11 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWTException;
+import org.hibernate.proxy.HibernateProxyHelper;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.description.Distribution;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
@@ -136,6 +136,7 @@ public abstract class AbstractCdmEditorPartE4
            }catch(SWTException e){
               logger.debug("Something went wrong for viewer.getControl().setEnabled(true) in " + this.getClass().getSimpleName(), e);
            }
+
         }
 
 

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
index 09f1170063fa15fc4b6a52eeaa41fd0caf44f620..91b73f7d5260b2d8f6644ebeef784f85dfb910f6 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
-
 <product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.13.0.qualifier" useFeatures="true" includeLaunchers="true">
-
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
       <text>

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index 5330adfcfcbcaac1b9e71886a763d5b3a206781c..36a6e4bb7b078a45b644ab19b301bb457d85e847 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -366,3 +366,4 @@
 <plugin id="org.hamcrest.library"/>
 </includeBundles>
 </target>
+