merge master into develop
authorKatja Luther <k.luther@bgbm.org>
Wed, 6 Dec 2017 08:57:39 +0000 (09:57 +0100)
committerKatja Luther <k.luther@bgbm.org>
Wed, 6 Dec 2017 08:57:39 +0000 (09:57 +0100)
1  2 
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
eu.etaxonomy.taxeditor/rcp.target

@@@ -80,7 -79,6 +80,10 @@@ import eu.etaxonomy.cdm.model.descripti
  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 -710,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);
              }
              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());
@@@ -14,7 -14,6 +14,8 @@@ import javax.annotation.PreDestroy
  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;
@@@ -26,13 -25,12 +27,12 @@@ import org.eclipse.jface.viewers.ISelec
  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;
@@@ -131,14 -129,8 +131,15 @@@ public abstract class AbstractCdmEditor
              return;
          }
          if (viewer != null && viewer.getControl()!= null && viewer.getInput() != null && !viewer.getControl().isDisposed()){
 -            viewer.getControl().setEnabled(true);
 +           try{
 +               viewer.getControl().setEnabled(true);
 +           }catch(SWTException e){
 +              logger.debug("Something went wrong for viewer.getControl().setEnabled(true) in " + this.getClass().getSimpleName(), e);
 +           }
++
          }
 +
 +
          if(previousSelection==null ||
                  previousSelection!=selection){//skip redundant rendering of details view
              if(delaySelection==null){
@@@ -1,8 -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.11.4" useFeatures="true" includeLaunchers="true">
--
 +<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>
  <plugin id="org.eclipse.xtext.xtext.generator.source"/>
  <plugin id="org.hamcrest.library"/>
  </includeBundles>
 -</target>
 +</target>
++