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/GbifImportEditor.java -text
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditorInput.java -text
-eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryOriginalRecordCommand.java -text
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryType.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/SpecimenProviderSelectionWizardPage.java -text
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/SpecimenSearchWizard.java -text
</menuContribution>
<menuContribution
locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.SpecimenImportEditor">
- <command
- commandId="eu.etaxonomy.taxeditor.editor.view.dataimport.SaveSpecimenCommand"
- label="Save Specimen"
- style="push">
- </command>
+ <dynamic
+ class="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu"
+ id="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu">
+ </dynamic>
</menuContribution>
<menuContribution
locationURI="popup:eu.etaxonomy.taxeditor.editor.view.dataimport.GbifImportEditor">
- <command
- commandId="eu.etaxonomy.taxeditor.editor.view.dataimport.SaveSpecimenCommand"
- label="Save Specimen"
- style="push">
- </command>
- <command
- commandId="eu.etaxonomy.taxeditor.editor.view.dataimport.QueryOriginalRecordCommand"
- label="Query original data record"
- style="push">
- </command>
+ <dynamic
+ class="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu"
+ id="eu.etaxonomy.taxeditor.editor.view.dataimport.DataImportEditorContextMenu">
+ </dynamic>
</menuContribution>
package eu.etaxonomy.taxeditor.editor.view.dataimport;
+import java.io.IOException;
+
+import org.apache.http.client.ClientProtocolException;
+import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.action.ContributionItem;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
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;
+import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
+import eu.etaxonomy.cdm.ext.occurrence.gbif.DataSetResponse;
+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.store.CdmStore;
+
public class DataImportEditorContextMenu extends CompoundContributionItem {
+ private final Logger logger = Logger.getLogger(DataImportEditorContextMenu.class);
+
/* (non-Javadoc)
* @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
*/
final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
final IEditorPart activeEditor = window.getActivePage().getActiveEditor();
final ISelection selection = window.getActivePage().getSelection();
- MenuItem item = new MenuItem(menu, SWT.NONE);
- item.setText("Save Specimen");
- item.addListener(SWT.Selection, new Listener() {
+ if(selection instanceof StructuredSelection){
+ final StructuredSelection structuredSelection = (StructuredSelection)selection;
+
+ //Save Specimen
+ MenuItem saveSpecimenItem = new MenuItem(menu, SWT.NONE);
+ saveSpecimenItem.setText("Save Specimen");
+ saveSpecimenItem.addListener(SWT.Selection, new Listener() {
+
+ @Override
+ public void handleEvent(Event event) {
+ if(structuredSelection.iterator().hasNext()){
+ Object next = structuredSelection.iterator().next();
+ if(next instanceof GbifResponse){
+ //unwrap DerivedUnit from GbifResponse
+ next = ((GbifResponse) next).getDerivedUnitFacade().innerDerivedUnit();
+ }
+ if(next instanceof SpecimenOrObservationBase){
+ if(activeEditor instanceof DataImportEditor){
+ DataImportEditor<?> dataImportEditor = (DataImportEditor<?>)activeEditor;
+ CdmStore.getService(IOccurrenceService.class).saveOrUpdate((SpecimenOrObservationBase<?>) next);
+ dataImportEditor.getConversationHolder().commit(true);
+ System.out.println("commit");
+ }
+ }
+ }
+ }
+ });
+
+ //Query original data provider
+ if(structuredSelection.size()==1
+ && structuredSelection.iterator().next() instanceof GbifResponse
+ && ((GbifResponse)structuredSelection.iterator().next()).getDataSetProtocol()!=null
+ && ((GbifResponse)structuredSelection.iterator().next()).getDataSetProtocol()==GbifDataSetProtocol.BIOCASE){
+ final GbifResponse gbifResponse = (GbifResponse)structuredSelection.iterator().next();
+ MenuItem queryOriginalItem = new MenuItem(menu, SWT.NONE);
+ queryOriginalItem.setText("Query original data provider");
+ queryOriginalItem.addListener(SWT.Selection, new Listener() {
+
+ @Override
+ public void handleEvent(Event event) {
+ try{
+ DataSetResponse response = new GbifQueryServiceWrapper().queryOriginalDataSet(gbifResponse);
+ final BioCaseEditorInput input = new BioCaseEditorInput(new OccurenceQuery(response.getUnitId()), response.getEndpoint());
+ EditorUtil.open(input);
+ Job queryJob = new Job("Querying for original record...") {
- @Override
- public void handleEvent(Event event) {
- System.out.println("listener");
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ input.query();
+ return Status.OK_STATUS;
+ }
+ };
+ queryJob.schedule();
+ } catch (ClientProtocolException e) {
+ 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);
+ }
+ }
+ });
}
- });
- System.out.println(activeEditor);
- System.out.println(selection);
+ }
}
- }
- };
+ }};
return contributionItems;
}
*/
@Override
protected String getTextForTableItem(GbifResponse item) {
- return item.getDerivedUnitFacade().innerDerivedUnit().generateTitle();
+ String text = "";
+ if(item.getDataSetProtocol()!=null){
+ text += "["+item.getDataSetProtocol()+"] ";
+ }
+ text += item.getDerivedUnitFacade().innerDerivedUnit().generateTitle();
+ return text;
}
}
+++ /dev/null
-package eu.etaxonomy.taxeditor.editor.view.dataimport;
-
-import java.io.IOException;
-
-import org.apache.http.client.ClientProtocolException;
-import org.apache.log4j.Logger;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-
-import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
-import eu.etaxonomy.cdm.ext.occurrence.gbif.DataSetResponse;
-import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifQueryServiceWrapper;
-import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-
-public class QueryOriginalRecordCommand extends AbstractHandler {
-
- private final Logger logger = Logger.getLogger(QueryOriginalRecordCommand.class);
-
- /* (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;
- if(structuredSelection.size()==1){
- Object next = structuredSelection.iterator().next();
- if(next instanceof GbifResponse){
- try{
- DataSetResponse response = new GbifQueryServiceWrapper().queryOriginalDataSet((GbifResponse)next);
- final BioCaseEditorInput input = new BioCaseEditorInput(new OccurenceQuery(response.getUnitId()), response.getEndpoint());
- EditorUtil.open(input);
- Job queryJob = new Job("Querying for original record...") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- input.query();
- return Status.OK_STATUS;
- }
- };
- queryJob.schedule();
- } catch (ClientProtocolException e) {
- 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);
- }
- }
- }
- }
- return null;
- }
-
-}
+++ /dev/null
-package eu.etaxonomy.taxeditor.editor.view.dataimport;
-
-import java.util.Iterator;
-
-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;
- Iterator<?> iterator = structuredSelection.iterator();
- while(iterator.hasNext()){
- Object next = iterator.next();
- if(next instanceof SpecimenOrObservationBase){
- IWorkbenchPart activePart = AbstractUtility.getActivePart();
- if(activePart instanceof DataImportEditor){
- DataImportEditor dataImportEditor = (DataImportEditor)activePart;
- CdmStore.getService(IOccurrenceService.class).saveOrUpdate((SpecimenOrObservationBase<?>) next);
- dataImportEditor.getConversationHolder().commit(true);
- }
- }
- }
- }
- return null;
- }
-
-}