<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.5.2.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.3.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.3.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.3.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.3.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.3.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-ext/4.3.0-SNAPSHOT/cdmlib-ext-4.3.0-SNAPSHOT-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.3.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-io/4.3.0-SNAPSHOT/cdmlib-io-4.3.0-SNAPSHOT-sources.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.3.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-model/4.3.0-SNAPSHOT/cdmlib-model-4.3.0-SNAPSHOT-sources.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.3.0-SNAPSHOT.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.3.0-SNAPSHOT.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.3.0-SNAPSHOT.jar"/>\r
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.3.0-SNAPSHOT.jar"/>\r
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.3.0-SNAPSHOT.jar" sourcepath="C:/Users/k.luther/.m2/repository/eu/etaxonomy/cdmlib-services/4.3.0-SNAPSHOT/cdmlib-services-4.3.0-SNAPSHOT-sources.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.3.0-SNAPSHOT.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cglib-3.2.0.jar"/>\r
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-3.2.0.jar"/>\r
getNameViewer().getTextWidget().setFont(defaultFont);
getNameViewer().getDocument().set(getEmptyTextPrompt());
- // placeCursor();
+ placeCursor();
}
/**
AbstractGroupedContainer.this.handleSplitText(text);
}
-
};
getNameViewer().getTextWidget().addVerifyListener(lineBreakListener);
- //getNameViewer().getTextWidget().addKeyListener(lineBreakListener);
+
}
abstract class LabelEllipsisListener extends ControlAdapter {
* @created 19.05.2008
* @version 1.0
*/
+
public abstract class LineBreakListener implements VerifyListener{
+
private static String LINE_BREAK = System.getProperty("line.separator");
@Override
public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
- UUID classificationUuid, List<UUID> excludeTaxa, Integer limit,
+ UUID classificationUuid, Integer limit,
String pattern) {
- return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, excludeTaxa, limit, pattern);
+ return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, limit, pattern);
}
@Override
public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
- Classification classification, List<UUID> excludeTaxa,
+ Classification classification,
Integer limit, String pattern) {
- return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification, excludeTaxa, limit, pattern);
+ return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification, limit, pattern);
}
@Override
if(classification.getReference() == null){
Reference reference = ReferenceFactory.newGeneric();
- reference.setTitleCache(classification.getTitleCache(), true);
+ reference.setTitle(classification.getTitleCache());
classification.setReference(reference);
}
name="%view.name"
restorable="true">
</view>
+ <view
+ allowMultiple="true"
+ class="eu.etaxonomy.taxeditor.view.dataimport.SpecimenImportView"
+ id="eu.etaxonomy.taxeditor.view.dataimport.SpecimenImportView"
+ name="%view.name.7">
+ </view>
+ <view
+ allowMultiple="true"
+ class="eu.etaxonomy.taxeditor.view.dataimport.GbifResponseImportView"
+ id="eu.etaxonomy.taxeditor.view.dataimport.GbifResponseImportView"
+ name="%view.name.8">
+ </view>
<view
name="%view.name.0"
category="org.eclipse.ui"
id="eu.etaxonomy.taxeditor.io.import.tcs"
name="%wizard.name">
</wizard>
+ <wizard
+ category="eu.etaxonomy.taxeditor.import.category.cdm"
+ class="eu.etaxonomy.taxeditor.view.dataimport.SpecimenSearchWizard"
+ id="eu.etaxonomy.taxeditor.view.dataimport.SpecimenSearchWizard"
+ name="%wizard.name.21">
+ <description>
+ %wizard.description
+ </description>
+ </wizard>
+
<!-- <wizard
category="eu.etaxonomy.taxeditor.import.category.cdm"
class="eu.etaxonomy.taxeditor.io.wizard.JaxbImportWizard"
protected ICdmApplicationConfiguration applicationConfiguration;
public static enum TYPE {
- Jaxb, Tcs, Excel_Taxa, Endnote, Sdd, Abcd, SpecimenCdmExcel, Excel_Name, SpecimenSearch
+ Jaxb, Tcs, Excel_Taxa, Endnote, Sdd, Abcd, SpecimenCdmExcel, Excel_Name, SpecimenSearch, Gbif
}
/**
import java.io.File;
import java.io.InputStream;
+import java.net.URI;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import org.apache.commons.io.IOUtils;
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
+import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
import eu.etaxonomy.cdm.io.common.IImportConfigurator;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.common.ImportResult;
+import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
import eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator;
import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator;
return SpecimenCdmExcelImportConfigurator.NewInstance(null, null);
case SpecimenSearch:
return Abcd206ImportConfigurator.NewInstance(null, null);
+ case Gbif:
+ return DwcaImportConfigurator.NewInstance(null, null);
default:
MessagingUtils.notImplementedMessage(this);
throw new IllegalArgumentException("Import not supported yet");
public SpecimenCdmExcelImportConfigurator SpecimenCdmExcelImportConfigurator() {
return (SpecimenCdmExcelImportConfigurator) getConfigurator(TYPE.SpecimenCdmExcel);
}
+
+ public DwcaImportConfigurator DwcaImportConfigurator() {
+ return (DwcaImportConfigurator) getConfigurator(TYPE.Gbif);
+ }
+
/**
* {@inheritDoc}
}
+ public Job createIOServiceJob(final DwcaImportConfigurator configurator) {
+ Assert.isNotNull(configurator, "Configuration may not be null");
+ final Display display = Display.getDefault();
+ Job job = new Job("Import: " + " Dwca") {
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ monitor.beginTask("Importing data", IProgressMonitor.UNKNOWN);
+ IIOService ioService = CdmApplicationState.getIOService();
+
+ ImportResult result = ioService.importDataFromStream(configurator);
+ monitor.done();
+
+ display.asyncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ CdmStore.getContextManager().notifyContextRefresh();
+ }
+ });
+
+ return Status.OK_STATUS;
+ }
+ };
+
+ return job;
+
+ }
+
}
//FIXME prelim
pattern = pattern + "*";
- model = CdmStore.getService(IClassificationService.class).getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(selectedClassification.getUuid(), excludeTaxa, limitOfInitialElements, pattern);
+ model = CdmStore.getService(IClassificationService.class).getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(selectedClassification.getUuid(), limitOfInitialElements, pattern);
}
/** {@inheritDoc} */
ICdmFormElement formElement, int style) {
combo_language = formFactory.createDefinedTermComboElement(TermType.Language, formElement,
- "", null, true, style);
+ "", null, false, style);
combo_language.addSelectionListener(this);
element_Label.setText(selectedRepresentation.getLabel());
element_abbrevLabel.setText(selectedRepresentation.getAbbreviatedLabel());
element_text.setText(selectedRepresentation.getDescription());
-
+
}else {
+
element_Label.setEnabled(false);
element_abbrevLabel.setEnabled(false);
element_text.setEnabled(false);
import eu.etaxonomy.cdm.model.common.Representation;
import eu.etaxonomy.cdm.model.common.TermBase;
+import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.ui.section.vocabulary.TermTranslationWizard;
public TranslatableRepresentationElement(CdmFormFactory formFactory, ICdmFormElement formElement,
Representation representation, TermBase term, Integer textHeight, int style, boolean fill) {
super(formFactory, formElement, representation, term, textHeight, style, fill);
+
}
}
@Override
protected void createRepresentationEditingElements(ICdmFormElement formElement, int style) {
- super.createRepresentationEditingElements(formElement, style);
+ super.createRepresentationEditingElements(formElement, style );
button = formFactory.createButton(getLayoutComposite(),
"Open In Translation Editor", SWT.PUSH);
addControl(button);
text_source = formFactory.createRepresentationElement(element, preferredRepresentation,term, TEXT_HEIGHT, SWT.NULL, true);
text_source.setTerm(term, true);
-
}
/**
*/
private void createRightControls(ICdmFormElement element){
text_target = formFactory.createRepresentationElement(element, null, term, TEXT_HEIGHT, SWT.NULL, false);
+
}
package eu.etaxonomy.taxeditor.view.dataimport;
import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.http.client.ClientProtocolException;
import org.apache.log4j.Logger;
public void handleEvent(Event event) {
try{
DataSetResponse response = new GbifQueryServiceWrapper().queryOriginalDataSet(gbifResponse);
- final BioCaseEditorInput input = new BioCaseEditorInput(new OccurenceQuery(response.getUnitId()), response.getEndpoint());
+ Set<String[]> unitIds = new HashSet<String[]>();
+ String[] tripleId = {response.getUnitId()};
+ unitIds.add(tripleId);
+ final BioCaseEditorInput input = new BioCaseEditorInput(new OccurenceQuery(unitIds), response.getEndpoint());
// EditorUtil.open(input);
Job queryJob = new Job("Querying for original record...") {
package eu.etaxonomy.taxeditor.view.dataimport;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URISyntaxException;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.http.client.ClientProtocolException;
+import org.eclipse.core.runtime.jobs.Job;
+import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
+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.io.common.CdmDefaultImport;
+import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
+import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.taxeditor.store.CdmStore;
/**
* @author pplitzner
public void query() {
String errorMessage = "Could not execute query " + query;
try{
- Collection<GbifResponse> results = new GbifQueryServiceWrapper().query(query);
- setResults(results);
- } catch (ClientProtocolException e) {
- logger.error(errorMessage, e);
- } catch (IOException e) {
- logger.error(errorMessage, e);
- } catch (URISyntaxException e) {
- logger.error(errorMessage, e);
+ //Collection<GbifResponse> results = new GbifQueryServiceWrapper().query(query);
+ //setResults(results);
+
+ // String errorMessage = "Could not execute query " + query;
+
+ // Collection<SpecimenOrObservationBase<?>> results = new ArrayList<SpecimenOrObservationBase<?>>();
+ Collection<GbifResponse> results = new GbifQueryServiceWrapper().query(query);
+
+ setResults(results);
+
+
+//
+ // results = repo.getUnits();
+
+ } catch (ClientProtocolException e) {
+ logger.error(errorMessage, e);
+ } catch (IOException e) {
+ logger.error(errorMessage, e);
+ } catch (URISyntaxException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
- }
+// setResults(results);
+//
+// }
+// } catch (ClientProtocolException e) {
+// logger.error(errorMessage, e);
+// } catch (IOException e) {
+// logger.error(errorMessage, e);
+// } catch (URISyntaxException e) {
+// logger.error(errorMessage, e);
+// }
+
+ // }
}
package eu.etaxonomy.taxeditor.view.dataimport;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.Action;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
import eu.etaxonomy.cdm.api.service.ITermService;
+import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
+import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifDataSetProtocol;
import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
+import eu.etaxonomy.cdm.io.dwca.in.DwcaImportConfigurator;
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
if(activePart instanceof DataImportView<?>){
DataImportView<?> dataImportView = (DataImportView<?>)activePart;
Table table = dataImportView.getTable();
+ Collection<GbifResponse> checkedResults = new HashSet<GbifResponse>();
+ Object data;
+ Set<String[]> unitIds = new HashSet<String[]>();
for(TableItem item:table.getItems()){
if(item.getChecked()){
//Save Specimen
- Object data = item.getData();
- if(data instanceof GbifResponse){
- data = ((GbifResponse) item.getData()).getDerivedUnitFacade().innerFieldUnit();
- }
- if(data instanceof SpecimenOrObservationBase){
- ConversationHolder conversation = dataImportView.getConversationHolder();
- SpecimenOrObservationBase<?> specimen = (SpecimenOrObservationBase<?>) data;
- conversation.bind();
- IOccurrenceService occurrenceService = CdmStore.getService(IOccurrenceService.class);
- for(ICdmBase cdmEntity:occurrenceService.getNonCascadedAssociatedElements(specimen)){
- if(cdmEntity instanceof DefinedTermBase){
- persistTerm((DefinedTermBase<?>) cdmEntity, CdmStore.getService(ITermService.class), conversation);
- }
- else if(cdmEntity instanceof TaxonNameBase){
- //user interaction
- }
- }
- occurrenceService.saveOrUpdate(specimen);
- dataImportView.getConversationHolder().commit(true);
- }
+ data = item.getData();
+ if(data instanceof GbifResponse){
+ checkedResults.add((GbifResponse)item.getData());
+ }
+ }
+ }
+ for (GbifResponse response:checkedResults){
+ if (response != null){
+ System.err.println("response: " + response.getDataSetUri() + " " + response.getDataSetProtocol());
+
+ String[] tripleId = response.getTripleID();
+ unitIds.add(tripleId);
+
+ }
}
+
+ DwcaImportConfigurator configurator = DwcaImportConfigurator.NewInstance(null, null);
+ OccurenceQuery query = new OccurenceQuery(unitIds);
+ configurator.setQuery(query);
+
+ Job job = CdmStore.getImportManager().createIOServiceJob(configurator);
+ CdmStore.getImportManager().run(job);
+
+
}
}
- }
+
private void persistTerm(DefinedTermBase<?> term, ITermService termService, ConversationHolder conversation){
if(term!=null){
try {
dataImportView = (GbifResponseImportView) activePart.showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""), IWorkbenchPage.VIEW_ACTIVATE);
-
+ dataImportView.setQuery(query);
// (GbifResponseImportView) activePart.showView(GbifResponseImportView.ID);getWorkbench().getActiveWorkbenchWindow().getActivePage()
// .showView(GbifResponseImportView.ID, "query_"+query.toString().replaceAll(",", ""),IWorkbenchPage.VIEW_ACTIVATE);
BGBM BDI Projects / taxeditor.git / commitdiff