From 298cf041de66749b250f4114cb96aa4594b481ef Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Wed, 30 Mar 2016 10:44:40 +0200 Subject: [PATCH] fix jenkins --- .../view/dataimport/BioCaseEditorInput.java | 9 ++- .../DataImportEditorContextMenu.java | 11 ++- .../view/dataimport/SpecimenImportView.java | 17 +++-- .../view/dataimport/SpecimenSearchWizard.java | 69 +++++++++++-------- 4 files changed, 56 insertions(+), 50 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java index 60d1302cb..17b425154 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.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.editor.view.dataimport; +package eu.etaxonomy.taxeditor.view.dataimport; import java.io.IOException; import java.io.InputStream; @@ -23,7 +23,6 @@ import eu.etaxonomy.cdm.ext.occurrence.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.editor.view.dataimport.transientServices.TransientCdmRepository; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -57,13 +56,13 @@ public class BioCaseEditorInput extends DataImportEditorInput importer = new CdmDefaultImport(); importer.invoke(configurator); - results = repo.getUnits(); + // results = repo.getUnits(); setResults(results); } catch (ClientProtocolException e) { logger.error(errorMessage, e); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorContextMenu.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorContextMenu.java index 4c2735fc5..7bd1765a6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorContextMenu.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/DataImportEditorContextMenu.java @@ -1,4 +1,4 @@ -package eu.etaxonomy.taxeditor.editor.view.dataimport; +package eu.etaxonomy.taxeditor.view.dataimport; import java.io.IOException; @@ -19,7 +19,6 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.CompoundContributionItem; @@ -30,7 +29,6 @@ import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifDataSetProtocol; import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifQueryServiceWrapper; import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -92,7 +90,7 @@ public class DataImportEditorContextMenu extends CompoundContributionItem { try{ DataSetResponse response = new GbifQueryServiceWrapper().queryOriginalDataSet(gbifResponse); final BioCaseEditorInput input = new BioCaseEditorInput(new OccurenceQuery(response.getUnitId()), response.getEndpoint()); - EditorUtil.open(input); + // EditorUtil.open(input); Job queryJob = new Job("Querying for original record...") { @Override @@ -106,9 +104,10 @@ public class DataImportEditorContextMenu extends CompoundContributionItem { logger.error("Query for single record failed.", e); } catch (IOException e) { logger.error("Query for single record failed.", e); - } catch (PartInitException e) { - logger.error("Could not open editor.", e); } +// } catch (PartInitException e) { +// logger.error("Could not open editor.", e); +// } } }); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java index 298b1f4b6..1c16a6fc5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenImportView.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.editor.view.dataimport; +package eu.etaxonomy.taxeditor.view.dataimport; import java.io.IOException; import java.io.InputStream; @@ -23,7 +23,6 @@ import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE; import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; -import eu.etaxonomy.taxeditor.editor.view.dataimport.transientServices.TransientCdmRepository; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -33,7 +32,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore; */ public class SpecimenImportView extends DataImportView> { - public static final String ID = "eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportView"; //$NON-NLS-1$ + public static final String ID = "eu.etaxonomy.taxeditor.view.dataimport.SpecimenImportView"; //$NON-NLS-1$ private URI endPoint; @@ -48,7 +47,7 @@ public class SpecimenImportView extends DataImportView item) { @@ -56,7 +55,7 @@ public class SpecimenImportView extends DataImportView importer = new CdmDefaultImport(); importer.invoke(configurator); } - results = repo.getUnits(); + // results = repo.getUnits(); setResults(results); } catch (ClientProtocolException e) { logger.error(errorMessage, e); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java index 239700c74..1e91d6c5e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/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.editor.view.dataimport; +package eu.etaxonomy.taxeditor.view.dataimport; import org.apache.log4j.Logger; import org.eclipse.core.runtime.IProgressMonitor; @@ -19,11 +19,10 @@ import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; +import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery; -import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin; +import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -61,35 +60,45 @@ public class SpecimenSearchWizard extends Wizard implements IImportWizard { DataImportView dataImportView = null; query = searchPage.getQuery(); - try { - switch (providerSelectionPage.getQueryType()) { - case BIOCASE: - SpecimenImportView specimenImportView = (SpecimenImportView) TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView(SpecimenImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE); - specimenImportView.setEndpoint(providerSelectionPage.getEndPoint()); - dataImportView = specimenImportView; - break; - case GBIF: - dataImportView = (GbifResponseImportView) TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage() - .showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE); - break; - } - } catch ( PartInitException e ) { - logger.error("Could not open import view for query: " + query.toString(), e); + Abcd206ImportConfigurator configurator = CdmStore.getImportManager().AbcdConfigurator(); + configurator.setOccurenceQuery(query); + configurator.setSourceUri(providerSelectionPage.getEndPoint()); + configurator.setDbSchemaValidation(DbSchemaValidation.CREATE); + if(CdmStore.getCurrentSessionManager().isRemoting()) { + //Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM); + //CdmStore.getImportManager().run(job); + + CdmStore.getImportManager().run(configurator); } - if(dataImportView!=null){ - dataImportView.setQuery(query); -// dataImportView.query(); -// Display.getDefault().asyncExec(new Runnable() { -// -// @Override -// public void run() { -// CdmStore.getContextManager().notifyContextRefresh(); -// } -// }); +// try { +// switch (providerSelectionPage.getQueryType()) { +// case BIOCASE: +// SpecimenImportView specimenImportView = (SpecimenImportView) TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage() +// .showView(SpecimenImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE); +// specimenImportView.setEndpoint(providerSelectionPage.getEndPoint()); +// dataImportView = specimenImportView; +// break; +// case GBIF: +// dataImportView = (GbifResponseImportView) TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage() +// .showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE); +// break; +// } +// } catch ( PartInitException e ) { +// logger.error("Could not open import view for query: " + query.toString(), e); +// } +// if(dataImportView!=null){ +// dataImportView.setQuery(query); +//// dataImportView.query(); +//// Display.getDefault().asyncExec(new Runnable() { +//// +//// @Override +//// public void run() { +//// CdmStore.getContextManager().notifyContextRefresh(); +//// } +//// }); Job queryJob = new QueryJob("Query specimen provider", dataImportView); queryJob.schedule(); - } + return true; } -- 2.34.1