Project

General

Profile

« Previous | Next » 

Revision 531fc7bc

Added by Andreas Müller almost 8 years ago

Remove generics from Reference in cdmlib (except for cdmlib-model) #5830

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java
432 432
                    citationDetail+=", "+citationURL;
433 433
                }
434 434

  
435
                Reference<?> reference;
435
                Reference reference;
436 436
                if(strReference.equals(state.getRef().getTitleCache())){
437 437
                    reference = state.getRef();
438 438
                }
......
701 701
    //  * it does not make sense to search for existing sources and then clone them
702 702
    //    we need to search for existing references instead and use them (if exist)
703 703
    //    for our new source.
704
    private IdentifiableSource getIdentifiableSource(Reference<?> reference, String citationDetail) {
704
    private IdentifiableSource getIdentifiableSource(Reference reference, String citationDetail) {
705 705

  
706 706
        List<IdentifiableSource> issTmp = getCommonService().list(IdentifiableSource.class, null, null, null, null);
707 707

  
......
734 734
    //     * @param citationDetail
735 735
    //     * @return
736 736
    //     */
737
    //    private DescriptionElementSource getDescriptionSource(Reference<?> reference, String citationDetail) {
737
    //    private DescriptionElementSource getDescriptionSource(Reference reference, String citationDetail) {
738 738
    //
739 739
    //        List<OriginalSourceBase> issTmp2 = getCommonService().list(DescriptionElementSource.class, null, null, null, null);
740 740
    //
......
1055 1055
            String citationURL = fullReference[2];
1056 1056

  
1057 1057
            if (isNotBlank(strReference)){
1058
                Reference<?> reference = null;
1059
                for (Reference<?> refe: references) {
1058
                Reference reference = null;
1059
                for (Reference refe: references) {
1060 1060
                    if (refe.getTitleCache().equalsIgnoreCase(strReference)) {
1061 1061
                        reference =refe;
1062 1062
                        break;
......
1248 1248
            if(sourceNotLinkedToElement(state.getDerivedUnitBase(), state.getRef(),null)) {
1249 1249
                state.getDerivedUnitBase().addSource(OriginalSourceType.Import,null, null, state.getRef(), null);
1250 1250
            }
1251
            for (Reference<?> citation : determinationEvent.getReferences()) {
1251
            for (Reference citation : determinationEvent.getReferences()) {
1252 1252
                if(sourceNotLinkedToElement(indAssociation,citation,null))
1253 1253
                {
1254 1254
                    indAssociation.addSource(DescriptionElementSource.NewInstance(OriginalSourceType.Import, null, null, citation, null));
......
1273 1273
     * @param object
1274 1274
     * @return
1275 1275
     */
1276
    private boolean sourceNotLinkedToElement(DerivedUnit derivedUnitBase2, Reference<?> b, String d) {
1276
    private boolean sourceNotLinkedToElement(DerivedUnit derivedUnitBase2, Reference b, String d) {
1277 1277
        Set<IdentifiableSource> linkedSources = derivedUnitBase2.getSources();
1278 1278
        for (IdentifiableSource is:linkedSources){
1279
            Reference<?> a = is.getCitation();
1279
            Reference a = is.getCitation();
1280 1280
            String c = is.getCitationMicroReference();
1281 1281

  
1282 1282
            boolean refMatch=false;
......
1323 1323
    private boolean sourceNotLinkedToElement(SpecimenOrObservationBase<?> specimen, OriginalSourceBase<?> source) {
1324 1324
        Set<IdentifiableSource> linkedSources = specimen.getSources();
1325 1325
        for (IdentifiableSource is:linkedSources){
1326
            Reference<?> a = is.getCitation();
1327
            Reference<?> b = source.getCitation();
1326
            Reference a = is.getCitation();
1327
            Reference b = source.getCitation();
1328 1328
            String c = is.getCitationMicroReference();
1329 1329
            String d = source.getCitationMicroReference();
1330 1330

  
......
1370 1370
     * @param object
1371 1371
     * @return
1372 1372
     */
1373
    private boolean sourceNotLinkedToElement(IndividualsAssociation indAssociation, Reference<?> a, String d) {
1373
    private boolean sourceNotLinkedToElement(IndividualsAssociation indAssociation, Reference a, String d) {
1374 1374
        Set<DescriptionElementSource> linkedSources = indAssociation.getSources();
1375 1375
        for (DescriptionElementSource is:linkedSources){
1376
            Reference<?> b = is.getCitation();
1376
            Reference b = is.getCitation();
1377 1377
            String c = is.getCitationMicroReference();
1378 1378

  
1379 1379
            boolean refMatch=false;
......
1416 1416
     * @param object
1417 1417
     * @return
1418 1418
     */
1419
    private boolean sourceNotLinkedToElement(TaxonDescription taxonDescription, Reference<?> a, String d) {
1419
    private boolean sourceNotLinkedToElement(TaxonDescription taxonDescription, Reference a, String d) {
1420 1420
        Set<IdentifiableSource> linkedSources = taxonDescription.getSources();
1421 1421
        for (IdentifiableSource is:linkedSources){
1422
            Reference<?> b = is.getCitation();
1422
            Reference b = is.getCitation();
1423 1423
            String c = is.getCitationMicroReference();
1424 1424

  
1425 1425
            boolean refMatch=false;
......
1464 1464
    private boolean sourceNotLinkedToElement(IndividualsAssociation indAssociation, OriginalSourceBase<?> source) {
1465 1465
        Set<DescriptionElementSource> linkedSources = indAssociation.getSources();
1466 1466
        for (DescriptionElementSource is:linkedSources){
1467
            Reference<?> a = is.getCitation();
1468
            Reference<?> b = source.getCitation();
1467
            Reference a = is.getCitation();
1468
            Reference b = source.getCitation();
1469 1469
            String c = is.getCitationMicroReference();
1470 1470
            String d = source.getCitationMicroReference();
1471 1471

  
......
1511 1511
    private boolean sourceNotLinkedToElement(TaxonDescription taxonDescription, OriginalSourceBase<?> sour) {
1512 1512
        Set<IdentifiableSource> linkedSources = taxonDescription.getSources();
1513 1513
        for (IdentifiableSource is:linkedSources){
1514
            Reference<?> a = is.getCitation();
1515
            Reference<?> b = sour.getCitation();
1514
            Reference a = is.getCitation();
1515
            Reference b = sour.getCitation();
1516 1516
            String c = is.getCitationMicroReference();
1517 1517
            String d = sour.getCitationMicroReference();
1518 1518

  

Also available in: Unified diff