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/TaxonXTreatmentExtractor.java
109 109

  
110 110
    private MyName currentMyName;
111 111

  
112
    private Reference<?> sourceUrlRef;
112
    private Reference sourceUrlRef;
113 113

  
114 114
    private String followingText;  //text element immediately following a tax:name in tax:nomenclature TODO move do state
115 115
    private String usedFollowingTextPrefix; //the part of the following text which has been used during taxon name creation
......
123 123
     * @param configState
124 124
     */
125 125
    public TaxonXTreatmentExtractor(NomenclaturalCode nomenclaturalCode, Classification classification, TaxonXImport importer,
126
            TaxonXImportState configState,Map<String, Feature> featuresMap,  Reference<?> urlSource) {
126
            TaxonXImportState configState,Map<String, Feature> featuresMap,  Reference urlSource) {
127 127
        this.nomenclaturalCode=nomenclaturalCode;
128 128
        this.classification = classification;
129 129
        this.importer=importer;
......
145 145
     */
146 146
    @SuppressWarnings({ "rawtypes", "unused" })
147 147

  
148
    protected void extractTreatment(Node treatmentnode, Reference<?> refMods, URI sourceName) {        logger.info("extractTreatment");
148
    protected void extractTreatment(Node treatmentnode, Reference refMods, URI sourceName) {        logger.info("extractTreatment");
149 149
        List<TaxonNameBase> namesToSave = new ArrayList<TaxonNameBase>();
150 150
        NodeList children = treatmentnode.getChildNodes();
151 151
        Taxon acceptedTaxon =null;
......
172 172
        buildFeatureTree();
173 173
    }
174 174

  
175
	private Taxon handleSingleNode(Reference<?> refMods, URI sourceName,
175
	private Taxon handleSingleNode(Reference refMods, URI sourceName,
176 176
			List<TaxonNameBase> namesToSave, Node child, Taxon acceptedTaxon) {
177 177
		Taxon defaultTaxon =null;
178 178

  
......
353 353
     * @param refMods: the current reference extracted from the MODS
354 354
     */
355 355
    /*   @SuppressWarnings("rawtypes")
356
    private void extractKey(Node keys, Taxon acceptedTaxon,List<TaxonNameBase> nametosave, Reference<?> refMods) {
356
    private void extractKey(Node keys, Taxon acceptedTaxon,List<TaxonNameBase> nametosave, Reference refMods) {
357 357
        acceptedTaxon = CdmBase.deproxy(acceptedTaxon, Taxon.class);
358 358

  
359 359
        NodeList children = keys.getChildNodes();
......
431 431
     * @return Taxon object built
432 432
     */
433 433
    @SuppressWarnings({ "rawtypes", "unused" })
434
    private TaxonNameBase getTaxonNameBaseFromXML(Node taxons, List<TaxonNameBase> nametosave, Reference<?> refMods, boolean isSynonym) {
434
    private TaxonNameBase getTaxonNameBaseFromXML(Node taxons, List<TaxonNameBase> nametosave, Reference refMods, boolean isSynonym) {
435 435
        //        logger.info("getTaxonFromXML");
436 436
        //        logger.info("acceptedTaxon: "+acceptedTaxon);
437 437
        logger.info("getTaxonNameBaseFromXML");
......
487 487
    //     * @return Taxon
488 488
    //     */
489 489
    //    @SuppressWarnings({ "unused", "rawtypes" })
490
    //    private Taxon getTaxon(TaxonNameBase taxonNameBase, Reference<?> refMods) {
490
    //    private Taxon getTaxon(TaxonNameBase taxonNameBase, Reference refMods) {
491 491
    //        Taxon t = new Taxon(taxonNameBase,null );
492 492
    //        if (!configState.getConfig().doKeepOriginalSecundum() || (t.getSec() == null)) {
493 493
    //            t.setSec(configState.getConfig().getSecundum());
......
512 512
    //        return t;
513 513
    //    }
514 514

  
515
    private void  extractDescriptionWithReference(Node typestatus, Taxon acceptedTaxon, Taxon defaultTaxon, Reference<?> refMods,
515
    private void  extractDescriptionWithReference(Node typestatus, Taxon acceptedTaxon, Taxon defaultTaxon, Reference refMods,
516 516
            String featureName) {
517 517
        //        System.out.println("extractDescriptionWithReference !");
518 518
        logger.info("extractDescriptionWithReference");
......
533 533
            }
534 534
        }
535 535

  
536
        Reference<?> currentref =  ReferenceFactory.newGeneric();
536
        Reference currentref =  ReferenceFactory.newGeneric();
537 537
        if(!r.isEmpty()) {
538 538
            currentref.setTitleCache(r, true);
539 539
        } else {
......
550 550
     * @param refMods: the current reference extracted from the MODS
551 551
     */
552 552
    @SuppressWarnings("rawtypes")
553
    private void extractDistribution(Node distribution, Taxon acceptedTaxon, Taxon defaultTaxon, List<TaxonNameBase> nametosave, Reference<?> refMods) {
553
    private void extractDistribution(Node distribution, Taxon acceptedTaxon, Taxon defaultTaxon, List<TaxonNameBase> nametosave, Reference refMods) {
554 554
        logger.info("extractDistribution");
555 555
        //        logger.info("acceptedTaxon: "+acceptedTaxon);
556 556
        NodeList children = distribution.getChildNodes();
......
628 628
     * @param currentFeature
629 629
     * @param k
630 630
     */
631
    private void handleTextData(Reference<?> refMods, Map<Integer, String> descriptionsFulltext, TaxonDescription td,
631
    private void handleTextData(Reference refMods, Map<Integer, String> descriptionsFulltext, TaxonDescription td,
632 632
            Feature currentFeature, int k) {
633 633
        //logger.info("handleTextData");
634 634
        TextData textData = TextData.NewInstance();
......
644 644
     * @param td
645 645
     * @param soo
646 646
     */
647
    private void handleAssociation(Taxon acceptedTaxon, Reference<?> refMods, TaxonDescription td, MySpecimenOrObservation soo) {
647
    private void handleAssociation(Taxon acceptedTaxon, Reference refMods, TaxonDescription td, MySpecimenOrObservation soo) {
648 648
        logger.info("handleAssociation");
649 649
        String descr=soo.getDescr();
650 650
        DerivedUnit derivedUnitBase = soo.getDerivedUnitBase();
......
674 674
     * @param feature
675 675
     * @return
676 676
     */
677
    private IndividualsAssociation createIndividualAssociation(Reference<?> refMods, DerivedUnit derivedUnitBase,
677
    private IndividualsAssociation createIndividualAssociation(Reference refMods, DerivedUnit derivedUnitBase,
678 678
            Feature feature) {
679 679
        logger.info("createIndividualAssociation");
680 680
        IndividualsAssociation indAssociation = IndividualsAssociation.NewInstance();
......
716 716
     * @param paragraph
717 717
     */
718 718
    @SuppressWarnings("rawtypes")
719
    private void extractInLine(List<TaxonNameBase> nametosave, Reference<?> refMods, Map<Integer, String> descriptionsFulltext,
719
    private void extractInLine(List<TaxonNameBase> nametosave, Reference refMods, Map<Integer, String> descriptionsFulltext,
720 720
            int i, Node paragraph) {
721 721
        //logger.info("extractInLine");
722 722
        String inLine=getInlineTextForName(nametosave, refMods, paragraph);
......
750 750
     * @param refMods: the current reference extracted from the MODS
751 751
     */
752 752
    @SuppressWarnings("rawtypes")
753
    private void extractMaterials(Node materials, Taxon acceptedTaxon, Reference<?> refMods,List<TaxonNameBase> nametosave) {
753
    private void extractMaterials(Node materials, Taxon acceptedTaxon, Reference refMods,List<TaxonNameBase> nametosave) {
754 754
        logger.info("EXTRACTMATERIALS");
755 755
        //        logger.info("acceptedTaxon: "+acceptedTaxon);
756 756
        NodeList children = materials.getChildNodes();
......
857 857
     * @param rawAssociation
858 858
     * @param k
859 859
     */
860
    private void handleDerivedUnitFacadeAndBase(Taxon acceptedTaxon, Reference<?> refMods, Node event,
860
    private void handleDerivedUnitFacadeAndBase(Taxon acceptedTaxon, Reference refMods, Node event,
861 861
            String rawAssociation) {
862 862
        logger.info("handleDerivedUnitFacadeAndBase");
863 863
        String descr;
......
899 899
     * @param acceptedTaxon: the current accepted Taxon
900 900
     * @param refMods: the current reference extracted from the MODS
901 901
     */
902
    private String extractMaterialsDirect(Node materials, Taxon acceptedTaxon, Reference<?> refMods, String event, NonViralName<?> currentName) {
902
    private String extractMaterialsDirect(Node materials, Taxon acceptedTaxon, Reference refMods, String event, NonViralName<?> currentName) {
903 903
        logger.info("extractMaterialsDirect");
904 904
        //        logger.info("acceptedTaxon: "+acceptedTaxon);
905 905
        String descr="";
......
947 947
     */
948 948
    @SuppressWarnings({ "rawtypes"})
949 949
    private String extractSpecificFeature(Node description, Taxon acceptedTaxon, Taxon defaultTaxon,
950
            List<TaxonNameBase> nametosave, Reference<?> refMods, String featureName ) {
950
            List<TaxonNameBase> nametosave, Reference refMods, String featureName ) {
951 951
        logger.info("extractSpecificFeature "+featureName);
952 952
        //        System.out.println("GRUUUUuu");
953 953
        NodeList children = description.getChildNodes();
......
1105 1105
     */
1106 1106
    @SuppressWarnings({ "unused", "rawtypes" })
1107 1107
    private String extractSpecificFeatureNotStructured(Node description, Taxon acceptedTaxon, Taxon defaultTaxon,
1108
            List<TaxonNameBase> nameToSave, Reference<?> refMods, String featureName ) {
1108
            List<TaxonNameBase> nameToSave, Reference refMods, String featureName ) {
1109 1109
        logger.info("extractSpecificFeatureNotStructured " + featureName);
1110 1110
        NodeList children = description.getChildNodes();
1111 1111
        NodeList insideNodes ;
......
1177 1177
     * @param j
1178 1178
     */
1179 1179
    @SuppressWarnings({ "rawtypes" })
1180
    private String getInlineTextForName(List<TaxonNameBase> nametosave, Reference<?> refMods, Node insideNode) {
1180
    private String getInlineTextForName(List<TaxonNameBase> nametosave, Reference refMods, Node insideNode) {
1181 1181
        if (true){
1182 1182
        	NodeList children = insideNode.getChildNodes();
1183 1183
        	String result = "";
......
1248 1248
     * @return a list of description (text)
1249 1249
     */
1250 1250
    @SuppressWarnings({ "unused", "rawtypes" })
1251
    private List<String> parseParagraph(List<TaxonNameBase> namesToSave, Taxon acceptedTaxon, Reference<?> refMods, Node paragraph, Feature feature){
1251
    private List<String> parseParagraph(List<TaxonNameBase> namesToSave, Taxon acceptedTaxon, Reference refMods, Node paragraph, Feature feature){
1252 1252
        logger.info("parseParagraph "+feature.toString());
1253 1253
        List<String> fullDescription=  new ArrayList<String>();
1254 1254
        //        String localdescr;
......
1289 1289
                        if (ref.endsWith(";")  && ((ref.length())>1)) {
1290 1290
                            ref=ref.substring(0, ref.length()-1)+".";
1291 1291
                        }
1292
                        Reference<?> reference = ReferenceFactory.newGeneric();
1292
                        Reference reference = ReferenceFactory.newGeneric();
1293 1293
                        reference.setTitleCache(ref, true);
1294 1294
                        blabla.add(reference.getTitleCache());
1295 1295
                        nodeKnown=true;
......
1355 1355
     * @param feature: the feature to link the data with
1356 1356
     */
1357 1357
    @SuppressWarnings("rawtypes")
1358
    private void extractFeature(Node description, Taxon acceptedTaxon, Taxon defaultTaxon, List<TaxonNameBase> namesToSave, Reference<?> refMods, Feature feature){
1358
    private void extractFeature(Node description, Taxon acceptedTaxon, Taxon defaultTaxon, List<TaxonNameBase> namesToSave, Reference refMods, Feature feature){
1359 1359
        logger.info("EXTRACT FEATURE "+feature.toString());
1360 1360
        acceptedTaxon = CdmBase.deproxy(acceptedTaxon, Taxon.class);
1361 1361
        List<String> fullDescription= parseParagraph( namesToSave, acceptedTaxon, refMods, description,feature);
......
1376 1376
     * @param currentFeature: the feature name
1377 1377
     * @return
1378 1378
     */
1379
    private void setParticularDescription(String descr, Taxon acceptedTaxon, Taxon defaultTaxon, Reference<?> refMods, Feature currentFeature) {
1379
    private void setParticularDescription(String descr, Taxon acceptedTaxon, Taxon defaultTaxon, Reference refMods, Feature currentFeature) {
1380 1380
        logger.info("setParticularDescription " + currentFeature.getTitleCache()+", \n blabla : "+descr);
1381 1381

  
1382 1382
        //remove redundant feature title
......
1426 1426
     * @param currentFeature
1427 1427
     * @return
1428 1428
     */
1429
    private TextData createTextData(String descr, Reference<?> refMods, Feature currentFeature) {
1429
    private TextData createTextData(String descr, Reference refMods, Feature currentFeature) {
1430 1430
        //logger.info("createTextData");
1431 1431
        TextData textData = TextData.NewInstance();
1432 1432
        textData.setFeature(currentFeature);
......
1446 1446
     * @param currentFeature: the feature name
1447 1447
     * @return
1448 1448
     */
1449
    private void setParticularDescription(String descr, Taxon acceptedTaxon, Taxon defaultTaxon,Reference<?> currentRef, Reference<?> refMods, Feature currentFeature) {
1449
    private void setParticularDescription(String descr, Taxon acceptedTaxon, Taxon defaultTaxon,Reference currentRef, Reference refMods, Feature currentFeature) {
1450 1450
        //        System.out.println("setParticularDescriptionSPecial "+currentFeature);
1451 1451
        //        logger.info("acceptedTaxon: "+acceptedTaxon);
1452 1452
        logger.info("setParticularDescription");
......
1493 1493
     * @param refMods: the current reference extracted from the MODS
1494 1494
     */
1495 1495
    @SuppressWarnings({ "rawtypes" })
1496
    private void extractSynonyms(Node synonymsNode, Taxon acceptedTaxon,Reference<?> refMods, String followingText) {
1496
    private void extractSynonyms(Node synonymsNode, Taxon acceptedTaxon,Reference refMods, String followingText) {
1497 1497
        logger.info("extractSynonyms");
1498 1498
        //System.out.println("extractSynonyms for: "+acceptedTaxon);
1499 1499
        Taxon ttmp = (Taxon) importer.getTaxonService().find(acceptedTaxon.getUuid());
......
1611 1611
     * handle cases where the bibref are inside <p> and outside
1612 1612
     */
1613 1613
    @SuppressWarnings({ "rawtypes" })
1614
    private Taxon extractReferences(Node refgroup, List<TaxonNameBase> nametosave, Taxon acceptedTaxon, Reference<?> refMods) {
1614
    private Taxon extractReferences(Node refgroup, List<TaxonNameBase> nametosave, Taxon acceptedTaxon, Reference refMods) {
1615 1615
        logger.info("extractReferences");
1616 1616
        acceptedTaxon = CdmBase.deproxy(acceptedTaxon, Taxon.class);
1617 1617

  
......
1691 1691
     * handle cases where the bibref are inside <p> and outside
1692 1692
     */
1693 1693
    @SuppressWarnings("rawtypes")
1694
    private void extractReferenceRawText(NodeList references, NonViralName<?> nameToBeFilled, Reference<?> refMods,
1694
    private void extractReferenceRawText(NodeList references, NonViralName<?> nameToBeFilled, Reference refMods,
1695 1695
            Taxon acceptedTaxon) {
1696 1696
        logger.info("extractReferenceRawText");
1697 1697
        String refString="";
......
1760 1760
                }
1761 1761

  
1762 1762
                if (nameOrRefOrOther==1){
1763
                    Reference<?> re = ReferenceFactory.newGeneric();
1763
                    Reference re = ReferenceFactory.newGeneric();
1764 1764
                    re.setTitleCache(fullLineRefName, true);
1765 1765

  
1766 1766
                    /* TaxonNameBase nameTBF = parser.parseFullName(currentMyName.getName(), nomenclaturalCode, currentMyName.getRank());
......
1802 1802
            if(!currentMyName.getName().isEmpty()){
1803 1803
                //logger.info("acceptedTaxon and name: *"+acceptedTaxon.getTitleCache()+"*, *"+currentMyName.getName()+"*");
1804 1804
                if (acceptedTaxon.getTitleCache().split("sec")[0].trim().equalsIgnoreCase(currentMyName.getName().trim())){
1805
                    Reference<?> refS = ReferenceFactory.newGeneric();
1805
                    Reference refS = ReferenceFactory.newGeneric();
1806 1806
                    refS.setTitleCache(refString, true);
1807 1807
                    //                            TaxonDescription td =importer.getTaxonDescription(acceptedTaxon, false, true);
1808 1808
                    //                            acceptedTaxon.addDescription(td);
......
1898 1898
        //logger.info("search reference for LSID");
1899 1899
        //  if ((id.indexOf("lsid")<0) || !lsidok){
1900 1900
        //ADD ORIGINAL SOURCE ID EVEN IF LSID
1901
        Reference<?> re = null;
1901
        Reference re = null;
1902 1902
        Pager<Reference> references = importer.getReferenceService().findByTitle(Reference.class, source, MatchMode.EXACT, null, 1, null, null, null);
1903 1903
        if( references !=null && references.getCount()>0){
1904 1904
            re=references.getRecords().get(0);
......
2029 2029
     * @return
2030 2030
     */
2031 2031
    @SuppressWarnings({ "rawtypes" })
2032
    private Taxon extractNomenclature(Node nomenclatureNode,  List<TaxonNameBase> nametosave, Reference<?> refMods) throws ClassCastException{
2032
    private Taxon extractNomenclature(Node nomenclatureNode,  List<TaxonNameBase> nametosave, Reference refMods) throws ClassCastException{
2033 2033
        refMods=CdmBase.deproxy(refMods, Reference.class);
2034 2034

  
2035 2035
        logger.info("extractNomenclature");
......
2149 2149
                                    //System.out.println("NEW ACCEPTED HERE "+nameToBeFilled);
2150 2150
                                }
2151 2151
                                else {
2152
                                    acceptedTaxon= new Taxon(nameToBeFilled,(Reference<?>) nameToBeFilled.getNomenclaturalReference() );//TODO TOFIX reference
2152
                                    acceptedTaxon= new Taxon(nameToBeFilled,(Reference) nameToBeFilled.getNomenclaturalReference() );//TODO TOFIX reference
2153 2153
                                    //System.out.println("NEW ACCEPTED HERE2 "+nameToBeFilled);
2154 2154
                                }
2155 2155

  
......
2280 2280
     * @param ref: the current reference extracted from the MODS
2281 2281
     * @return the parent for the current accepted taxon
2282 2282
     */
2283
    /*  private Taxon createParent(Taxon acceptedTaxon, Reference<?> ref) {
2283
    /*  private Taxon createParent(Taxon acceptedTaxon, Reference ref) {
2284 2284
        acceptedTaxon = CdmBase.deproxy(acceptedTaxon, Taxon.class);
2285 2285

  
2286 2286
        List<Rank> rankList = new ArrayList<Rank>();
......
2341 2341
     */
2342 2342

  
2343 2343

  
2344
    private MyName  extractScientificNameSynonym(Node name, Reference<?> refMods, String followingText) throws TransformerFactoryConfigurationError, TransformerException {
2344
    private MyName  extractScientificNameSynonym(Node name, Reference refMods, String followingText) throws TransformerFactoryConfigurationError, TransformerException {
2345 2345
        //System.out.println("extractScientificNameSynonym");
2346 2346
        logger.info("extractScientificNameSynonym");
2347 2347
        String[] rankListToPrint_tmp ={"dwc:genus","dwc:specificepithet","dwc:species","dwc:subspecies", "dwc:infraspecificepithet","dwc:scientificnameauthorship"};
......
2490 2490
     * @return a list of possible names
2491 2491
     */
2492 2492
    @SuppressWarnings({"rawtypes" })
2493
    private MyName extractScientificName(Node name, Reference<?> refMods, String followingText) throws TransformerFactoryConfigurationError, TransformerException {
2493
    private MyName extractScientificName(Node name, Reference refMods, String followingText) throws TransformerFactoryConfigurationError, TransformerException {
2494 2494
        logger.info("extractScientificName");
2495 2495

  
2496 2496
        String[] rankListToPrintLowerCase_tmp ={"dwc:genus","dwc:specificepithet","dwc:species","dwc:subspecies", "dwc:infraspecificepithet","dwc:scientificnameauthorship"};
......
3046 3046
     * I created this switch for old
3047 3047
     * for Spiders the new version is preferred
3048 3048
     */
3049
    private void createUnparsedSynonymNew(Rank rank, String newName, HashMap<String, String> atomisedMap, MyName myname, Reference<?> refMods) {
3049
    private void createUnparsedSynonymNew(Rank rank, String newName, HashMap<String, String> atomisedMap, MyName myname, Reference refMods) {
3050 3050
        logger.info("createSynonym");
3051 3051

  
3052 3052
        NonViralName<?> nameToBeFilled = this.getNonViralNameAccNomenclature();
......
3093 3093
        	}else if (atomisedMap.get("dwc:subspecies") != null){
3094 3094
        		nameToBeFilled.setInfraSpecificEpithet(atomisedMap.get("dwc:subspecies"));
3095 3095
        	}
3096
            Reference<?> sec = sourceUrlRef;
3096
            Reference sec = sourceUrlRef;
3097 3097
            if(!state2.getConfig().doKeepOriginalSecundum()){
3098 3098
                sec = state2.getConfig().getSecundum();
3099 3099
            }
......
3296 3296

  
3297 3297
        NonViralName<?> taxonNameBase;
3298 3298

  
3299
        Reference<?> refMods ;
3299
        Reference refMods ;
3300 3300

  
3301 3301
        Taxon family,subfamily,tribe,subtribe,genus,subgenus,species,subspecies, variety,form;
3302 3302
        NonViralName<?> familyName, subfamilyName, tribeName,subtribeName,genusName,subgenusName,speciesName,subspeciesName;
......
3352 3352
            this.isSynonym = isSynonym;
3353 3353
        }
3354 3354

  
3355
        public void setSource(Reference<?> re){
3355
        public void setSource(Reference re){
3356 3356
            refMods=re;
3357 3357
        }
3358 3358

  
......
4887 4887
     * @param similarityAuthor
4888 4888
     * @return
4889 4889
     */
4890
    private boolean compareAndCheckTaxon(NonViralName<?> tnb, Reference<?> refMods, double similarityScore,
4890
    private boolean compareAndCheckTaxon(NonViralName<?> tnb, Reference refMods, double similarityScore,
4891 4891
            Taxon bestMatchingTaxon, double similarityAuthor) {
4892 4892
        //logger.info("compareAndCheckTaxon");
4893 4893
        boolean insertAsExisting;
......
5018 5018
     * @param taxonNameBase
5019 5019
     */
5020 5020
    @SuppressWarnings("rawtypes")
5021
    public void lookForParentNode(NonViralName<?> taxonNameBase, Taxon tax, Reference<?> ref, MyName myName) {
5021
    public void lookForParentNode(NonViralName<?> taxonNameBase, Taxon tax, Reference ref, MyName myName) {
5022 5022
        logger.info("lookForParentNode "+taxonNameBase.getTitleCache()+" for "+myName.toString());
5023 5023
        //System.out.println("LOOK FOR PARENT NODE "+taxonnamebase.toString()+"; "+tax.toString()+"; "+taxonnamebase.getRank());
5024 5024
        INonViralNameParser parser = NonViralNameParserImpl.NewInstance();
......
5058 5058
     * @param myName
5059 5059
     * @param parser
5060 5060
     */
5061
    private void handleSubfamilyHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5061
    private void handleSubfamilyHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5062 5062
        System.out.println("handleSubfamilyHierarchy");
5063 5063
        String parentStr = myName.getFamilyStr();
5064 5064
        Rank r = Rank.FAMILY();
......
5100 5100
     * @param myName
5101 5101
     * @param parser
5102 5102
     */
5103
    private void handleTribeHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5103
    private void handleTribeHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5104 5104
        String parentStr = myName.getSubfamilyStr();
5105 5105
        Rank r = Rank.SUBFAMILY();
5106 5106
        if (parentStr == null){
......
5148 5148
     * @param myName
5149 5149
     * @param parser
5150 5150
     */
5151
    private void handleSubtribeHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5151
    private void handleSubtribeHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5152 5152
        String parentStr = myName.getTribeStr();
5153 5153
        Rank r = Rank.TRIBE();
5154 5154
        if (parentStr == null){
......
5201 5201
     * @param myName
5202 5202
     * @param parser
5203 5203
     */
5204
    private void handleGenusHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5204
    private void handleGenusHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5205 5205
        String parentStr = myName.getSubtribeStr();
5206 5206
        Rank r = Rank.SUBTRIBE();
5207 5207
        if (parentStr == null){
......
5259 5259
     * @param myName
5260 5260
     * @param parser
5261 5261
     */
5262
    private void handleSubgenusHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5262
    private void handleSubgenusHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5263 5263
        String parentStr = myName.getGenusStr();
5264 5264
        Rank r = Rank.GENUS();
5265 5265

  
......
5322 5322
     * @param myName
5323 5323
     * @param parser
5324 5324
     */
5325
    private void handleSpeciesHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5325
    private void handleSpeciesHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5326 5326
        String parentStr = myName.getSubgenusStr();
5327 5327
        Rank r = Rank.SUBGENUS();
5328 5328

  
......
5359 5359
     * @param myName
5360 5360
     * @param parser
5361 5361
     */
5362
    private void handleSubSpeciesHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5362
    private void handleSubSpeciesHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5363 5363
        String parentStr = myName.getSpeciesStr();
5364 5364
        Rank r = Rank.SPECIES();
5365 5365

  
......
5403 5403
     * @param myName
5404 5404
     * @param parser
5405 5405
     */
5406
    private void handleFormHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5406
    private void handleFormHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5407 5407
        String parentStr = myName.getSubspeciesStr();
5408 5408
        Rank r = Rank.SUBSPECIES();
5409 5409

  
......
5451 5451
     * @param myName
5452 5452
     * @param parser
5453 5453
     */
5454
    private void handleVarietyHierarchy(Reference<?> ref, MyName myName, INonViralNameParser<?> parser) {
5454
    private void handleVarietyHierarchy(Reference ref, MyName myName, INonViralNameParser<?> parser) {
5455 5455
        String parentStr = myName.getSubspeciesStr();
5456 5456
        Rank r = Rank.SUBSPECIES();
5457 5457

  
......
5501 5501
     * @param r
5502 5502
     * @return
5503 5503
     */
5504
    private Taxon handleParentName(Reference<?> ref, MyName myName, INonViralNameParser<?> parser, String parentStr, Rank r) {
5504
    private Taxon handleParentName(Reference ref, MyName myName, INonViralNameParser<?> parser, String parentStr, Rank r) {
5505 5505
        NonViralName<?> parentNameName =  (NonViralName<?>) parser.parseFullName(parentStr, nomenclaturalCode, r);
5506 5506
        Taxon parent = Taxon.NewInstance(parentNameName, ref); //sec set null
5507 5507
        //                    importer.getTaxonService().save(parent);

Also available in: Unified diff