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/taxonx2013/TaxonXExtractor.java
123 123
         * @param refMods
124 124
         */
125 125
        public void builReference(String mref, String treatmentMainName, NomenclaturalCode nomenclaturalCode,
126
                Taxon acceptedTaxon, Reference<?> refMods) {
126
                Taxon acceptedTaxon, Reference refMods) {
127 127
            // System.out.println("builReference "+mref);
128 128
            this.setFoundBibref(true);
129 129

  
......
140 140
            }
141 141

  
142 142
            //                        logger.info("Current reference :"+nbRef+", "+ref+", "+treatmentMainName+"--"+ref.indexOf(treatmentMainName));
143
            Reference<?> reference = ReferenceFactory.newGeneric();
143
            Reference reference = ReferenceFactory.newGeneric();
144 144
            reference.setTitleCache(ref, true);
145 145

  
146 146
            //only add the first one if there is no nomenclatural reference yet
......
517 517
     * @param reftype
518 518
     * @return
519 519
     */
520
    protected Reference<?> getReferenceWithType(int reftype) {
521
        Reference<?> ref = null;
520
    protected Reference getReferenceWithType(int reftype) {
521
        Reference ref = null;
522 522
        switch (reftype) {
523 523
        case 1:
524 524
            ref = ReferenceFactory.newGeneric();
525 525
            break;
526 526
        case 2:
527 527
            IBook tmp= ReferenceFactory.newBook();
528
            ref = (Reference<?>)tmp;
528
            ref = (Reference)tmp;
529 529
            break;
530 530
        case 3:
531 531
            ref = ReferenceFactory.newArticle();
532 532
            break;
533 533
        case 4:
534 534
            IBookSection tmp2 = ReferenceFactory.newBookSection();
535
            ref = (Reference<?>)tmp2;
535
            ref = (Reference)tmp2;
536 536
            break;
537 537
        case 5:
538 538
            ref = ReferenceFactory.newJournal();
......
771 771
     * @param similarityAuthor
772 772
     * @return
773 773
     */
774
    protected boolean askIfReuseBestMatchingTaxon(NonViralName<?> taxonnamebase2, Taxon bestMatchingTaxon, Reference<?> refMods, double similarityScore, double similarityAuthor) {
774
    protected boolean askIfReuseBestMatchingTaxon(NonViralName<?> taxonnamebase2, Taxon bestMatchingTaxon, Reference refMods, double similarityScore, double similarityAuthor) {
775 775
        Object[] options = { UIManager.getString("OptionPane.yesButtonText"),
776 776
                UIManager.getString("OptionPane.noButtonText")};
777 777

  

Also available in: Unified diff