From 15387df0fd5daee2ec35d4ab2b8a29fbdc3800f7 Mon Sep 17 00:00:00 2001 From: Patric Plitzner Date: Wed, 26 Feb 2014 08:39:05 +0000 Subject: [PATCH] - moved transient interfaces to taxeditor.editor - changed GUI control of DataImportEditor to be a TableViewer - made DataImportEditor generic --- .gitattributes | 32 +- .../META-INF/MANIFEST.MF | 4 +- eu.etaxonomy.taxeditor.bulkeditor/plugin.xml | 17 - .../AnnotatedLineDocumentProvider.java | 10 - .../OpenBulkEditorContributionItem.java | 3 - .../command/SaveSpecimenCommand.java | 65 -- .../dataimport/DataImportEditor.java | 130 ---- .../DataImportEditorLineDisplayStrategy.java | 122 ---- .../dataimport/DerivedUnitEditorInput.java | 189 ----- .../TransientCollectionService.java | 660 ------------------ .../META-INF/MANIFEST.MF | 1 + eu.etaxonomy.taxeditor.editor/plugin.xml | 31 + .../view/dataimport/DataImportEditor.java | 218 ++++++ .../dataimport/DataImportEditorInput.java | 104 +++ .../view/dataimport/SaveSpecimenCommand.java | 42 ++ .../view/dataimport/SpecimenImportEditor.java | 29 + .../dataimport/SpecimenImportEditorInput.java | 149 ++++ .../dataimport}/SpecimenSearchWizard.java | 8 +- .../dataimport}/SpecimenSearchWizardPage.java | 2 +- .../TransientAgentService.java | 2 +- .../TransientCdmRepository.java | 24 +- .../TransientClassificationService.java | 2 +- .../TransientDescriptionService.java | 2 +- .../TransientNameService.java | 2 +- .../TransientOccurenceService.java | 2 +- .../TransientReferenceService.java | 2 +- .../TransientTaxonService.java | 2 +- .../TransientTermService.java | 2 +- 28 files changed, 622 insertions(+), 1234 deletions(-) delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/SaveSpecimenCommand.java delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditor.java delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java delete mode 100644 eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCollectionService.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorInput.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SaveSpecimenCommand.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditor.java create mode 100644 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditorInput.java rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport}/SpecimenSearchWizard.java (90%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport}/SpecimenSearchWizardPage.java (97%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientAgentService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientCdmRepository.java (86%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientClassificationService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientDescriptionService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientNameService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientOccurenceService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientReferenceService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientTaxonService.java (99%) rename {eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor => eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view}/dataimport/transientServices/TransientTermService.java (99%) diff --git a/.gitattributes b/.gitattributes index 78ec84033..437749241 100644 --- a/.gitattributes +++ b/.gitattributes @@ -78,7 +78,6 @@ eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkedito eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicNewObjectMenu.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/SaveSpecimenCommand.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java -text @@ -118,21 +117,6 @@ eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkedito eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsContentProvider.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java -text eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditor.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientAgentService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientClassificationService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCollectionService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientNameService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientReferenceService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTermService.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizard.java -text -eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java -text eu.etaxonomy.taxeditor.bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/Application.java -text eu.etaxonomy.taxeditor.bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/ApplicationActionBarAdvisor.java -text eu.etaxonomy.taxeditor.bulkeditor/src/test/java/eu/etaxonomy/taxeditor/bulkeditor/ApplicationWorkbenchAdvisor.java -text @@ -486,6 +470,22 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/c eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorInput.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SaveSpecimenCommand.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditor.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditorInput.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizard.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizardPage.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java -text +eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java -text eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateMenuPropertyTester.java -text diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index 1a4cf7a5b..be65d51ea 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF @@ -12,9 +12,7 @@ Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor, eu.etaxonomy.taxeditor.bulkeditor.handler, eu.etaxonomy.taxeditor.bulkeditor.input, eu.etaxonomy.taxeditor.bulkeditor.internal, - eu.etaxonomy.taxeditor.bulkeditor.referencingobjects, - eu.etaxonomy.taxeditor.dataimport, - eu.etaxonomy.taxeditor.dataimport.wizard + eu.etaxonomy.taxeditor.bulkeditor.referencingobjects Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.ui.editors, diff --git a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml index 84349d3fa..1dbae4734 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/plugin.xml @@ -219,11 +219,6 @@ id="eu.etaxonomy.taxeditor.bulkeditor.command.derivedunit.addFieldObjectMedia" name="Add Field Object Media"> - - diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java index 391536bca..cad73b3e0 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java @@ -9,8 +9,6 @@ */ package eu.etaxonomy.taxeditor.annotatedlineeditor; -import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -27,9 +25,7 @@ import org.eclipse.jface.text.source.IAnnotationModel; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.AbstractDocumentProvider; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput; -import eu.etaxonomy.taxeditor.dataimport.DerivedUnitEditorInput; import eu.etaxonomy.taxeditor.model.AbstractUtility; @@ -222,12 +218,6 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider { if (element instanceof AbstractBulkEditorInput) { return ((AbstractBulkEditorInput)element).getModel(); } - else if(element instanceof DerivedUnitEditorInput){ - Collection results = ((DerivedUnitEditorInput) element).getResults(); - if(results!=null){ - return new ArrayList(results); - } - } return null; } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java index 303373ac0..d16a2b089 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/OpenBulkEditorContributionItem.java @@ -25,7 +25,6 @@ import org.eclipse.ui.menus.CommandContributionItemParameter; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants; import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType; -import eu.etaxonomy.taxeditor.dataimport.DataImportEditor; /** *

@@ -81,8 +80,6 @@ public class OpenBulkEditorContributionItem extends CompoundContributionItem { contributionItems.add(new Separator(groupName)); contributionItems.add(BulkEditorInputType.USER.createContributionItem()); contributionItems.add(BulkEditorInputType.GROUP.createContributionItem()); - contributionItems.add(new Separator(groupName)); - contributionItems.add(createContributionItem("Search Specimen", DataImportEditor.ID)); return contributionItems.toArray(new IContributionItem[contributionItems.size()]); } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/SaveSpecimenCommand.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/SaveSpecimenCommand.java deleted file mode 100644 index 174926f13..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/SaveSpecimenCommand.java +++ /dev/null @@ -1,65 +0,0 @@ -package eu.etaxonomy.taxeditor.bulkeditor.command; - -import org.eclipse.core.commands.AbstractHandler; -import org.eclipse.core.commands.ExecutionEvent; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PlatformUI; -import org.springframework.transaction.TransactionStatus; - -import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; -import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; -import eu.etaxonomy.cdm.api.service.IOccurrenceService; -import eu.etaxonomy.cdm.model.location.NamedArea; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; -import eu.etaxonomy.taxeditor.dataimport.DataImportEditor; -import eu.etaxonomy.taxeditor.model.AbstractUtility; -import eu.etaxonomy.taxeditor.model.LineSelection; -import eu.etaxonomy.taxeditor.store.CdmStore; - -public class SaveSpecimenCommand extends AbstractHandler { - - /* (non-Javadoc) - * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) - */ - @Override - public Object execute(ExecutionEvent event) throws ExecutionException { - final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - final ISelection selection = window.getActivePage().getSelection(); - if(selection instanceof LineSelection){ - LineSelection line = (LineSelection)selection; - Object firstElement = line.getFirstElement(); - if(firstElement instanceof SpecimenOrObservationBase){ - IWorkbenchPart activePart = AbstractUtility.getActivePart(); - if(activePart instanceof DataImportEditor){ - DataImportEditor dataImportEditor = (DataImportEditor)activePart; - - ICdmApplicationConfiguration currentApplicationConfiguration = CdmStore.getCurrentApplicationConfiguration(); -// currentApplicationConfiguration.getOccurrenceService().saveOrUpdate(CdmBase.deproxy(firstElement, SpecimenOrObservationBase.class)); - TransactionStatus tx = currentApplicationConfiguration.startTransaction(); - - DerivedUnitFacade unit1 = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.PreservedSpecimen); - // newInstance.setTitleCache("Test Specimen", true); - unit1.setCollectingMethod("Collected from the ground"); - unit1.setAccessionNumber("ACC-12345"); - unit1.setLocality("locality"); - unit1.setCountry(NamedArea.EUROPE()); - - - - -// currentApplicationConfiguration.getOccurrenceService().saveOrUpdate((SpecimenOrObservationBase) firstElement); - CdmStore.getService(IOccurrenceService.class).saveOrUpdate(unit1.innerDerivedUnit()); - currentApplicationConfiguration.commitTransaction(tx); - - dataImportEditor.getConversationHolder().commit(true); - } - } - } - return null; - } - -} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditor.java deleted file mode 100644 index c914e6a67..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditor.java +++ /dev/null @@ -1,130 +0,0 @@ -// $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. -*/ -package eu.etaxonomy.taxeditor.dataimport; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.text.source.AnnotationModel; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorSite; -import org.eclipse.ui.IMemento; -import org.eclipse.ui.PartInitException; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor; -import eu.etaxonomy.taxeditor.model.IContextListener; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author pplitzner - * @date 20.09.2013 - * - */ -public class DataImportEditor extends AnnotatedLineEditor implements IContextListener { - - /** Constant ID="bulkeditor.input.nameRelationship" */ - public static final String ID = "eu.etaxonomy.taxeditor.dataimport.DataImportEditor"; - - /** - * Constructs a new DataImportEditor with a new {@link ConversationHolder} - */ - public DataImportEditor() { - super(null); - CdmStore.getContextManager().addContextListener(this); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.texteditor.AbstractTextEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput) - */ - @Override - public void init(IEditorSite site, IEditorInput input) throws PartInitException { - super.init(site, input); - conversation = ((DerivedUnitEditorInput)input).getConversationHolder(); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.editors.text.TextEditor#initializeEditor() - */ - /** {@inheritDoc} */ - @Override - protected void initializeEditor() { - super.initializeEditor(); - setLineDisplayStrategy(new DataImportEditorLineDisplayStrategy()); - setEditorContextMenuId("#DataImportEditorContext"); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor#dispose() - */ - @Override - public void dispose() { - super.dispose(); - CdmStore.getContextManager().removeContextListener(this); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor#doSetInput(org.eclipse.ui.IEditorInput) - */ - @Override - protected void doSetInput(IEditorInput input) throws CoreException { - super.doSetInput(input); - setPartName(input.getName()); - setTitleToolTip(input.getName()); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.model.IContextListener#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) - */ - @Override - public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) { - // TODO Auto-generated method stub - System.out.println(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) - */ - @Override - public void contextStop(IMemento memento, IProgressMonitor monitor) { - // TODO Auto-generated method stub - System.out.println(); - - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) - */ - @Override - public void contextStart(IMemento memento, IProgressMonitor monitor) { - // TODO Auto-generated method stub - System.out.println(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.model.IContextListener#contextRefresh(org.eclipse.core.runtime.IProgressMonitor) - */ - @Override - public void contextRefresh(IProgressMonitor monitor) { - if(getDocumentProvider().getAnnotationModel(getEditorInput()) != null){ - ((AnnotationModel) getDocumentProvider().getAnnotationModel(getEditorInput())).removeAllAnnotations(); - } - setInput(getEditorInput()); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.model.IContextListener#workbenchShutdown(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) - */ - @Override - public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) { - // TODO Auto-generated method stub - System.out.println(); - } - -} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java deleted file mode 100644 index cf91f3816..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java +++ /dev/null @@ -1,122 +0,0 @@ -// $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. -*/ -package eu.etaxonomy.taxeditor.dataimport; - -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.Image; - -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.taxeditor.annotatedlineeditor.EntityListener; -import eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy; - -/** - * @author pplitzner - * @date 20.09.2013 - * - */ -public class DataImportEditorLineDisplayStrategy implements ILineDisplayStrategy { - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getIndent(java.lang.Object) - */ - @Override - public int getIndent(Object entity) { - // TODO Auto-generated method stub - return 0; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getIcon(java.lang.Object) - */ - @Override - public Image getIcon(Object entity) { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getFont(java.lang.Object) - */ - @Override - public Font getFont(Object entity) { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getText(java.lang.Object) - */ - @Override - public String getText(Object entity) { - return ((SpecimenOrObservationBase)entity).getTitleCache(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getSupplementalText(java.lang.Object) - */ - @Override - public String getSupplementalText(Object entity) { - return ""; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getEmptyCacheMessage(java.lang.Object) - */ - @Override - public String getEmptyCacheMessage(Object entity) { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#setText(java.lang.String, java.lang.Object) - */ - @Override - public void setText(String text, Object entity) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getHoverText(java.lang.Object) - */ - @Override - public String getHoverText(Object entity) { - return ((SpecimenOrObservationBase)entity).getTitleCache(); - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#setStatusMessage(java.lang.String, java.lang.Object) - */ - @Override - public void setStatusMessage(String text, Object entity) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#isEntityCacheEmpty(java.lang.Object) - */ - @Override - public boolean isEntityCacheEmpty(Object entity) { - // TODO Auto-generated method stub - return false; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#addDisplayListener(java.lang.Object, eu.etaxonomy.taxeditor.annotatedlineeditor.EntityListener) - */ - @Override - public void addDisplayListener(Object entity, EntityListener listener) { - // TODO Auto-generated method stub - - } - -} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java deleted file mode 100644 index 1674cb69e..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DerivedUnitEditorInput.java +++ /dev/null @@ -1,189 +0,0 @@ -// $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. -*/ -package eu.etaxonomy.taxeditor.dataimport; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URISyntaxException; -import java.util.Collection; - -import org.apache.http.client.ClientProtocolException; -import org.apache.log4j.Logger; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IPersistableElement; - -import eu.etaxonomy.cdm.api.conversation.ConversationHolder; -import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery; -import eu.etaxonomy.cdm.ext.biocase.BioCaseQueryServiceWrapper; -import eu.etaxonomy.cdm.io.common.CdmDefaultImport; -import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.taxeditor.dataimport.transientServices.TransientCdmRepository; -import eu.etaxonomy.taxeditor.store.CdmStore; - -/** - * @author pplitzner - * @date 20.09.2013 - * - */ -public class DerivedUnitEditorInput implements IEditorInput { - - private static Logger logger = Logger.getLogger(DerivedUnitEditorInput.class); - - private final BioCaseQuery query; - - private Collection results; - - private final ConversationHolder conversationHolder; - - /** - * @param results - */ - public DerivedUnitEditorInput(BioCaseQuery query) { - this.conversationHolder = CdmStore.createConversation(); - this.query = query; - } - - public void query(){ - String errorMessage = "Could not execute query " + DerivedUnitEditorInput.this.query; - try { - InputStream resultStream = new BioCaseQueryServiceWrapper().query(DerivedUnitEditorInput.this.query); - Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(resultStream, null, false); - TransientCdmRepository repo = - new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration()); - configurator.setCdmAppController(repo); - - CdmDefaultImport importer = new CdmDefaultImport(); - importer.invoke(configurator); - results = repo.getUnits(); - // Abcd206Import abcd206Import = new Abcd206Import(); - // Abcd206ImportState state = new Abcd206ImportState(configurator); - // abcd206Import.invoke(state); - // state.countTrees(); - } catch (ClientProtocolException e) { - logger.error(errorMessage, e); - } catch (IOException e) { - logger.error(errorMessage, e); - } catch (URISyntaxException e) { - logger.error(errorMessage, e); - } - - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - CdmStore.getContextManager().notifyContextRefresh(); - } - }); - } - - /* (non-Javadoc) - * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) - */ - @Override - public Object getAdapter(Class adapter) { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#exists() - */ - @Override - public boolean exists() { - return false; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#getImageDescriptor() - */ - @Override - public ImageDescriptor getImageDescriptor() { - // TODO Auto-generated method stub - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#getName() - */ - @Override - public String getName() { - return query.toString(); - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#getPersistable() - */ - @Override - public IPersistableElement getPersistable() { - return null; - } - - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#getToolTipText() - */ - @Override - public String getToolTipText() { - return query.toString(); - } - - /** - * @return the results - */ - public Collection getResults() { - return results; - } - - /** - * @return the conversationHolder - */ - public ConversationHolder getConversationHolder() { - return conversationHolder; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((query == null) ? 0 : query.hashCode()); - return result; - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - DerivedUnitEditorInput other = (DerivedUnitEditorInput) obj; - if (query == null) { - if (other.query != null) { - return false; - } - } else if (!query.equals(other.query)) { - return false; - } - return true; - } - -} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCollectionService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCollectionService.java deleted file mode 100644 index 417956410..000000000 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCollectionService.java +++ /dev/null @@ -1,660 +0,0 @@ -// $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. -*/ -package eu.etaxonomy.taxeditor.dataimport.transientServices; - -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -import org.hibernate.LockMode; -import org.hibernate.Session; -import org.hibernate.criterion.Criterion; -import org.hibernate.envers.query.criteria.AuditCriterion; - -import eu.etaxonomy.cdm.api.service.ICollectionService; -import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; -import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException; -import eu.etaxonomy.cdm.api.service.pager.Pager; -import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; -import eu.etaxonomy.cdm.model.common.Annotation; -import eu.etaxonomy.cdm.model.common.ISourceable; -import eu.etaxonomy.cdm.model.common.IdentifiableSource; -import eu.etaxonomy.cdm.model.common.LSID; -import eu.etaxonomy.cdm.model.common.Marker; -import eu.etaxonomy.cdm.model.common.MarkerType; -import eu.etaxonomy.cdm.model.common.UuidAndTitleCache; -import eu.etaxonomy.cdm.model.media.Rights; -import eu.etaxonomy.cdm.model.occurrence.Collection; -import eu.etaxonomy.cdm.model.view.AuditEvent; -import eu.etaxonomy.cdm.model.view.AuditEventRecord; -import eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort; -import eu.etaxonomy.cdm.persistence.query.Grouping; -import eu.etaxonomy.cdm.persistence.query.MatchMode; -import eu.etaxonomy.cdm.persistence.query.OrderHint; -import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy; -import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; -import eu.etaxonomy.cdm.strategy.merge.IMergeStrategy; - -/** - * @author pplitzner - * @date 27.09.2013 - * - */ -public class TransientCollectionService implements ICollectionService { - - private ICollectionService defaultCollectionService; - - /** - * @param defaultCollectionService - */ - public TransientCollectionService(ICollectionService defaultCollectionService) { - this.defaultCollectionService = defaultCollectionService; - } - - /** - * @param clazz - * @param query - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.ICollectionService#search(java.lang.Class, java.lang.String, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public Pager search(Class clazz, String query, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.search(clazz, query, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * @param t - * @param pageSize - * @param pageNumber - * @param sort - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IVersionableService#pageAuditEvents(eu.etaxonomy.cdm.model.common.VersionableEntity, java.lang.Integer, java.lang.Integer, eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort, java.util.List) - */ - @Override - public Pager> pageAuditEvents(Collection t, Integer pageSize, Integer pageNumber, AuditEventSort sort, List propertyPaths) { - return defaultCollectionService.pageAuditEvents(t, pageSize, pageNumber, sort, propertyPaths); - } - - /** - * @param annotatedObj - * @param status - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IAnnotatableService#getAnnotations(eu.etaxonomy.cdm.model.common.AnnotatableEntity, eu.etaxonomy.cdm.model.common.MarkerType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public Pager getAnnotations(Collection annotatedObj, MarkerType status, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.getAnnotations(annotatedObj, status, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * - * @see eu.etaxonomy.cdm.api.service.IService#clear() - */ - @Override - public void clear() { - defaultCollectionService.clear(); - } - - /** - * @param t - * @param lockMode - * @see eu.etaxonomy.cdm.api.service.IService#lock(eu.etaxonomy.cdm.model.common.ICdmBase, org.hibernate.LockMode) - */ - @Override - public void lock(Collection t, LockMode lockMode) { - defaultCollectionService.lock(t, lockMode); - } - - /** - * @param t - * @param lockMode - * @param propertyPaths - * @see eu.etaxonomy.cdm.api.service.IService#refresh(eu.etaxonomy.cdm.model.common.ICdmBase, org.hibernate.LockMode, java.util.List) - */ - @Override - public void refresh(Collection t, LockMode lockMode, List propertyPaths) { - defaultCollectionService.refresh(t, lockMode, propertyPaths); - } - - /** - * - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#updateTitleCache() - */ - @Override - public void updateTitleCache() { - defaultCollectionService.updateTitleCache(); - } - - /** - * @param t - * @return - * @see eu.etaxonomy.cdm.api.service.IVersionableService#getNextAuditEvent(eu.etaxonomy.cdm.model.common.VersionableEntity) - */ - @Override - public AuditEventRecord getNextAuditEvent(Collection t) { - return defaultCollectionService.getNextAuditEvent(t); - } - - /** - * @param code - * @return - * @see eu.etaxonomy.cdm.api.service.ICollectionService#searchByCode(java.lang.String) - */ - @Override - public List searchByCode(String code) { - return defaultCollectionService.searchByCode(code); - } - - /** - * @param annotatableEntity - * @param technical - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IAnnotatableService#getMarkers(eu.etaxonomy.cdm.model.common.AnnotatableEntity, java.lang.Boolean, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public Pager getMarkers(Collection annotatableEntity, Boolean technical, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.getMarkers(annotatableEntity, technical, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * @param clazz - * @param stepSize - * @param cacheStrategy - * @param monitor - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#updateTitleCache(java.lang.Class, java.lang.Integer, eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy, eu.etaxonomy.cdm.common.monitor.IProgressMonitor) - */ - @Override - public void updateTitleCache(Class clazz, Integer stepSize, IIdentifiableEntityCacheStrategy cacheStrategy, IProgressMonitor monitor) { - defaultCollectionService.updateTitleCache(clazz, stepSize, cacheStrategy, monitor); - } - - /** - * @param t - * @return - * @see eu.etaxonomy.cdm.api.service.IVersionableService#getPreviousAuditEvent(eu.etaxonomy.cdm.model.common.VersionableEntity) - */ - @Override - public AuditEventRecord getPreviousAuditEvent(Collection t) { - return defaultCollectionService.getPreviousAuditEvent(t); - } - - /** - * @param clazz - * @return - * @see eu.etaxonomy.cdm.api.service.IService#count(java.lang.Class) - */ - @Override - public int count(Class clazz) { - return defaultCollectionService.count(clazz); - } - - /** - * @param clazz - * @param from - * @param to - * @param criteria - * @param pageSize - * @param pageValue - * @param sort - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IVersionableService#pageAuditEvents(java.lang.Class, eu.etaxonomy.cdm.model.view.AuditEvent, eu.etaxonomy.cdm.model.view.AuditEvent, java.util.List, java.lang.Integer, java.lang.Integer, eu.etaxonomy.cdm.persistence.dao.common.AuditEventSort, java.util.List) - */ - @Override - public Pager> pageAuditEvents(Class clazz, AuditEvent from, AuditEvent to, List criteria, Integer pageSize, Integer pageValue, AuditEventSort sort, List propertyPaths) { - return defaultCollectionService.pageAuditEvents(clazz, from, to, criteria, pageSize, pageValue, sort, propertyPaths); - } - - /** - * @param lsid - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#find(eu.etaxonomy.cdm.model.common.LSID) - */ - @Override - public Collection find(LSID lsid) { - return defaultCollectionService.find(lsid); - } - - /** - * @param persistentObject - * @return - * @see eu.etaxonomy.cdm.api.service.IService#delete(eu.etaxonomy.cdm.model.common.ICdmBase) - */ - @Override - public UUID delete(Collection persistentObject) throws ReferencedObjectUndeletableException{ - return defaultCollectionService.delete(persistentObject); - } - - /** - * @param clazz - * @param technical - * @param pageSize - * @param pageNumber - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IAnnotatableService#groupMarkers(java.lang.Class, java.lang.Boolean, java.lang.Integer, java.lang.Integer, java.util.List) - */ - @Override - public List groupMarkers(Class clazz, Boolean technical, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultCollectionService.groupMarkers(clazz, technical, pageSize, pageNumber, propertyPaths); - } - - /** - * @param uuid - * @return - * @see eu.etaxonomy.cdm.api.service.IService#exists(java.util.UUID) - */ - @Override - public boolean exists(UUID uuid) { - return defaultCollectionService.exists(uuid); - } - - /** - * @param x - * @param y - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#replace(eu.etaxonomy.cdm.model.common.IdentifiableEntity, eu.etaxonomy.cdm.model.common.IdentifiableEntity) - */ - @Override - public Collection replace(Collection x, Collection y) { - return defaultCollectionService.replace(x, y); - } - - /** - * @param uuidSet - * @return - * @see eu.etaxonomy.cdm.api.service.IService#find(java.util.Set) - */ - @Override - public List find(Set uuidSet) { - return defaultCollectionService.find(uuidSet); - } - - /** - * @param t - * @param pageSize - * @param pageNumber - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#getSources(eu.etaxonomy.cdm.model.common.IdentifiableEntity, java.lang.Integer, java.lang.Integer, java.util.List) - */ - @Override - public Pager getSources(Collection t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultCollectionService.getSources(t, pageSize, pageNumber, propertyPaths); - } - - /** - * @param uuid - * @return - * @see eu.etaxonomy.cdm.api.service.IService#find(java.util.UUID) - */ - @Override - public Collection find(UUID uuid) { - return defaultCollectionService.find(uuid); - } - - /** - * @param id - * @return - * @see eu.etaxonomy.cdm.api.service.IService#find(int) - */ - @Override - public Collection find(int id) { - return defaultCollectionService.find(id); - } - - /** - * @param t - * @param pageSize - * @param pageNumber - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#getRights(eu.etaxonomy.cdm.model.common.IdentifiableEntity, java.lang.Integer, java.lang.Integer, java.util.List) - */ - @Override - public Pager getRights(Collection t, Integer pageSize, Integer pageNumber, List propertyPaths) { - return defaultCollectionService.getRights(t, pageSize, pageNumber, propertyPaths); - } - - /** - * @param clazz - * @param technical - * @return - * @see eu.etaxonomy.cdm.api.service.IAnnotatableService#countMarkers(java.lang.Class, java.lang.Boolean) - */ - @Override - public int countMarkers(Class clazz, Boolean technical) { - return defaultCollectionService.countMarkers(clazz, technical); - } - - /** - * @param idSet - * @return - * @see eu.etaxonomy.cdm.api.service.IService#findById(java.util.Set) - */ - @Override - public List findById(Set idSet) { - return defaultCollectionService.findById(idSet); - } - - /** - * @param clazz - * @param idInSource - * @param idNamespace - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#getSourcedObjectByIdInSource(java.lang.Class, java.lang.String, java.lang.String) - */ - @Override - public ISourceable getSourcedObjectByIdInSource(Class clazz, String idInSource, String idNamespace) { - return defaultCollectionService.getSourcedObjectByIdInSource(clazz, idInSource, idNamespace); - } - - /** - * @return - * @see eu.etaxonomy.cdm.api.service.IService#getSession() - */ - @Override - public Session getSession() { - return defaultCollectionService.getSession(); - } - - /** - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#getUuidAndTitleCache() - */ - @Override - public List> getUuidAndTitleCache() { - return defaultCollectionService.getUuidAndTitleCache(); - } - - /** - * @param clazz - * @param limit - * @param start - * @param groups - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IService#group(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public List group(Class clazz, Integer limit, Integer start, List groups, List propertyPaths) { - return defaultCollectionService.group(clazz, limit, start, groups, propertyPaths); - } - - /** - * @param clazz - * @param queryString - * @param matchmode - * @param criteria - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#findByTitle(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.persistence.query.MatchMode, java.util.List, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public Pager findByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.findByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * @param type - * @param limit - * @param start - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IService#list(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public List list(Class type, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultCollectionService.list(type, limit, start, orderHints, propertyPaths); - } - - /** - * @param configurator - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#findByTitle(eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator) - */ - @Override - public Pager findByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultCollectionService.findByTitle(configurator); - } - - /** - * @param clazz - * @param queryString - * @param matchmode - * @param criteria - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#countByTitle(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.persistence.query.MatchMode, java.util.List) - */ - @Override - public Integer countByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria) { - return defaultCollectionService.countByTitle(clazz, queryString, matchmode, criteria); - } - - /** - * @param uuid - * @return - * @see eu.etaxonomy.cdm.api.service.IService#load(java.util.UUID) - */ - @Override - public Collection load(UUID uuid) { - return defaultCollectionService.load(uuid); - } - - /** - * @param uuid - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IService#load(java.util.UUID, java.util.List) - */ - @Override - public Collection load(UUID uuid, List propertyPaths) { - return defaultCollectionService.load(uuid, propertyPaths); - } - - /** - * @param configurator - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#countByTitle(eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator) - */ - @Override - public Integer countByTitle(IIdentifiableEntityServiceConfigurator configurator) { - return defaultCollectionService.countByTitle(configurator); - } - - /** - * @param transientObject - * @return - * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase) - */ - @Override - public Collection merge(Collection transientObject) { - return defaultCollectionService.merge(transientObject); - } - - /** - * @param clazz - * @param queryString - * @param matchmode - * @param criteria - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#listByTitle(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.persistence.query.MatchMode, java.util.List, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public List listByTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.listByTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * @param type - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IService#page(java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public Pager page(Class type, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.page(type, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * @param persistentObject - * @return - * @see eu.etaxonomy.cdm.api.service.IService#refresh(eu.etaxonomy.cdm.model.common.ICdmBase) - */ - @Override - public UUID refresh(Collection persistentObject) { - return defaultCollectionService.refresh(persistentObject); - } - - /** - * @param clazz - * @param queryString - * @param matchmode - * @param criteria - * @param pageSize - * @param pageNumber - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#listByReferenceTitle(java.lang.Class, java.lang.String, eu.etaxonomy.cdm.persistence.query.MatchMode, java.util.List, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public List listByReferenceTitle(Class clazz, String queryString, MatchMode matchmode, List criteria, Integer pageSize, Integer pageNumber, List orderHints, List propertyPaths) { - return defaultCollectionService.listByReferenceTitle(clazz, queryString, matchmode, criteria, pageSize, pageNumber, orderHints, propertyPaths); - } - - /** - * @param tableName - * @param limit - * @param start - * @return - * @see eu.etaxonomy.cdm.api.service.IService#rows(java.lang.String, int, int) - */ - @Override - public List rows(String tableName, int limit, int start) { - return defaultCollectionService.rows(tableName, limit, start); - } - - /** - * @param newInstances - * @return - * @see eu.etaxonomy.cdm.api.service.IService#save(java.util.Collection) - */ - @Override - public Map save(java.util.Collection newInstances) { - return null; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#save(eu.etaxonomy.cdm.model.common.ICdmBase) - */ - @Override - public UUID save(Collection newInstance) { - return null; - } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.api.service.IService#saveOrUpdate(eu.etaxonomy.cdm.model.common.ICdmBase) - */ - @Override - public UUID saveOrUpdate(Collection transientObject) { - return null; - } - - /** - * @param transientObjects - * @return - * @see eu.etaxonomy.cdm.api.service.IService#saveOrUpdate(java.util.Collection) - */ - @Override - public Map saveOrUpdate(java.util.Collection transientObjects) { - return null; - } - - /** - * @param transientObject - * @return - * @see eu.etaxonomy.cdm.api.service.IService#update(eu.etaxonomy.cdm.model.common.ICdmBase) - */ - @Override - public UUID update(Collection transientObject) { - return defaultCollectionService.update(transientObject); - } - - /** - * @param example - * @param includeProperties - * @param limit - * @param start - * @param orderHints - * @param propertyPaths - * @return - * @see eu.etaxonomy.cdm.api.service.IService#list(eu.etaxonomy.cdm.model.common.ICdmBase, java.util.Set, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List) - */ - @Override - public List list(Collection example, Set includeProperties, Integer limit, Integer start, List orderHints, List propertyPaths) { - return defaultCollectionService.list(example, includeProperties, limit, start, orderHints, propertyPaths); - } - - /** - * @param clazz - * @param matchStrategy - * @param mergeStrategy - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#deduplicate(java.lang.Class, eu.etaxonomy.cdm.strategy.match.IMatchStrategy, eu.etaxonomy.cdm.strategy.merge.IMergeStrategy) - */ - @Override - public int deduplicate(Class clazz, IMatchStrategy matchStrategy, IMergeStrategy mergeStrategy) { - return defaultCollectionService.deduplicate(clazz, matchStrategy, mergeStrategy); - } - - /** - * @param clazz - * @param queryString - * @param pageSize - * @param pageNumber - * @param orderHints - * @param matchMode - * @return - * @see eu.etaxonomy.cdm.api.service.IIdentifiableEntityService#findTitleCache(java.lang.Class, java.lang.String, java.lang.Integer, java.lang.Integer, java.util.List, eu.etaxonomy.cdm.persistence.query.MatchMode) - */ - @Override - public Pager findTitleCache(Class clazz, String queryString, Integer pageSize, Integer pageNumber, List orderHints, MatchMode matchMode) { - return defaultCollectionService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); - } - - - -} diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF index 2022cdfa6..af3b874a7 100644 --- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Export-Package: eu.etaxonomy.taxeditor.editor, eu.etaxonomy.taxeditor.editor.internal, eu.etaxonomy.taxeditor.editor.name, eu.etaxonomy.taxeditor.editor.name.handler, + eu.etaxonomy.taxeditor.editor.view.dataimport, eu.etaxonomy.taxeditor.editor.view.descriptive, eu.etaxonomy.taxeditor.editor.view.media, eu.etaxonomy.taxeditor.editor.view.uses diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml index 70cb65697..bcd7eb865 100644 --- a/eu.etaxonomy.taxeditor.editor/plugin.xml +++ b/eu.etaxonomy.taxeditor.editor/plugin.xml @@ -65,6 +65,12 @@ id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView" name="Derivate View"> + + @@ -572,6 +578,14 @@ + + + + @@ -1097,6 +1111,11 @@ id="eu.etaxonomy.taxeditor.editor.handler.openDerivateView" name="Open Derivate View"> + + @@ -1275,4 +1294,16 @@ name="Taxonomic Editor Default Key Bindings"> + + + + Query BioCaseProvider + + + diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java new file mode 100644 index 000000000..5d59593a0 --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditor.java @@ -0,0 +1,218 @@ +// $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. +*/ +package eu.etaxonomy.taxeditor.editor.view.dataimport; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jface.action.MenuManager; +import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.swt.SWT; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableItem; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.IMemento; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.part.EditorPart; + +import eu.etaxonomy.cdm.api.conversation.ConversationHolder; +import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; +import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; +import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; +import eu.etaxonomy.taxeditor.model.IContextListener; +import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; +import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; +import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData; +import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData; +import eu.etaxonomy.taxeditor.store.CdmStore; + +/** + * Editor which shows a list of "data" that can be imported into the CDM + * @author pplitzner + * @date 20.09.2013 + * + */ +public abstract class DataImportEditor extends EditorPart implements IPartContentHasFactualData, IDirtyMarkableSelectionProvider, +IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IContextListener{ + + private ConversationHolder conversation; + + private TableViewer tableViewer; + + /** + * Constructs a new DataImportEditor with a new {@link ConversationHolder} + */ + public DataImportEditor() { + CdmStore.getContextManager().addContextListener(this); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite) + */ + @Override + public void createPartControl(Composite parent) { + + Table table = new Table(parent, SWT.BORDER | SWT.MULTI | SWT.FULL_SELECTION); + table.setHeaderVisible(true);//TODO: set header title as BioCase query + table.setLinesVisible(true); + tableViewer = new TableViewer(table); + + // Propagate selection from viewer + getSite().setSelectionProvider(tableViewer); + + //create context menu + MenuManager menuManager = new MenuManager(); + getSite().registerContextMenu(menuManager, tableViewer); + Control control = tableViewer.getControl(); + Menu menu = menuManager.createContextMenu(control); + control.setMenu(menu); + + IEditorInput editorInput = getEditorInput(); + if(editorInput instanceof DataImportEditorInput){ + for(T specimen:((DataImportEditorInput) editorInput).getResults()){ + TableItem tableItem = new TableItem(table, SWT.NONE); + tableItem.setText(specimen.generateTitle()); + tableItem.setData(specimen); + } + } + } + + /* (non-Javadoc) + * @see org.eclipse.ui.part.WorkbenchPart#setFocus() + */ + @Override + public void setFocus() { + //make sure to bind again if maybe in another view the conversation was unbound + if(!conversation.isBound()){ + conversation.bind(); + } + } + + + /* (non-Javadoc) + * @see org.eclipse.ui.texteditor.AbstractTextEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput) + */ + @Override + public void init(IEditorSite site, IEditorInput input) throws PartInitException { + setSite(site); + setInput(input); + setPartName(input.getName()); + setTitleToolTip(input.getName()); + conversation = ((DataImportEditorInput)input).getConversationHolder(); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor#dispose() + */ + @Override + public void dispose() { + super.dispose(); + CdmStore.getContextManager().removeContextListener(this); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.model.IContextListener#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) { + //nothing + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void contextStop(IMemento memento, IProgressMonitor monitor) { + //nothing + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.model.IContextListener#contextStart(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void contextStart(IMemento memento, IProgressMonitor monitor) { + //nothing + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.model.IContextListener#contextRefresh(org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void contextRefresh(IProgressMonitor monitor) { + setInput(getEditorInput()); + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.model.IContextListener#workbenchShutdown(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) { + if(conversation!=null &&!conversation.isClosed()) { + conversation.close(); + } + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap) + */ + @Override + public void update(CdmDataChangeMap changeEvents) { + //nothing + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder() + */ + @Override + public ConversationHolder getConversationHolder() { + return conversation; + } + + /* (non-Javadoc) + * @see eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider#changed(java.lang.Object) + */ + @Override + public void changed(Object element) { + // cannot be changed + } + + /* (non-Javadoc) + * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor) + */ + @Override + public void doSave(IProgressMonitor monitor) { + } + + /* (non-Javadoc) + * @see org.eclipse.ui.part.EditorPart#doSaveAs() + */ + @Override + public void doSaveAs() { + } + + /* (non-Javadoc) + * @see org.eclipse.ui.part.EditorPart#isDirty() + */ + @Override + public boolean isDirty() { + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed() + */ + @Override + public boolean isSaveAsAllowed() { + return false; + } + +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorInput.java new file mode 100644 index 000000000..7af46418e --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/DataImportEditorInput.java @@ -0,0 +1,104 @@ +// $Id$ +/** +* Copyright (C) 2014 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; + +import java.util.Collection; + +import org.apache.log4j.Logger; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IPersistableElement; + +import eu.etaxonomy.cdm.api.conversation.ConversationHolder; +import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; +import eu.etaxonomy.taxeditor.store.CdmStore; + +/** + * @author pplitzner + * @date 25.02.2014 + * + */ +public abstract class DataImportEditorInput implements IEditorInput { + + private static Logger logger = Logger.getLogger(DataImportEditorInput.class); + + private Collection results; + + private final ConversationHolder conversationHolder; + + /** + * @param results + */ + public DataImportEditorInput() { + this.conversationHolder = CdmStore.createConversation(); + } + + + /* (non-Javadoc) + * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) + */ + @Override + public Object getAdapter(Class adapter) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IEditorInput#exists() + */ + @Override + public boolean exists() { + return false; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IEditorInput#getImageDescriptor() + */ + @Override + public ImageDescriptor getImageDescriptor() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IEditorInput#getPersistable() + */ + @Override + public IPersistableElement getPersistable() { + return null; + } + + /** + * @return the results + */ + public Collection getResults() { + return results; + } + + /** + * @param results the results to set + */ + public void setResults(Collection results) { + this.results = results; + } + + /** + * @return the conversationHolder + */ + public ConversationHolder getConversationHolder() { + return conversationHolder; + } + + @Override + public abstract int hashCode(); + + @Override + public abstract boolean equals(Object obj); +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SaveSpecimenCommand.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SaveSpecimenCommand.java new file mode 100644 index 000000000..1b4ab0f7b --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SaveSpecimenCommand.java @@ -0,0 +1,42 @@ +package eu.etaxonomy.taxeditor.editor.view.dataimport; + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; + +import eu.etaxonomy.cdm.api.service.IOccurrenceService; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.store.CdmStore; + + +public class SaveSpecimenCommand extends AbstractHandler { + + /* (non-Javadoc) + * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent) + */ + @Override + public Object execute(ExecutionEvent event) throws ExecutionException { + final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + final ISelection selection = window.getActivePage().getSelection(); + if(selection instanceof StructuredSelection){ + StructuredSelection structuredSelection = (StructuredSelection)selection; + Object firstElement = structuredSelection.getFirstElement(); + if(firstElement instanceof SpecimenOrObservationBase){ + IWorkbenchPart activePart = AbstractUtility.getActivePart(); + if(activePart instanceof DataImportEditor){ + DataImportEditor dataImportEditor = (DataImportEditor)activePart; + CdmStore.getService(IOccurrenceService.class).saveOrUpdate((SpecimenOrObservationBase) firstElement); + dataImportEditor.getConversationHolder().commit(true); + } + } + } + return null; + } + +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditor.java new file mode 100644 index 000000000..146b59b2e --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditor.java @@ -0,0 +1,29 @@ +// $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. +*/ +package eu.etaxonomy.taxeditor.editor.view.dataimport; + +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; + +/** + * @author pplitzner + * @date 20.09.2013 + * + */ +public class SpecimenImportEditor extends DataImportEditor { + + public static final String ID = "eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor"; + + /** + * + */ + public SpecimenImportEditor() { + super(); + } +} diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditorInput.java new file mode 100644 index 000000000..dda21c069 --- /dev/null +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenImportEditorInput.java @@ -0,0 +1,149 @@ +// $Id$ +/** +* Copyright (C) 2014 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; + +import java.util.ArrayList; +import java.util.Collection; + +import org.eclipse.swt.widgets.Display; + +import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; +import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery; +import eu.etaxonomy.cdm.model.location.NamedArea; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; +import eu.etaxonomy.taxeditor.store.CdmStore; + +/** + * @author pplitzner + * @date 25.02.2014 + * + */ +public class SpecimenImportEditorInput extends DataImportEditorInput { + + private final BioCaseQuery query; + + /** + * @param results + */ + public SpecimenImportEditorInput(BioCaseQuery query) { + super(); + this.query = query; + } + + public void query(){ + String errorMessage = "Could not execute query " + SpecimenImportEditorInput.this.query; + + Collection results = new ArrayList(); + DerivedUnitFacade unit1 = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.PreservedSpecimen); +// newInstance.setTitleCache("Test Specimen", true); + unit1.setCollectingMethod("Collected from the ground"); + unit1.setAccessionNumber("ACC-12345"); + unit1.setLocality("locality"); + unit1.setCountry(NamedArea.EUROPE()); + + DerivedUnitFacade unit2 = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.PreservedSpecimen); + unit2.setTitleCache("Test Specimen 2", false); + unit2.setCollectingMethod("Collected from the ground"); + unit2.setAccessionNumber("ACC-67890"); + unit2.setLocality("solid ground close to car park"); + unit2.setCountry(NamedArea.ASIA_TEMPERATE()); + + DerivedUnitFacade unit3 = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.PreservedSpecimen); + unit3.setTitleCache("Test Specimen 3", false); + unit3.setCollectingMethod("Collected from the air"); + unit3.setAccessionNumber("ACC-999"); + unit3.setLocality("thin air"); + unit3.setCountry(NamedArea.SOUTHERNOCEAN()); + + results.add(unit1.innerDerivedUnit()); + results.add(unit2.innerDerivedUnit()); + results.add(unit3.innerDerivedUnit()); + results.add(unit1.innerDerivedUnit()); + setResults(results); +// try { +// InputStream resultStream = new BioCaseQueryServiceWrapper().query(DataImportEditorInput.this.query); +// Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(resultStream, null, false); +// TransientCdmRepository repo = +// new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration()); +// configurator.setCdmAppController(repo); +// +// CdmDefaultImport importer = new CdmDefaultImport(); +// importer.invoke(configurator); +// results = repo.getUnits(); +// } catch (ClientProtocolException e) { +// logger.error(errorMessage, e); +// } catch (IOException e) { +// logger.error(errorMessage, e); +// } catch (URISyntaxException e) { +// logger.error(errorMessage, e); +// } + + Display.getDefault().asyncExec(new Runnable() { + + @Override + public void run() { + CdmStore.getContextManager().notifyContextRefresh(); + } + }); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IEditorInput#getName() + */ + @Override + public String getName() { + return query.toString(); + } + + /* (non-Javadoc) + * @see org.eclipse.ui.IEditorInput#getToolTipText() + */ + @Override + public String getToolTipText() { + return query.toString(); + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((query == null) ? 0 : query.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + SpecimenImportEditorInput other = (SpecimenImportEditorInput) obj; + if (query == null) { + if (other.query != null) { + return false; + } + } else if (!query.equals(other.query)) { + return false; + } + return true; + } +} diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizard.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizard.java similarity index 90% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizard.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizard.java index 6f42181e2..47e802d4f 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizard.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizard.java @@ -7,7 +7,7 @@ * 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.dataimport.wizard; +package eu.etaxonomy.taxeditor.editor.view.dataimport; import org.apache.log4j.Logger; import org.eclipse.core.runtime.IProgressMonitor; @@ -23,8 +23,6 @@ import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery; -import eu.etaxonomy.taxeditor.dataimport.DataImportEditor; -import eu.etaxonomy.taxeditor.dataimport.DerivedUnitEditorInput; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -60,7 +58,7 @@ public class SpecimenSearchWizard extends Wizard implements IImportWizard { final IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); query = searchPage.getQuery(); - final DerivedUnitEditorInput input = new DerivedUnitEditorInput(query); + final SpecimenImportEditorInput input = new SpecimenImportEditorInput(query); Job queryJob = new Job("Query Biocase") { @Override @@ -71,7 +69,7 @@ public class SpecimenSearchWizard extends Wizard implements IImportWizard { }; queryJob.schedule(); try { - page.openEditor(input, DataImportEditor.ID, true); + page.openEditor(input, SpecimenImportEditor.ID, true); } catch ( PartInitException e ) { //Put your exception handler here if you wish to } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizardPage.java similarity index 97% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizardPage.java index cc534bf5b..73ffb24ea 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/wizard/SpecimenSearchWizardPage.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizardPage.java @@ -7,7 +7,7 @@ * 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.dataimport.wizard; +package eu.etaxonomy.taxeditor.editor.view.dataimport; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.widgets.Composite; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientAgentService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientAgentService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java index 42396edbd..d31151130 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientAgentService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.util.Collection; import java.util.List; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java similarity index 86% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java index 79e09f832..aa9a2c03c 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientCdmRepository.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.util.Collection; @@ -139,7 +139,8 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { */ @Override public ICollectionService getCollectionService() { - return new TransientCollectionService(defaultApplicationConfiguration.getCollectionService()); + return defaultApplicationConfiguration.getCollectionService(); +// return new TransientCollectionService(defaultApplicationConfiguration.getCollectionService()); } /** @@ -149,6 +150,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public ICommonService getCommonService() { return defaultApplicationConfiguration.getCommonService(); +// return new TransientCommonService(defaultApplicationConfiguration.getCommonService()); } /** @@ -158,6 +160,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IDatabaseService getDatabaseService() { return defaultApplicationConfiguration.getDatabaseService(); +// return new TransientDatabaseService(defaultApplicationConfiguration.getDatabaseService()); } /** @@ -176,6 +179,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IFeatureNodeService getFeatureNodeService() { return defaultApplicationConfiguration.getFeatureNodeService(); +// return new TransientFeatureNodeService(defaultApplicationConfiguration.getFeatureNodeService()); } /** @@ -185,6 +189,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IFeatureTreeService getFeatureTreeService() { return defaultApplicationConfiguration.getFeatureTreeService(); +// return new TransientFeatureTreeService(defaultApplicationConfiguration.getFeatureTreeService()); } /** @@ -194,6 +199,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IGrantedAuthorityService getGrantedAuthorityService() { return defaultApplicationConfiguration.getGrantedAuthorityService(); +// return new TransientGrantedAuthorityService(defaultApplicationConfiguration.getGrantedAuthorityService()); } /** @@ -203,6 +209,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IGroupService getGroupService() { return defaultApplicationConfiguration.getGroupService(); +// return new TransientGroupService(defaultApplicationConfiguration.getGroupService()); } /** @@ -212,6 +219,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IIdentificationKeyService getIdentificationKeyService() { return defaultApplicationConfiguration.getIdentificationKeyService(); +// return new TransientIdentificationService(defaultApplicationConfiguration.getIdentificationKeyService()); } /** @@ -221,6 +229,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public ILocationService getLocationService() { return defaultApplicationConfiguration.getLocationService(); +// return new TransientLocationService(defaultApplicationConfiguration.getLocationService()); } /** @@ -230,6 +239,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IService getMainService() { return defaultApplicationConfiguration.getMainService(); +// return new TransientMainService(defaultApplicationConfiguration.getMainService()); } /** @@ -239,6 +249,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IMediaService getMediaService() { return defaultApplicationConfiguration.getMediaService(); +// return new TransientMediaService(defaultApplicationConfiguration.getMediaService()); } /** @@ -278,6 +289,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IPolytomousKeyNodeService getPolytomousKeyNodeService() { return defaultApplicationConfiguration.getPolytomousKeyNodeService(); +// return new TransientPolytomousKeyNodeService(defaultApplicationConfiguration.getPolytomousKeyNodeService()); } /** @@ -287,6 +299,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IPolytomousKeyService getPolytomousKeyService() { return defaultApplicationConfiguration.getPolytomousKeyService(); +// return new TransientPolytomousKeyService(defaultApplicationConfiguration.getPolytomousKeyService()); } /** @@ -305,6 +318,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public ITaxonNodeService getTaxonNodeService() { return defaultApplicationConfiguration.getTaxonNodeService(); +// return new TransientTaxonNodeService(defaultApplicationConfiguration.getTaxonNodeService()); } /** @@ -341,6 +355,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IUserService getUserService() { return defaultApplicationConfiguration.getUserService(); +// return new TransientUserService(defaultApplicationConfiguration.getUserService()); } /** @@ -350,6 +365,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IVocabularyService getVocabularyService() { return defaultApplicationConfiguration.getVocabularyService(); +// return new TransientVocabularyService(defaultApplicationConfiguration.getVocabularyService()); } /** @@ -359,6 +375,7 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { @Override public IWorkingSetService getWorkingSetService() { return defaultApplicationConfiguration.getWorkingSetService(); +// return new TransientWorkingSetService(defaultApplicationConfiguration.getWorkingSetService()); } /** @@ -379,7 +396,4 @@ public class TransientCdmRepository implements ICdmApplicationConfiguration { public TransactionStatus startTransaction(Boolean arg0) { return defaultApplicationConfiguration.startTransaction(arg0); } - - - } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientClassificationService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java index 856dc47dc..8666796ee 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientClassificationService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.util.Collection; import java.util.List; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java index 2f3598884..aa0ba7293 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientDescriptionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.util.Collection; import java.util.List; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientNameService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java index 13f889cc4..0ff84199d 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientNameService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.io.IOException; import java.util.Collection; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java index 3296365f8..f41d619f3 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.io.IOException; import java.util.Collection; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientReferenceService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientReferenceService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java index c38e0f42e..72571f0bf 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientReferenceService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.util.Collection; import java.util.List; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java index b78da64c1..e4868aebc 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.io.IOException; import java.util.Collection; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTermService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java similarity index 99% rename from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTermService.java rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java index d8b1269ba..2230035d2 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTermService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java @@ -7,7 +7,7 @@ * 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.dataimport.transientServices; +package eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices; import java.net.URI; import java.util.Collection; -- 2.34.1