small changes to adapt to library changes

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index 455b0dbb6e0f3a2773f2db3b7ca569fceedbac7b..d8634f4cf510f521ad0d48e0a3d2b98b83fcc404 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@ -963,9 +963,9 @@ public class TransientClassificationService implements IClassificationService {
 
        @Override
        public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
 
        @Override
        public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(

-                       UUID classificationUuid, List<UUID> excludeTaxa) {
+                       UUID classificationUuid) {

 
 

-               return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, excludeTaxa);
+               return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid);

        }
 
     /**
        }
 
     /**


@@ -1025,32 +1025,28 @@ public class TransientClassificationService implements IClassificationService {
                return defaultService.getRootNode(arg0);
        }
 
                return defaultService.getRootNode(arg0);
        }
 

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
-            Classification arg0, List<UUID> arg1) {
-        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(arg0, arg1);
-    }
+       @Override
+       public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
+                       Classification classification) {
+               return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification);

 
 

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(UUID arg0,
-            List<UUID> arg1, Integer arg2, String arg3) {
-        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(arg0, arg1, arg2, arg3);
-    }
+       }

 
 

-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
-            Classification arg0, List<UUID> arg1, Integer arg2, String arg3) {
-        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(arg0, arg1, arg2, arg3);
-    }
+       @Override
+       public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
+                       UUID classificationUuid, Integer limit, String pattern) {
+               
+               return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, limit, pattern);
+       }
+
+       @Override
+       public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
+                       Classification classification, Integer limit, String pattern) {
+               // TODO Auto-generated method stub
+               return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification, limit, pattern);
+       }
+
+   

 
 
 }
 
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java
index 17b425154a014984a8497b7d0dc74230f97683bf..c746c5067ecb97bf16bcf16b15d1761ba860ea6c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java
@@ -55,7 +55,7 @@ public class BioCaseEditorInput extends DataImportEditorInput<SpecimenOrObservat
             //FIXME move ABCD import to cdmlib -> this will also get rid of the transient services
             InputStream resultStream;
             resultStream = new BioCaseQueryServiceWrapper().query(query, endPoint);
             //FIXME move ABCD import to cdmlib -> this will also get rid of the transient services
             InputStream resultStream;
             resultStream = new BioCaseQueryServiceWrapper().query(query, endPoint);

-            Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(resultStream, null, false);
+            Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(endPoint, null, false);

            /* TransientCdmRepository repo =
                     new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration());
             configurator.setCdmAppController(repo);
            /* TransientCdmRepository repo =
                     new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration());
             configurator.setCdmAppController(repo);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
index c41636af1145707a829eb7f42f70b73d4402f3bd..56397ae748549f932e003e0dca165fdf00a0821f 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
@@ -36,8 +36,8 @@ import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportReport;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdParseUtility;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportReport;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdParseUtility;

+import eu.etaxonomy.cdm.io.specimen.abcd206.in.SpecimenImportReport;

 import eu.etaxonomy.cdm.io.specimen.abcd206.in.UnitAssociationWrapper;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.UnitAssociationWrapper;

-

 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**


@@ -90,7 +90,7 @@ public class SpecimenSearchWizard extends Wizard implements IImportWizard {
                 IWorkbenchPage activePart = window.getActivePage();
                 if (providerSelectionPage.getQueryType().equals(QueryType.BIOCASE)){
                     stream =((BioCaseQueryServiceWrapper) serviceWrapper).query(query, configurator.getSourceUri());
                 IWorkbenchPage activePart = window.getActivePage();
                 if (providerSelectionPage.getQueryType().equals(QueryType.BIOCASE)){
                     stream =((BioCaseQueryServiceWrapper) serviceWrapper).query(query, configurator.getSourceUri());

-                    Abcd206ImportReport report = new Abcd206ImportReport();
+                    SpecimenImportReport report = new SpecimenImportReport();

                     UnitAssociationWrapper unitNodesList = AbcdParseUtility.parseUnitsNodeList(stream, report);
                     NodeList nodeList = unitNodesList.getAssociatedUnits();
                     String prefix = unitNodesList.getPrefix();
                     UnitAssociationWrapper unitNodesList = AbcdParseUtility.parseUnitsNodeList(stream, report);
                     NodeList nodeList = unitNodesList.getAssociatedUnits();
                     String prefix = unitNodesList.getPrefix();