- added more information to results

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
index 1126b550fb7fd59bb63598ad8c240328b91e2c2b..9da689de70e7e73a5c931168b1bf59ca10d080f8 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
@@ -25,6 +25,7 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.MarkerType;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.strategy.merge.IMergable;
 import eu.etaxonomy.cdm.strategy.merge.MergeException;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
@@ -270,7 +271,7 @@ public abstract class AbstractBulkEditorInput<T extends ICdmBase> implements IEd
         * @return
         */
        public String getTypeText(Object entity){
-               return entity.getClass().getSimpleName();
+               return ((SpecimenOrObservationBase) entity).getRecordBasis().toString();
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java
index 00929bed4790e35eea3756efb0664f64e21990fd..cf91f381626d1aeaab1544c0190ba22f3e108517 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportEditorLineDisplayStrategy.java
@@ -63,8 +63,7 @@ public class DataImportEditorLineDisplayStrategy implements ILineDisplayStrategy
      */
     @Override
     public String getSupplementalText(Object entity) {
-        // TODO Auto-generated method stub
-        return null;
+        return "";
     }
 
     /* (non-Javadoc)
@@ -90,8 +89,7 @@ public class DataImportEditorLineDisplayStrategy implements ILineDisplayStrategy
      */
     @Override
     public String getHoverText(Object entity) {
-        // TODO Auto-generated method stub
-        return null;
+        return ((SpecimenOrObservationBase)entity).getTitleCache();
     }
 
     /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportSpecimenEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportSpecimenEditorInput.java
index cc64abc47c8833f38b509c3076b99690c8dc79a5..05e2cb1fec253a460a28ce013d22159a42872458 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportSpecimenEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/DataImportSpecimenEditorInput.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.taxeditor.dataimport;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.util.List;
 
@@ -21,6 +22,7 @@ import org.eclipse.ui.IPersistableElement;
 
 import eu.etaxonomy.cdm.ext.biocase.BioCaseQuery;
 import eu.etaxonomy.cdm.ext.biocase.BioCaseQueryServiceWrapper;
+import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206Import;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 
 /**
@@ -98,7 +100,8 @@ public class DataImportSpecimenEditorInput implements IEditorInput {
     public List<SpecimenOrObservationBase> getResults() {
         String errorMessage = "Could not execute query " + query;
         try {
-            return new BioCaseQueryServiceWrapper().query(query);
+            InputStream resultStream = new BioCaseQueryServiceWrapper().query(query);
+            Abcd206Import abcd206Import = new Abcd206Import();
         } catch (ClientProtocolException e) {
             logger.error(errorMessage, e);
         } catch (IOException e) {
@@ -106,7 +109,7 @@ public class DataImportSpecimenEditorInput implements IEditorInput {
         } catch (URISyntaxException e) {
             logger.error(errorMessage, e);
         }
-        return null;
+        return new BioCaseQueryServiceWrapper().dummyData();
     }
 
     /* (non-Javadoc)