Project

General

Profile

« Previous | Next » 

Revision 87846336

Added by Katja Luther over 5 years ago

small changes to adapt to library changes

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
963 963

  
964 964
	@Override
965 965
	public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
966
			UUID classificationUuid, List<UUID> excludeTaxa) {
966
			UUID classificationUuid) {
967 967

  
968
		return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, excludeTaxa);
968
		return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid);
969 969
	}
970 970

  
971 971
    /**
......
1025 1025
		return defaultService.getRootNode(arg0);
1026 1026
	}
1027 1027

  
1028
    /**
1029
     * {@inheritDoc}
1030
     */
1031
    @Override
1032
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
1033
            Classification arg0, List<UUID> arg1) {
1034
        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(arg0, arg1);
1035
    }
1028
	@Override
1029
	public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
1030
			Classification classification) {
1031
		return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification);
1036 1032

  
1037
    /**
1038
     * {@inheritDoc}
1039
     */
1040
    @Override
1041
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(UUID arg0,
1042
            List<UUID> arg1, Integer arg2, String arg3) {
1043
        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(arg0, arg1, arg2, arg3);
1044
    }
1033
	}
1045 1034

  
1046
    /**
1047
     * {@inheritDoc}
1048
     */
1049
    @Override
1050
    public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
1051
            Classification arg0, List<UUID> arg1, Integer arg2, String arg3) {
1052
        return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(arg0, arg1, arg2, arg3);
1053
    }
1035
	@Override
1036
	public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
1037
			UUID classificationUuid, Integer limit, String pattern) {
1038
		
1039
		return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classificationUuid, limit, pattern);
1040
	}
1041

  
1042
	@Override
1043
	public List<UuidAndTitleCache<TaxonNode>> getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(
1044
			Classification classification, Integer limit, String pattern) {
1045
		// TODO Auto-generated method stub
1046
		return defaultService.getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification(classification, limit, pattern);
1047
	}
1048

  
1049
   
1054 1050

  
1055 1051

  
1056 1052
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/BioCaseEditorInput.java
55 55
            //FIXME move ABCD import to cdmlib -> this will also get rid of the transient services
56 56
            InputStream resultStream;
57 57
            resultStream = new BioCaseQueryServiceWrapper().query(query, endPoint);
58
            Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(resultStream, null, false);
58
            Abcd206ImportConfigurator configurator = Abcd206ImportConfigurator.NewInstance(endPoint, null, false);
59 59
           /* TransientCdmRepository repo =
60 60
                    new TransientCdmRepository(CdmStore.getCurrentApplicationConfiguration());
61 61
            configurator.setCdmAppController(repo);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/SpecimenSearchWizard.java
36 36
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
37 37
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportReport;
38 38
import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdParseUtility;
39
import eu.etaxonomy.cdm.io.specimen.abcd206.in.SpecimenImportReport;
39 40
import eu.etaxonomy.cdm.io.specimen.abcd206.in.UnitAssociationWrapper;
40

  
41 41
import eu.etaxonomy.taxeditor.store.CdmStore;
42 42

  
43 43
/**
......
90 90
                IWorkbenchPage activePart = window.getActivePage();
91 91
                if (providerSelectionPage.getQueryType().equals(QueryType.BIOCASE)){
92 92
                    stream =((BioCaseQueryServiceWrapper) serviceWrapper).query(query, configurator.getSourceUri());
93
                    Abcd206ImportReport report = new Abcd206ImportReport();
93
                    SpecimenImportReport report = new SpecimenImportReport();
94 94
                    UnitAssociationWrapper unitNodesList = AbcdParseUtility.parseUnitsNodeList(stream, report);
95 95
                    NodeList nodeList = unitNodesList.getAssociatedUnits();
96 96
                    String prefix = unitNodesList.getPrefix();

Also available in: Unified diff