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/SpecimenEditorInput.java -text
+eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportSpecimenEditorInput.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
import org.eclipse.ui.texteditor.AbstractDocumentProvider;
import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
-import eu.etaxonomy.taxeditor.dataimport.SpecimenEditorInput;
+import eu.etaxonomy.taxeditor.dataimport.DataImportSpecimenEditorInput;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
if (element instanceof AbstractBulkEditorInput) {
return ((AbstractBulkEditorInput)element).getModel();
}
- else if(element instanceof SpecimenEditorInput){
- return ((SpecimenEditorInput) element).getResults();
+ else if(element instanceof DataImportSpecimenEditorInput){
+ return ((DataImportSpecimenEditorInput) element).getResults();
}
return null;
}
*/
package eu.etaxonomy.taxeditor.dataimport;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorInput;
+
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor;
@Override
protected void initializeEditor() {
super.initializeEditor();
- String editorTitle = "Data Import Editor";
- setPartName(editorTitle);
- setTitleToolTip(editorTitle);
setLineDisplayStrategy(new DataImportEditorLineDisplayStrategy());
}
+ /* (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());
+ }
+
}
--- /dev/null
+// $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.net.URISyntaxException;
+import java.util.List;
+
+import org.apache.http.client.ClientProtocolException;
+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.ext.biocase.BioCaseQuery;
+import eu.etaxonomy.cdm.ext.biocase.BioCaseQueryServiceWrapper;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+
+/**
+ * @author pplitzner
+ * @date 20.09.2013
+ *
+ */
+public class DataImportSpecimenEditorInput implements IEditorInput {
+
+ private static Logger logger = Logger.getLogger(DataImportSpecimenEditorInput.class);
+
+ private List<SpecimenOrObservationBase> results;
+ private BioCaseQuery query;
+
+ /**
+ * @param results
+ */
+ public DataImportSpecimenEditorInput(BioCaseQuery query) {
+ this.query = query;
+ }
+
+ /* (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 List<SpecimenOrObservationBase> getResults() {
+ String errorMessage = "Could not execute query " + query;
+ try {
+ return new BioCaseQueryServiceWrapper().query(query);
+ } catch (ClientProtocolException e) {
+ logger.error(errorMessage, e);
+ } catch (IOException e) {
+ logger.error(errorMessage, e);
+ } catch (URISyntaxException e) {
+ logger.error(errorMessage, e);
+ }
+ return null;
+ }
+
+ /* (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;
+ }
+ DataImportSpecimenEditorInput other = (DataImportSpecimenEditorInput) obj;
+ if (query == null) {
+ if (other.query != null) {
+ return false;
+ }
+ } else if (!query.equals(other.query)) {
+ return false;
+ }
+ if (results == null) {
+ if (other.results != null) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
+++ /dev/null
-// $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.util.List;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-
-/**
- * @author pplitzner
- * @date 20.09.2013
- *
- */
-public class SpecimenEditorInput implements IEditorInput {
-
- private List<SpecimenOrObservationBase> results;
-
- /**
- * @param results
- */
- public SpecimenEditorInput(List<SpecimenOrObservationBase> results) {
- this.results = results;
- }
-
- /* (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() {
- // TODO Auto-generated method stub
- 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 "inputName";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getPersistable()
- */
- @Override
- public IPersistableElement getPersistable() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getToolTipText()
- */
- @Override
- public String getToolTipText() {
- return "tooltip";
- }
-
- /**
- * @return the results
- */
- public List<SpecimenOrObservationBase> getResults() {
- return results;
- }
-
-}
*/
package eu.etaxonomy.taxeditor.dataimport.wizard;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.List;
-
-import org.apache.http.client.ClientProtocolException;
import org.apache.log4j.Logger;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.PlatformUI;
import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery;
-import eu.etaxonomy.cdm.ext.biocase.BioCaseQueryServiceWrapper;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.taxeditor.dataimport.DataImportEditor;
-import eu.etaxonomy.taxeditor.dataimport.SpecimenEditorInput;
+import eu.etaxonomy.taxeditor.dataimport.DataImportSpecimenEditorInput;
/**
* @author pplitzner
*
*/
public class SpecimenSearchWizard extends Wizard implements IImportWizard {
+ @SuppressWarnings("unused")
private static final Logger logger = Logger.getLogger(SpecimenSearchWizard.class);
- private BioCaseQueryServiceWrapper bioCaseQueryServiceWrapper;
private BioCaseQuery query;
- private List<SpecimenOrObservationBase> results;
/**
- *
+ * Creates a new SpecimenSearchWizard
*/
public SpecimenSearchWizard() {
- query = new BioCaseQuery();
- bioCaseQueryServiceWrapper = new BioCaseQueryServiceWrapper();
- this.results = getResults();
+ //default constructor needed for RCP extension points
}
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try {
- SpecimenEditorInput input = new SpecimenEditorInput(results);
+ DataImportSpecimenEditorInput input = new DataImportSpecimenEditorInput(query);
input.getToolTipText();
page.openEditor(input, DataImportEditor.ID, true);
} catch ( PartInitException e ) {
*/
@Override
public void addPages() {
- addPage(new SpecimenSearchWizardPage("Specimen Search", results));
- }
-
- public List<SpecimenOrObservationBase> getResults(){
- try {
- return bioCaseQueryServiceWrapper.query(query);
- } catch (ClientProtocolException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (URISyntaxException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
+ addPage(new SpecimenSearchWizardPage("Specimen Search"));
}
/* (non-Javadoc)
*/
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
+ query = new BioCaseQuery();
}
/**
*/
package eu.etaxonomy.taxeditor.dataimport.wizard;
-import java.util.List;
-
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Composite;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.taxeditor.ui.campanula.specimenSearch.SpecimenSearchController;
/**
*/
public class SpecimenSearchWizardPage extends WizardPage{
- private List<SpecimenOrObservationBase> results;
-
/**
* @param pageName
*/
- protected SpecimenSearchWizardPage(String pageName, List<SpecimenOrObservationBase> results) {
+ protected SpecimenSearchWizardPage(String pageName) {
super(pageName);
- this.results = results;
}
/* (non-Javadoc)
setControl(new SpecimenSearchController(parent).getComposite());
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)
- */
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if(visible==false){
- ((SpecimenSearchWizard) getWizard()).getResults();
- }
- }
}