From 97b8f096d2d679e63ca4274ab0aa6d1a20cff3ed Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Mon, 2 Jun 2014 09:43:18 +0000
Subject: [PATCH]  - moved query class variable to super class
 DataImportEditorInput

---
 .../editor/view/dataimport/BioCaseEditorInput.java    |  3 +--
 .../editor/view/dataimport/DataImportEditorInput.java |  3 +++
 .../editor/view/dataimport/GbifImportEditorInput.java |  4 +---
 .../view/dataimport/QueryOriginalRecordCommand.java   | 11 ++++-------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/BioCaseEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/BioCaseEditorInput.java
index a7ceb09d6..b98f89760 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/BioCaseEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/BioCaseEditorInput.java
@@ -33,8 +33,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class BioCaseEditorInput extends DataImportEditorInput<SpecimenOrObservationBase<?>> {
 
-    private final OccurenceQuery query;
-
     /**
      * @param results
      */
@@ -49,6 +47,7 @@ public class BioCaseEditorInput extends DataImportEditorInput<SpecimenOrObservat
 
         Collection<SpecimenOrObservationBase<?>> results = new ArrayList<SpecimenOrObservationBase<?>>();
         try {
+            //FIXME move ABCD import to cdmlib -> this will also get rid of the transient services
             InputStream resultStream;
             resultStream = new BioCaseQueryServiceWrapper().query(query);
             Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(resultStream, null, 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
index 1d7c52ef3..a74d15d44 100644
--- 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
@@ -17,6 +17,7 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
@@ -32,6 +33,8 @@ public abstract class DataImportEditorInput<T> implements IEditorInput {
 
     private final ConversationHolder conversationHolder;
 
+    protected OccurenceQuery query;
+
     /**
      * @param results
      */
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditorInput.java
index 4b984c091..ed7c89cc0 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/GbifImportEditorInput.java
@@ -26,8 +26,6 @@ import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
  */
 public class GbifImportEditorInput extends DataImportEditorInput<GbifResponse> {
 
-    private final OccurenceQuery query;
-
     /**
      * @param query
      */
@@ -93,7 +91,7 @@ public class GbifImportEditorInput extends DataImportEditorInput<GbifResponse> {
         if (getClass() != obj.getClass()) {
             return false;
         }
-        GbifImportEditorInput other = (GbifImportEditorInput) obj;
+        DataImportEditorInput<GbifResponse> other = (DataImportEditorInput<GbifResponse>) obj;
         if (query == null) {
             if (other.query != null) {
                 return false;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryOriginalRecordCommand.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryOriginalRecordCommand.java
index 75c99dfb6..9580c5cba 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryOriginalRecordCommand.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/QueryOriginalRecordCommand.java
@@ -1,7 +1,5 @@
 package eu.etaxonomy.taxeditor.editor.view.dataimport;
 
-import java.net.URI;
-
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
@@ -10,8 +8,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
-import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
-
 public class QueryOriginalRecordCommand extends AbstractHandler {
 
     /* (non-Javadoc)
@@ -25,9 +21,10 @@ public class QueryOriginalRecordCommand extends AbstractHandler {
             StructuredSelection structuredSelection = (StructuredSelection)selection;
             if(structuredSelection.size()==1){
                 Object next = structuredSelection.iterator().next();
-                if(next instanceof GbifResponse){
-                    URI endPoint = ((GbifResponse) next).getDataSetUri();
-                }
+//                if(next instanceof GbifResponse){
+//                    InputStream inputStream = new GbifQueryServiceWrapper().queryForOriginalRecord((GbifResponse)next);
+//                    BioCaseEditorInput input = new BioCaseEditorInput(query);
+//                }
             }
         }
         return null;
-- 
2.34.1