Revision ddad535f
Added by Patrick Plitzner about 10 years ago
- fix cdmlib version number in .classpath (why does maven not generate this anymore?)
- added "molecular" package to exported packages
- organize imports for new molecular services
| eu.etaxonomy.taxeditor.cdmlib/.classpath | ||
|---|---|---|
| 28 | 28 |
<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/> |
| 29 | 29 |
<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/> |
| 30 | 30 |
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/> |
| 31 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 32 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.1-SNAPSHOT.jar"/>
|
|
| 33 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 34 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.1-SNAPSHOT.jar"/>
|
|
| 35 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 36 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 37 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 38 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 39 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 40 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 41 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 42 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.1-SNAPSHOT.jar"/>
|
|
| 43 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 44 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.1-SNAPSHOT.jar"/>
|
|
| 45 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 46 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.1-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.1-SNAPSHOT-sources.jar"/>
|
|
| 31 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 32 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.2-SNAPSHOT.jar"/>
|
|
| 33 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 34 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.2-SNAPSHOT.jar"/>
|
|
| 35 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 36 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 37 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 38 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 39 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 40 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 41 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 42 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.2-SNAPSHOT.jar"/>
|
|
| 43 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 44 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.2-SNAPSHOT.jar"/>
|
|
| 45 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 46 |
<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.2-SNAPSHOT-sources.jar"/>
|
|
| 47 | 47 |
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/> |
| 48 | 48 |
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/> |
| 49 | 49 |
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/> |
| eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF | ||
|---|---|---|
| 17 | 17 |
eu.etaxonomy.cdm.api.service.exception, |
| 18 | 18 |
eu.etaxonomy.cdm.api.service.lsid, |
| 19 | 19 |
eu.etaxonomy.cdm.api.service.lsid.impl, |
| 20 |
eu.etaxonomy.cdm.api.service.molecular, |
|
| 20 | 21 |
eu.etaxonomy.cdm.api.service.pager, |
| 21 | 22 |
eu.etaxonomy.cdm.api.service.pager.impl, |
| 22 | 23 |
eu.etaxonomy.cdm.api.service.search, |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCdmRepository.java | ||
|---|---|---|
| 18 | 18 |
import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration; |
| 19 | 19 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 20 | 20 |
import eu.etaxonomy.cdm.api.service.IAgentService; |
| 21 |
import eu.etaxonomy.cdm.api.service.IAmplificationService; |
|
| 22 | 21 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
| 23 | 22 |
import eu.etaxonomy.cdm.api.service.ICollectionService; |
| 24 | 23 |
import eu.etaxonomy.cdm.api.service.ICommonService; |
| ... | ... | |
| 35 | 34 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 36 | 35 |
import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService; |
| 37 | 36 |
import eu.etaxonomy.cdm.api.service.IPolytomousKeyService; |
| 38 |
import eu.etaxonomy.cdm.api.service.IPrimerService; |
|
| 39 | 37 |
import eu.etaxonomy.cdm.api.service.IReferenceService; |
| 40 |
import eu.etaxonomy.cdm.api.service.ISequenceService; |
|
| 41 | 38 |
import eu.etaxonomy.cdm.api.service.IService; |
| 42 | 39 |
import eu.etaxonomy.cdm.api.service.ITaxonNodeService; |
| 43 | 40 |
import eu.etaxonomy.cdm.api.service.ITaxonService; |
| ... | ... | |
| 45 | 42 |
import eu.etaxonomy.cdm.api.service.IUserService; |
| 46 | 43 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
| 47 | 44 |
import eu.etaxonomy.cdm.api.service.IWorkingSetService; |
| 45 |
import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService; |
|
| 46 |
import eu.etaxonomy.cdm.api.service.molecular.IPrimerService; |
|
| 47 |
import eu.etaxonomy.cdm.api.service.molecular.ISequenceService; |
|
| 48 | 48 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 49 | 49 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| 50 | 50 |
import eu.etaxonomy.cdm.persistence.hibernate.permission.ICdmPermissionEvaluator; |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java | ||
|---|---|---|
| 56 | 56 |
*/ |
| 57 | 57 |
public class TransientClassificationService implements IClassificationService {
|
| 58 | 58 |
|
| 59 |
private IClassificationService defaultClassificationService; |
|
| 59 |
private final IClassificationService defaultClassificationService;
|
|
| 60 | 60 |
|
| 61 | 61 |
/** |
| 62 | 62 |
* @param defaultClassificationService |
| ... | ... | |
| 597 | 597 |
return defaultClassificationService.countByTitle(configurator); |
| 598 | 598 |
} |
| 599 | 599 |
|
| 600 |
/** |
|
| 601 |
* @param taxon |
|
| 602 |
* @param classification |
|
| 603 |
* @param propertyPaths |
|
| 604 |
* @return |
|
| 605 |
* @see eu.etaxonomy.cdm.api.service.IClassificationService#loadChildNodesOfTaxon(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Classification, java.util.List) |
|
| 606 |
*/ |
|
| 607 |
@Override |
|
| 608 |
public List<TaxonNode> loadChildNodesOfTaxon(Taxon taxon, Classification classification, List<String> propertyPaths) {
|
|
| 609 |
return defaultClassificationService.loadChildNodesOfTaxon(taxon, classification, propertyPaths); |
|
| 610 |
} |
|
| 611 |
|
|
| 612 | 600 |
/** |
| 613 | 601 |
* @param transientObject |
| 614 | 602 |
* @return |
| ... | ... | |
| 917 | 905 |
return defaultClassificationService.findTitleCache(clazz, queryString, pageSize, pageNumber, orderHints, matchMode); |
| 918 | 906 |
} |
| 919 | 907 |
|
| 908 |
/* (non-Javadoc) |
|
| 909 |
* @see eu.etaxonomy.cdm.api.service.IClassificationService#listChildNodesOfTaxon(java.util.UUID, java.util.UUID, java.lang.Integer, java.lang.Integer, java.util.List) |
|
| 910 |
*/ |
|
| 911 |
@Override |
|
| 912 |
public List<TaxonNode> listChildNodesOfTaxon(UUID taxonUuid, UUID classificationUuid, Integer pageSize, |
|
| 913 |
Integer pageIndex, List<String> propertyPaths) {
|
|
| 914 |
return defaultClassificationService.listChildNodesOfTaxon(taxonUuid, classificationUuid, pageSize, pageIndex, propertyPaths); |
|
| 915 |
} |
|
| 916 |
|
|
| 920 | 917 |
|
| 921 | 918 |
|
| 922 | 919 |
} |
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java | ||
|---|---|---|
| 15 | 15 |
import org.eclipse.jface.viewers.ViewerDropAdapter; |
| 16 | 16 |
import org.eclipse.swt.dnd.TransferData; |
| 17 | 17 |
|
| 18 |
import eu.etaxonomy.cdm.api.service.IAmplificationService; |
|
| 19 | 18 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 20 |
import eu.etaxonomy.cdm.api.service.ISequenceService; |
|
| 19 |
import eu.etaxonomy.cdm.api.service.molecular.IAmplificationService; |
|
| 20 |
import eu.etaxonomy.cdm.api.service.molecular.ISequenceService; |
|
| 21 | 21 |
import eu.etaxonomy.cdm.model.molecular.Amplification; |
| 22 | 22 |
import eu.etaxonomy.cdm.model.molecular.DnaSample; |
| 23 | 23 |
import eu.etaxonomy.cdm.model.molecular.Sequence; |
Also available in: Unified diff