Project

General

Profile

« Previous | Next » 

Revision 1de9921a

Added by Andreas Müller over 8 years ago

Adapt editor to cdmlib API changes

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmTransientEntityCacher.java
310 310
        return new CdmEntityCacheKey(entityClass, id);
311 311
    }
312 312

  
313
    /* (non-Javadoc)
314
     * @see eu.etaxonomy.cdm.model.ICdmCacher#load(eu.etaxonomy.cdm.model.common.CdmBase)
315
     */
316 313
    @Override
317 314
    public CdmBase load(CdmBase cdmEntity) {
318 315
        return load(cdmEntity, true);
319 316
    }
320 317

  
321
    /* (non-Javadoc)
322
     * @see eu.etaxonomy.cdm.model.ICdmCacher#isCachable(eu.etaxonomy.cdm.model.common.CdmBase)
323
     */
324 318
    @Override
325 319
    public boolean isCachable(CdmBase cdmEntity) {
326 320
        return true;
327 321
    }
328 322

  
329
    /* (non-Javadoc)
330
     * @see eu.etaxonomy.cdm.model.ICdmCacher#exists(eu.etaxonomy.cdm.model.common.CdmBase)
331
     */
332 323
    @Override
333 324
    public boolean exists(CdmBase cdmBase) {
334 325
        return exists(generateKey(cdmBase));
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
546 546
     */
547 547
    @Deprecated
548 548
    @Override
549
    public Pager<DescriptionElementBase> getDescriptionElements(DescriptionBase description, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
549
    public <T extends DescriptionElementBase> Pager<T> getDescriptionElements(DescriptionBase description, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
550 550
        return defaultService.getDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths);
551 551
    }
552 552

  
......
626 626
     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageDescriptionElements(eu.etaxonomy.cdm.model.description.DescriptionBase, java.lang.Class, java.util.Set, java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List)
627 627
     */
628 628
    @Override
629
    public Pager<DescriptionElementBase> pageDescriptionElements(DescriptionBase description, Class<? extends DescriptionBase> descriptionType, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
629
    public <T extends DescriptionElementBase> Pager<T> pageDescriptionElements(DescriptionBase description, Class<? extends DescriptionBase> descriptionType, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
630 630
        return defaultService.pageDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths);
631 631
    }
632 632

  
......
701 701
     */
702 702
    @Deprecated
703 703
    @Override
704
    public List<DescriptionElementBase> listDescriptionElements(DescriptionBase description, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
704
    public <T extends DescriptionElementBase> List<T> listDescriptionElements(DescriptionBase description, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
705 705
        return defaultService.listDescriptionElements(description, features, type, pageSize, pageNumber, propertyPaths);
706 706
    }
707 707

  
......
794 794
     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#listDescriptionElements(eu.etaxonomy.cdm.model.description.DescriptionBase, java.lang.Class, java.util.Set, java.lang.Class, java.lang.Integer, java.lang.Integer, java.util.List)
795 795
     */
796 796
    @Override
797
    public List<DescriptionElementBase> listDescriptionElements(DescriptionBase description, Class<? extends DescriptionBase> descriptionType, Set<Feature> features, Class<? extends DescriptionElementBase> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
797
    public <T extends DescriptionElementBase> List<T> listDescriptionElements(DescriptionBase description, Class<? extends DescriptionBase> descriptionType, Set<Feature> features, Class<T> type, Integer pageSize, Integer pageNumber, List<String> propertyPaths) {
798 798
        return defaultService.listDescriptionElements(description, descriptionType, features, type, pageSize, pageNumber, propertyPaths);
799 799
    }
800 800

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
853 853
        return defaultService.isDeletable(object, config);
854 854
    }
855 855

  
856
    /* (non-Javadoc)
857
     * @see eu.etaxonomy.cdm.api.service.ITermService#listByTermType(eu.etaxonomy.cdm.model.common.TermType, java.lang.Integer, java.lang.Integer, java.util.List, java.util.List)
858
     */
859 856
    @Override
860
    public <TERM extends DefinedTermBase> List<TERM> listByTermType(TermType termType, Integer limit, Integer start,
857
    public <T extends DefinedTermBase> List<T> listByTermType(TermType termType, Integer limit, Integer start,
861 858
            List<OrderHint> orderHints, List<String> propertyPaths) {
862 859
        return defaultService.listByTermType(termType, limit, start, orderHints, propertyPaths);
863 860
    }
......
873 870
        return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
874 871
    }
875 872

  
876
    /* (non-Javadoc)
877
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
878
     */
879 873
    @Override
880 874
    public DeleteResult delete(UUID uuid) {
881 875
        return defaultService.delete(uuid);
882 876
    }
883 877

  
884
    /* (non-Javadoc)
885
     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection)
886
     */
887 878
    @Override
888 879
    public DeleteResult delete(Collection<UUID> arg0) {
889 880
        return defaultService.delete(arg0);
890 881
    }
891 882

  
892
    /* (non-Javadoc)
893
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
894
     */
895 883
    @Override
896 884
    public List<DefinedTermBase> merge(List<DefinedTermBase> arg0) {
897 885
        return defaultService.merge(arg0);
898 886
    }
899 887

  
900
    /* (non-Javadoc)
901
     * @see eu.etaxonomy.cdm.api.service.ITermService#delete(java.util.UUID, eu.etaxonomy.cdm.api.service.config.TermDeletionConfigurator)
902
     */
903 888
    @Override
904 889
    public DeleteResult delete(UUID arg0, TermDeletionConfigurator arg1) {
905 890
        return defaultService.delete(arg0, arg1);
906 891
    }
907 892

  
908
    /* (non-Javadoc)
909
     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List, boolean)
910
     */
911 893
    @Override
912 894
    public List<MergeResult<DefinedTermBase>> merge(List<DefinedTermBase> arg0, boolean arg1) {
913 895
        return defaultService.merge(arg0, arg1);
914 896
    }
915 897

  
916
    /* (non-Javadoc)
917
     * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
918
     */
919 898
    @Override
920 899
    public MergeResult<DefinedTermBase> merge(DefinedTermBase arg0, boolean arg1) {
921 900
        return defaultService.merge(arg0, arg1);
922 901
    }
923 902

  
924
    /* (non-Javadoc)
925
     * @see eu.etaxonomy.cdm.api.service.IService#loadWithUpdate(java.util.UUID)
926
     */
927 903
    @Override
928 904
    public DefinedTermBase loadWithUpdate(UUID arg0) {
929 905
        return defaultService.loadWithUpdate(arg0);
......
945 921
        return defaultService.load(arg0, arg1);
946 922
    }
947 923

  
924

  
948 925
}

Also available in: Unified diff