Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 10:51:55 +0000 (12:51 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Mon, 22 Jun 2015 10:51:55 +0000 (12:51 +0200)
Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.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/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java

1  2 
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java

index 7f177503aafa798225f2646362407f88a1d2d864,1b4438a96460f72cc218c1e10b5392c142d79a7b..ff0aedf84e560251f5d398b906654045b9416259
@@@ -1,9 -1,9 +1,9 @@@
  // $Id$
  /**
  * Copyright (C) 2007 EDIT
 -* European Distributed Institute of Taxonomy 
 +* European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
 -* 
 +*
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@@ -28,29 -28,38 +28,29 @@@ import org.eclipse.jface.viewers.TableV
  import org.eclipse.jface.viewers.TableViewerColumn;
  import org.eclipse.jface.viewers.Viewer;
  import org.eclipse.swt.SWT;
 -
  import org.eclipse.swt.widgets.Composite;
  import org.eclipse.swt.widgets.Display;
  import org.eclipse.swt.widgets.Table;
 -import org.eclipse.ui.INullSelectionListener;
 -import org.eclipse.ui.ISelectionListener;
 -
  import org.eclipse.ui.IWorkbenchPart;
  
 +import eu.etaxonomy.cdm.api.application.CdmChangeEvent;
  import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
  import eu.etaxonomy.cdm.api.service.IAgentService;
 -import eu.etaxonomy.cdm.api.service.ICommonService;
  import eu.etaxonomy.cdm.api.service.IGroupService;
 -
  import eu.etaxonomy.cdm.api.service.INameService;
  import eu.etaxonomy.cdm.api.service.IOccurrenceService;
  import eu.etaxonomy.cdm.api.service.IReferenceService;
  import eu.etaxonomy.cdm.api.service.ITaxonService;
  import eu.etaxonomy.cdm.api.service.IUserService;
 -
  import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
  import eu.etaxonomy.cdm.model.common.CdmBase;
  import eu.etaxonomy.cdm.model.common.Group;
 -
  import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
  import eu.etaxonomy.cdm.model.common.User;
  import eu.etaxonomy.cdm.model.name.NonViralName;
 -import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  import eu.etaxonomy.cdm.model.reference.Reference;
  import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 -
  import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
  import eu.etaxonomy.taxeditor.model.DescriptionHelper;
  import eu.etaxonomy.taxeditor.model.LineSelection;
@@@ -70,12 -79,12 +70,12 @@@ public class ReferencingObjectsView ext
  
        /** Constant <code>ID="eu.etaxonomy.taxeditor.bulkeditor.refer"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects";
 -      
 +
        private TableViewer viewer;
  
        private String referencedObjectTitleCache;
 -      private ConversationHolder conversation; 
 -      
 +      private ConversationHolder conversation;
 +
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#createViewer(org.eclipse.swt.widgets.Composite)
         */
                viewer.setLabelProvider(new ReferencingObjectsLabelProvider());
  //            viewer.setInput(new ArrayList<CdmBase>());
        }
 -      
 +
        /**
         * Create the columns for the table
         * @param viewer
         * @param entity a {@link eu.etaxonomy.cdm.model.common.IdentifiableEntity} object.
         */
        public void updateReferencingObjects(final UUID entityUUID, final Class objectClass) {
 -              
 +
                final Display display = Display.getCurrent();
 -              
 +
                Job job = new Job("Update Referencing Objects") {
 -                      
 +
                        @Override
                        protected IStatus run(IProgressMonitor monitor) {
                                monitor.beginTask("Calculating referencing objects", 10);
 -                      
 +
                                monitor.worked(3);
 -                              
 +
                                display.asyncExec(new Runnable() {
 -                                      
 +
                                        @Override
                                        public void run() {
                                                if (entityUUID != null){
 -                                                      
 +
                                                        List<CdmBase> referencingObjects = getReferencingObjects(entityUUID, objectClass);
 -                                                      
 +
                                                        updateView(referencingObjects);
 -                                                      
 +
                                                }
                                        }
                                });
 -                              
 +
                                monitor.done();
 -                              
 -                              
 +
 +
                                return Status.OK_STATUS;
                        }
                };
 -              
 +
                job.setPriority(Job.DECORATE);
                job.schedule();
        }
                }
                        //referencedObject =(CdmBase) CdmStore.getService(IIdentifiableEntityService.class).load(referencedObject.getUuid());
                Set<CdmBase> setOfReferencingObjects = null;
 -              
 +
                if (referencedObject != null){
                        referencedObjectTitleCache = ((IdentifiableEntity)referencedObject).getTitleCache();
                        setOfReferencingObjects = CdmStore.getCommonService().getReferencingObjects(referencedObject);
                }
                if (setOfReferencingObjects != null){
 -                      List<CdmBase> referencingObjects = new ArrayList<CdmBase>(setOfReferencingObjects);                     
 -                      
 +                      List<CdmBase> referencingObjects = new ArrayList<CdmBase>(setOfReferencingObjects);
 +
                        Collections.sort(referencingObjects, new ReferencingClassComparator());
 -                              
 +
                        return referencingObjects;
 -                      
 +
                }
          } catch (Exception e) {
              logger.error("Error retrieving referencing objects", e);
          }
                return null;
        }
 -      
 +
        class ReferencingClassComparator implements Comparator<CdmBase> {
  
                /* (non-Javadoc)
                 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
                 */
 -              public int compare(CdmBase o1, CdmBase o2) {
 +              @Override
 +        public int compare(CdmBase o1, CdmBase o2) {
                        String string1 = o1.getClass().getSimpleName();
                        String string2 = o2.getClass().getSimpleName();
                        int classCompare = string1.compareToIgnoreCase(string2);
                        }
                }
        }
 -      
 +
        /**
 -       * 
 +       *
         */
        private void updateView(List<CdmBase> referencingObjects) {
                if (viewer != null && !viewer.getControl().isDisposed()){
-                       viewer.setInput(referencingObjects);
-                       if (referencedObjectTitleCache != null){
-                               setContentDescription("'" + referencedObjectTitleCache + "' is referenced by:");
-                       } else {
-                               setContentDescription("");
+                       try{
+                               viewer.setInput(referencingObjects);
+                               if (referencedObjectTitleCache != null){
+                                       setContentDescription("'" + referencedObjectTitleCache + "' is referenced by:");
+                               } else {
+                                       setContentDescription("");
+                               }
+                               showViewer();
+                       }catch(Exception e){
+                               setContentDescription("Some Problems occured.");
                        }
-                       showViewer();
 -                      
++
                }
        }
  
        /** {@inheritDoc} */
 -      public void selectionChanged(IWorkbenchPart part, ISelection selection) {
 +      @Override
 +    public void selectionChanged(IWorkbenchPart part, ISelection selection) {
                if(! (part instanceof BulkEditor)){
                        setContentDescription("");
                        showEmptyPage();
                        return;
                }
 -              
 +
                if(! (selection instanceof LineSelection)){
                        return;
                }
                LineSelection lineSelection = (LineSelection) selection;
 -              
 +
                if(lineSelection.size() != 1){
                        return;
                }
 -                      
 +
                if(! (lineSelection.getFirstElement() instanceof IdentifiableEntity)){
                        return;
                }
 -              
 +
                showViewer(part, lineSelection);
        }
 -      
 +
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.model.AbstractCdmViewPart#showViewer(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
         */
        @Override
        public void showViewer(IWorkbenchPart part, IStructuredSelection selection) {
        //      this.part = part;
 -              
 +
                updateReferencingObjects(((IdentifiableEntity) selection.getFirstElement()).getUuid(),selection.getFirstElement().getClass() );
        }
 -      
 +
        /** {@inheritDoc} */
        @Override
        public void dispose() {
                selectionService.removePostSelectionListener(this);
                selectionService.removeSelectionListener(this);
                super.dispose();
 -              
 +
        }
  
        /* (non-Javadoc)
        public void changed(Object object) {
                // no editing in this view
        }
 -      
 +
        /* (non-Javadoc)
         * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#onComplete()
         */
        public boolean onComplete() {
                return false;
        }
 -      
 +
        public void refresh(){
 -              
 +
                selectionService.removePostSelectionListener(this);
                selectionService.removeSelectionListener(this);
                selectionService.addPostSelectionListener(this);
                selectionService.addSelectionListener(this);
 -              
 +
        }
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.application.ICdmChangeListener#onChange(eu.etaxonomy.cdm.api.application.CdmChangeEvent)
 +     */
 +    @Override
 +    public void onChange(CdmChangeEvent event) {
 +        // TODO Auto-generated method stub
 +
 +    }
 +
  
  }
index c86768ae6c0c54e8af0a73647a0eaa08ee789640,8fc759d88cdb2ac4485414ac0721a15f514f4a37..dc969940dff268fcc41b7db946548ce88c243a80
@@@ -21,23 -21,15 +21,23 @@@ import eu.etaxonomy.cdm.model.taxon.Tax
  import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
  import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
  import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 +import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;\r
  import eu.etaxonomy.taxeditor.store.CdmStore;\r
  \r
  public class DeleteTaxonOperation extends DeleteTaxonBaseOperation{\r
  \r
      private final Classification classification;\r
  \r
 -      public DeleteTaxonOperation(String label, IUndoContext undoContext,\r
 -                      Taxon taxon, TaxonDeletionConfigurator configurator, Classification classification, IWorkbenchPage activePage, IPostOperationEnabled postOperationEnabled, IConversationEnabled conversationEnabled) {\r
 -              super(label, undoContext, configurator, activePage, postOperationEnabled, conversationEnabled);\r
 +      public DeleteTaxonOperation(String label,\r
 +              IUndoContext undoContext,\r
 +                      Taxon taxon,\r
 +                      TaxonDeletionConfigurator configurator,\r
 +                      Classification classification,\r
 +                      IWorkbenchPage activePage,\r
 +                      IPostOperationEnabled postOperationEnabled,\r
 +                      IConversationEnabled conversationEnabled,\r
 +            ICdmEntitySessionEnabled cdmEntitySessionEnabled) {\r
 +              super(label, undoContext, configurator, activePage, postOperationEnabled, conversationEnabled, cdmEntitySessionEnabled);\r
                this.element = taxon;\r
  \r
                Set<TaxonNode> nodes = taxon.getTaxonNodes();\r
@@@ -71,9 -63,9 +71,9 @@@
                                controller = CdmStore.getCurrentApplicationConfiguration();\r
  \r
                                ITaxonService service = controller.getTaxonService();\r
--\r
--\r
 -                              DeleteResult result =   service.deleteTaxon(element.getUuid(), configurator, classification);\r
++
 +                              DeleteResult result =   service.deleteTaxon(element.getUuid(), configurator, classification.getUuid());\r
++
                                if (result.isError()){\r
                                        MessageDialog.openError(null, "Delete failed", result.toString());\r
                                } else if (!result.getUpdatedObjects().isEmpty()){\r
index 7d22b8e0c3541253b2c11d969485734ba343a7b8,cf2ff58f6e82bc2d30b392d61578ea697096c1b4..bae1a44883429dc2b2dc96912bb5897d9a54450d
@@@ -711,4 -711,10 +711,5 @@@ public class TransientCollectionServic
        public <S extends Collection>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 -      @Override
 -      public DeleteResult delete(UUID arg0) {
 -              
 -              return defaultService.delete(arg0);
 -      }
  }
index ac716302506ce0b871606446ffc8d6adf3122370,14a874037b200fafda1147195dcb9663588e3f83..f24a603c9f69f2d6af09f5ae3213787b47cca29b
@@@ -221,8 -221,8 +221,8 @@@ public class TransientNameService imple
       * @see eu.etaxonomy.cdm.api.service.INameService#delete(eu.etaxonomy.cdm.model.name.TaxonNameBase, eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator)
       */
      @Override
-     public DeleteResult delete(TaxonNameBase name, NameDeletionConfigurator config)  {
-         return defaultService.delete(name, config);
+     public DeleteResult delete(UUID nameUuid, NameDeletionConfigurator config)  {
+         return defaultService.delete(nameUuid, config);
      }
  
      /**
        }
  
  
 -
        @Override
        public <S extends TaxonNameBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
  
  
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.INameService#setAsGroupsBasionym(java.util.UUID)
 +     */
 +    @Override
 +    public UpdateResult setAsGroupsBasionym(UUID nameUuid) {
 +        return defaultService.delete(nameUuid);
 +    }
 +
 +
        @Override
        public List<HashMap<String, String>> getNameRecords() {
  
        }
  
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
+     /**
+      * {@inheritDoc}
       */
      @Override
-     public DeleteResult delete(UUID uuid) {
-         return defaultService.delete(uuid);
+     public DeleteResult delete(UUID arg0) {
+         return defaultService.delete(arg0);
      }
  
 -    /**
 -     * {@inheritDoc}
 -     */
 -    @Override
 -    public UpdateResult setAsGroupsBasionym(UUID arg0) {
 -        return defaultService.setAsGroupsBasionym(arg0);
 -    }
 -
 -
  
  
  
  }
index 31232d7014104b4fa5943e9d9f7f70eac4fb6531,02a3281ffc5532c6ec9f30b11f71489107869612..7d30196c6dc1b849de28da7dfe6e3edef725eb43
@@@ -1056,15 -1056,13 +1056,13 @@@ public class TransientOccurenceService 
            return defaultService.getAllHierarchyDerivatives(specimen);
        }
  
 -    /**
 -     * {@inheritDoc}
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
--
  }
index b98fd1ee075e82eb1337002cee6de243d80986fe,8be8cc8869e0070edbebe80cbdf95c52ce116579..89ba707f7e821f2b68af219d64927849fa3a6e62
@@@ -710,12 -710,13 +710,13 @@@ public class TransientReferenceService 
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
  }
index a47a4284f73c0a120981b0e26b46d6bb0435314c,391c91d176423fae5529237f790ec97a9efcb5f2..76eea8fcbd4003e81e455547acc038214ae057df
@@@ -1,12 -1,12 +1,12 @@@
  // $Id$
  /**
 -* Copyright (C) 2013 EDIT
 -* European Distributed Institute of Taxonomy
 -* http://www.e-taxonomy.eu
 -*
 -* The contents of this file are subject to the Mozilla Public License Version 1.1
 -* See LICENSE.TXT at the top of this package for the full license terms.
 -*/
 + * Copyright (C) 2013 EDIT
 + * European Distributed Institute of Taxonomy
 + * http://www.e-taxonomy.eu
 + *
 + * The contents of this file are subject to the Mozilla Public License Version 1.1
 + * See LICENSE.TXT at the top of this package for the full license terms.
 + */
  package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
  
  import java.io.IOException;
@@@ -506,11 -506,11 +506,12 @@@ public class TransientTaxonService impl
      /**
       * @param synonym
       * @param acceptedTaxon
++     * @return
       * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(eu.etaxonomy.cdm.model.taxon.Synonym, eu.etaxonomy.cdm.model.taxon.Taxon)
       */
      @Override
--    public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
--        defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
++    public UpdateResult swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
++        return defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
      }
  
      /**
              String queryString, Classification classification, Set<NamedArea> namedAreas,
              Set<PresenceAbsenceTerm> distributionStatus, List<Language> languages, boolean highlightFragments,
              Integer pageSize, Integer pageNumber, List<OrderHint> orderHints, List<String> propertyPaths)
 -            throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
 +                    throws CorruptIndexException, IOException, ParseException, LuceneMultiSearchException {
          return defaultService.findTaxaAndNamesByFullText(searchModes, queryString, classification, namedAreas, distributionStatus, languages, highlightFragments, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
          return defaultService.deleteSynonym(arg0, arg1, arg2);
      }
  
--    @Override
-     public DeleteResult deleteTaxon(Taxon arg0, TaxonDeletionConfigurator arg1, Classification arg2) {
 -    public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, Classification arg2) {
--        return defaultService.deleteTaxon(arg0, arg1, arg2);
--    }
--
      @Override
      public List<List<Synonym>> getSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
          return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
      }
  
 -      @Override
 -      public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
 -                      TaxonRelationshipType oldRelationshipType,
 -                      SynonymRelationshipType synonymRelationshipType)
 -                      throws DataChangeNoRollbackException {
 +    @Override
 +    public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
 +            TaxonRelationshipType oldRelationshipType,
 +            SynonymRelationshipType synonymRelationshipType)
 +                    throws DataChangeNoRollbackException {
  
 -              return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
 -      }
 +        return defaultService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
 +    }
  
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.ITaxonService#pageAcceptedTaxaFor(java.util.UUID, java.util.UUID, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
          return defaultService.listAcceptedTaxaFor(synonymUuid, classificationUuid, pageSize, pageNumber, orderHints, propertyPaths);
      }
  
 -      @Override
 -      public DeleteResult isDeletable(TaxonBase object,
 -                      DeleteConfiguratorBase config) {
 -              // TODO Auto-generated method stub
 -              return null;
 -      }
 +    @Override
 +    public DeleteResult isDeletable(TaxonBase object,
 +            DeleteConfiguratorBase config) {
 +        // TODO Auto-generated method stub
 +        return null;
 +    }
  
 -      @Override
 -      public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
 -                      IncludedTaxonConfiguration configuration) {
 -              // TODO Auto-generated method stub
 -              return null;
 -      }
 +    @Override
 +    public IncludedTaxaDTO listIncludedTaxa(UUID taxonUuid,
 +            IncludedTaxonConfiguration configuration) {
 +        // TODO Auto-generated method stub
 +        return null;
 +    }
  
 -      @Override
 -      public TaxonBase findWithoutFlush(UUID uuid) {
 -              return defaultService.findWithoutFlush(uuid);
 -      }
 +    @Override
 +    public TaxonBase findWithoutFlush(UUID uuid) {
 +        return defaultService.findWithoutFlush(uuid);
 +    }
  
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.ITaxonService#findTaxaByName(eu.etaxonomy.cdm.api.service.config.MatchingTaxonConfigurator)
          return defaultService.findTaxaByName(config);
      }
  
 -      @Override
 -      public <S extends TaxonBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
 -              return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 -      }
 -
 -      /* (non-Javadoc)
 -       * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
 -       */
 -      @Override
 -      public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
 -              DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
 -              Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
 -          return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 -      }
 -
 -
 -
 +    @Override
 +    public <S extends TaxonBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
 +        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 +    }
  
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#findByIdentifier(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.model.common.DefinedTerm, eu.etaxonomy.cdm.model.taxon.TaxonNode, eu.etaxonomy.cdm.persistence.query.MatchMode, boolean, java.lang.Integer, java.lang.Integer, java.util.List)
 +     */
 +    @Override
 +    public <S extends TaxonBase> Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier,
 +            DefinedTerm identifierType, TaxonNode subtreeFilter, MatchMode matchmode, boolean includeEntity,
 +            Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
 +        return defaultService.findByIdentifier(clazz, identifier, identifierType, subtreeFilter, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 +    }
  
  
  
 -      @Override
 -      public SynonymRelationship moveSynonymToAnotherTaxon(
 -                      SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
 -                      boolean moveHomotypicGroup,
 -                      SynonymRelationshipType newSynonymRelationshipType,
 -                      Reference reference, String referenceDetail, boolean keepReference)
 -                      throws HomotypicalGroupChangeException {
 -
 -              return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
 -      }
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteSynonym(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator)
 +     */
 +    @Override
 +    public DeleteResult deleteSynonym(UUID synonymUuid, UUID taxonUuid, SynonymDeletionConfigurator config) {
 +        return defaultService.deleteSynonym(synonymUuid, taxonUuid, config);
 +    }
  
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(java.util.UUID, java.util.UUID)
+     /**
+      * {@inheritDoc}
 +
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) {
 +        return defaultService.swapSynonymAndAcceptedTaxon(synonymUUid, acceptedTaxonUuid);
      }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#deleteTaxon(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator, java.util.UUID)
       */
      @Override
 -    public DeleteResult deleteSynonym(UUID arg0, UUID arg1, SynonymDeletionConfigurator arg2) {
 -        return defaultService.deleteSynonym(arg0, arg1, arg2);
 +    public DeleteResult deleteTaxon(UUID taxonUuid, TaxonDeletionConfigurator config, UUID classificationUuid) {
 +        return defaultService.deleteTaxon(taxonUuid, config, classificationUuid);
      }
  
+       @Override
+       public UpdateResult moveFactualDateToAnotherTaxon(UUID arg0, UUID arg1) {
+               return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1);
+       }
+     /**
+      * {@inheritDoc}
+      */
      @Override
 -    public DeleteResult deleteTaxon(UUID arg0, TaxonDeletionConfigurator arg1, UUID arg2) {
 -        return defaultService.deleteTaxon(arg0, arg1, arg2);
 +    public SynonymRelationship moveSynonymToAnotherTaxon(
 +            SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,
 +            boolean moveHomotypicGroup,
 +            SynonymRelationshipType newSynonymRelationshipType,
 +            Reference reference, String referenceDetail, boolean keepReference)
 +                    throws HomotypicalGroupChangeException {
 +
 +        return defaultService.moveSynonymToAnotherTaxon(oldSynonymRelation, newTaxonUUID, moveHomotypicGroup, newSynonymRelationshipType, reference, referenceDetail, keepReference);
      }
  
 -    /**
 -     * {@inheritDoc}
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public UpdateResult swapSynonymAndAcceptedTaxon(UUID arg0, UUID arg1) {
 -        return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
 +
      }
  
  }
index 52545c1470d6c62630175ae68733db6c8e269b58,412a7eeb62af94ada431909935d288aab3a0677a..0089e72dbcc0ffe36f83ce2ca45cf9f547d4a46d
@@@ -1,12 -1,12 +1,12 @@@
  // $Id$
  /**
 -* Copyright (C) 2013 EDIT
 -* European Distributed Institute of Taxonomy
 -* http://www.e-taxonomy.eu
 -*
 -* The contents of this file are subject to the Mozilla Public License Version 1.1
 -* See LICENSE.TXT at the top of this package for the full license terms.
 -*/
 + * Copyright (C) 2013 EDIT
 + * European Distributed Institute of Taxonomy
 + * http://www.e-taxonomy.eu
 + *
 + * The contents of this file are subject to the Mozilla Public License Version 1.1
 + * See LICENSE.TXT at the top of this package for the full license terms.
 + */
  package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices;
  
  import java.net.URI;
@@@ -846,11 -846,11 +846,11 @@@ public class TransientTermService imple
          return defaultService.findByIdInVocabulary(id, vocabularyUuid, clazz);
      }
  
 -      @Override
 -      public DeleteResult isDeletable(DefinedTermBase object,
 -                      DeleteConfiguratorBase config) {
 -              return defaultService.isDeletable(object, config);
 -      }
 +    @Override
 +    public DeleteResult isDeletable(DefinedTermBase object,
 +            DeleteConfiguratorBase config) {
 +        return defaultService.isDeletable(object, config);
 +    }
  
      /* (non-Javadoc)
       * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
          return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
      }
  
 -      @Override
 -      public DefinedTermBase findWithoutFlush(UUID uuid) {
 -              return defaultService.findWithoutFlush(uuid);
 -      }
 +    @Override
 +    public DefinedTermBase findWithoutFlush(UUID uuid) {
 +        return defaultService.findWithoutFlush(uuid);
 +    }
  
  
 -      @Override
 -      public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
 -              return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 -      }
 +    @Override
 +    public <S extends DefinedTermBase>  Pager<FindByIdentifierDTO<S>> findByIdentifier(Class<S> clazz, String identifier, DefinedTerm identifierType, MatchMode matchmode, boolean includeEntity, Integer pageSize, Integer pageNumber, List<String> propertyPaths){
 +        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
 +    }
  
 -    /**
 -     * {@inheritDoc}
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
       */
      @Override
 -    public DeleteResult delete(UUID arg0) {
 -        return defaultService.delete(arg0);
 +    public DeleteResult delete(UUID uuid) {
 +        return defaultService.delete(uuid);
      }
  
  }