Project

General

Profile

« Previous | Next » 

Revision ea7deae0

Added by Andreas Müller almost 7 years ago

fix #6671 remove generics for TaxonName

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusAltitudeActivator.java
209 209

  
210 210
		//Meikle
211 211
		if (source != null){
212
			TaxonName<?,?> nameUsedInSource = null;  //TODO
212
			TaxonName nameUsedInSource = null;  //TODO
213 213
			data.addSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, sourceRef, null, nameUsedInSource, null);
214 214
		}
215 215
		data.setUnit(meter);
app-import/src/main/java/eu/etaxonomy/cdm/app/util/TestDatabase.java
144 144
	    List<AnnotatableEntity> homotypicalGroups;
145 145

  
146 146
		Reference citRef, sec;
147
		TaxonName<?,?> name1, name2, name21, nameRoot1, nameFree, synName11, synName12, synName2, synNameFree;
148
		TaxonName<?,?> nameRoot2, nameR2_1, nameR2_2;
147
		TaxonName name1, name2, name21, nameRoot1, nameFree, synName11, synName12, synName2, synNameFree;
148
		TaxonName nameRoot2, nameR2_1, nameR2_2;
149 149
		Taxon child1, child2, child21, root1T, root2T, freeT;
150 150
		Taxon childR2_1, childR2_2;
151 151
		TaxonNode child1Node, child2Node, child21Node, root1TNode, root2TNode, freeTNode;
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java
85 85
					String newText = parseNewText(text);
86 86
					citation.removeText(language);
87 87
					citation.putText(language, newText);
88
					TaxonName<?,?> scientificName = getScientificName(originalNameString, nameMap, nameDuplicateMap);
88
					TaxonName scientificName = getScientificName(originalNameString, nameMap, nameDuplicateMap);
89 89

  
90 90
					Set<DescriptionElementSource> sources = citation.getSources();
91 91
					if (sources.size() > 1){
......
128 128

  
129 129

  
130 130
	private void fillNameMaps(List<TaxonName> nameList, Map<String, TaxonName> nameMap, Map<String, TaxonName> duplicateMap) {
131
		for (TaxonName<?,?> name : nameList){
131
		for (TaxonName name : nameList){
132 132
			String nameCache = name.getNameCache();
133 133
			if (nameMap.containsKey(nameCache)){
134 134
				duplicateMap.put(nameCache, name);
app-import/src/main/java/eu/etaxonomy/cdm/io/algaterra/AlgaTerraTypeImport.java
198 198

  
199 199

  
200 200
					//Designation
201
					TaxonName<?,?> name = getTaxonName(state, taxonNameMap, nameId);
201
					TaxonName name = getTaxonName(state, taxonNameMap, nameId);
202 202
					SpecimenTypeDesignation designation = SpecimenTypeDesignation.NewInstance();
203 203
					SpecimenTypeDesignationStatus status = getSpecimenTypeDesignationStatusByKey(typeStatusFk);
204 204
					if (typeStatusFk != null && typeStatusFk.equals(39)){
......
336 336
	 * @param nameId
337 337
	 * @return
338 338
	 */
339
	private TaxonName<?,?> getTaxonName(AlgaTerraImportState state, Map<String, TaxonName> taxonNameMap, int nameId) {
340
		TaxonName<?,?> result;
339
	private TaxonName getTaxonName(AlgaTerraImportState state, Map<String, TaxonName> taxonNameMap, int nameId) {
340
		TaxonName result;
341 341
		if (state.getConfig().isDoTaxonNames()){
342 342
			result = taxonNameMap.get(String.valueOf(nameId));
343 343
		}else{
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelCommonNamesImport.java
260 260
				String microCitation = null;
261 261
				String originalNameString = null;
262 262

  
263
				TaxonName<?,?> nameUsedInSource = taxonNameMap.get(String.valueOf(nameInSourceFk));
263
				TaxonName nameUsedInSource = taxonNameMap.get(String.valueOf(nameInSourceFk));
264 264
				if (nameInSourceFk != null && nameUsedInSource == null){
265 265
					logger.warn("Name used in source (" + nameInSourceFk + ") was not found for common name " + commonNameId);
266 266
				}
......
646 646
			nameSpace = BerlinModelTaxonNameImport.NAMESPACE;
647 647
			cdmClass = TaxonName.class;
648 648
			idSet = nameIdSet;
649
			Map<String, TaxonName<?,?>> nameMap = (Map<String, TaxonName<?,?>>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
649
			Map<String, TaxonName> nameMap = (Map<String, TaxonName>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idSet, nameSpace);
650 650
			result.put(nameSpace, nameMap);
651 651

  
652 652
			//taxon map
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java
131 131
				String category = CdmUtils.Nz(rs.getString("NameFactCategory"));
132 132
				String nameFact = CdmUtils.Nz(rs.getString("nameFact"));
133 133

  
134
				TaxonName<?,?> taxonNameBase = nameMap.get(String.valueOf(nameId));
134
				TaxonName taxonNameBase = nameMap.get(String.valueOf(nameId));
135 135
				String nameFactRefFk = String.valueOf(nameFactRefFkObj);
136 136
				Reference citation = refMap.get(nameFactRefFk);
137 137

  
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceSourceImport.java
129 129
    				if (ref != null){
130 130
    					DescriptionElementSource originalSource = DescriptionElementSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);
131 131
    					originalSource.setCitation(ref);
132
    					TaxonName<?,?> taxonName;
132
    					TaxonName taxonName;
133 133
						taxonName = TaxonName.castAndDeproxy(getName(state, oldName, oldNameFk));
134 134
						if (taxonName != null){
135 135
    						originalSource.setNameUsedInSource(taxonName);
......
227 227
	 */
228 228
	boolean isFirstTimeNoNameByService = true;
229 229
	private INonViralName getName(BerlinModelImportState state, String oldName, Integer oldNameFk) {
230
		TaxonName<?,?> taxonName = (TaxonName)state.getRelatedObject(BerlinModelTaxonNameImport.NAMESPACE, String.valueOf(oldNameFk));
230
		TaxonName taxonName = (TaxonName)state.getRelatedObject(BerlinModelTaxonNameImport.NAMESPACE, String.valueOf(oldNameFk));
231 231
		if (taxonName == null && oldName != null){
232 232
			if (isFirstTimeNoNameByService){
233 233
				logger.warn("oldName not checked against names in BerlinModel. Just take it as a string");
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonImport.java
158 158
					uuid = rs.getString("UUID");
159 159
				}
160 160

  
161
				TaxonName<?,?> taxonName = null;
161
				TaxonName taxonName = null;
162 162
				taxonName  = taxonNameMap.get(String.valueOf(nameFk));
163 163

  
164 164
				Reference reference = null;
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java
187 187
					}
188 188

  
189 189
					//create TaxonName
190
					TaxonName<?,?> taxonName;
190
					TaxonName taxonName;
191 191
					if (config.getNomenclaturalCode() != null){
192 192
						taxonName = config.getNomenclaturalCode().getNewTaxonNameInstance(rank);
193 193
						//check cultivar
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java
126 126
				int relQualifierFk = rs.getInt("relNameQualifierFk");
127 127
				String notes = rs.getString("notes");
128 128

  
129
				TaxonName<?,?> nameFrom = nameMap.get(String.valueOf(name1Id));
130
				TaxonName<?,?> nameTo = nameMap.get(String.valueOf(name2Id));
129
				TaxonName nameFrom = nameMap.get(String.valueOf(name1Id));
130
				TaxonName nameTo = nameMap.get(String.valueOf(name2Id));
131 131

  
132 132

  
133 133
				Reference citation = null;
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTypesImport.java
118 118
				//RejectedFlag false
119 119
				//PublishFlag xxx
120 120

  
121
				TaxonName<?,?> taxonNameBase = nameMap.get(String.valueOf(nameId));
121
				TaxonName taxonNameBase = nameMap.get(String.valueOf(nameId));
122 122

  
123 123
				if (taxonNameBase != null){
124 124
					try{
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java
76 76

  
77 77
	private boolean checkRank(List<TaxonName> list){
78 78
		List<TaxonName> errorNames = new ArrayList<>();
79
		for (TaxonName<?,?> name : list){
79
		for (TaxonName name : list){
80 80
			if (name.getRank() == null) {
81 81
                ;
82 82
            }
......
84 84
		}
85 85
		if (errorNames.size() >0){
86 86
			System.out.println("The following names have no Rank:\n=======================");
87
			for (TaxonName<?,?> name : errorNames){
87
			for (TaxonName name : errorNames){
88 88
				System.out.println("  " + name.toString());
89 89
				System.out.println("  " + name.getUuid());
90 90
				System.out.println("  " + name.getTitleCache());
......
173 173
			mapping.initialize(state);
174 174
			logger.info("save "+pluralString+" ...");
175 175
			int count = 0;
176
			for (TaxonName<?,?> name : names){
176
			for (TaxonName name : names){
177 177
				doCount(count++, modCount, pluralString);
178 178
				success &= mapping.invoke(name);
179 179
				//TODO rank = null or rank < genus and genusOrUninomial != null
app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
199 199
	private void handleBasionym(CaryoImportState state, ResultSet rs, Taxon taxon, String basioStr, Integer id) {
200 200
		if (StringUtils.isNotBlank(basioStr)){
201 201
			IBotanicalName name = taxon.getName();
202
			TaxonName<?,?> basionym = (TaxonName)TaxonNameFactory.PARSED_BOTANICAL_REFERENCE(basioStr);
202
			TaxonName basionym = (TaxonName)TaxonNameFactory.PARSED_BOTANICAL_REFERENCE(basioStr);
203 203
			if (basionym.hasProblem()){
204 204
				logger.warn("Problem when parsing basionym ("+id+"): " +  basioStr);
205 205
			}
......
221 221
			return;
222 222
		}else{
223 223
			IBotanicalName name = taxon.getName();
224
			TaxonName<?,?> typeName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
224
			TaxonName typeName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
225 225
			if ("not designated".equalsIgnoreCase(type)){
226 226
				desig.setNotDesignated(true);
227 227
			}else{
app-import/src/main/java/eu/etaxonomy/cdm/io/cuba/CubaExcelImport.java
608 608
        for (String split : splits){
609 609
            split = replaceHomonIlleg(split);
610 610
            boolean isHomonym = split.matches(".*" + HOMONYM_MARKER);
611
            TaxonName<?,?> newName = (TaxonName)makeName(state, split);
611
            TaxonName newName = (TaxonName)makeName(state, split);
612 612
            newName.setHomotypicalGroup(homotypicGroup);  //not really necessary as this is later set anyway
613 613
            if (newName.isProtectedTitleCache()){
614 614
                logger.warn(state.getCurrentLine() + ": homotypic name part could not be parsed: " + split);
......
707 707
                }
708 708
            }
709 709
            if (candidates.size() == 1){
710
                TaxonName<?,?> blockedName = (TaxonName<?,?>)candidates.iterator().next();
710
                TaxonName blockedName = (TaxonName)candidates.iterator().next();
711 711
                newName.addRelationshipToName(blockedName, NameRelationshipType.BLOCKING_NAME_FOR(), null);
712 712
                replacementNameCandidates.add(blockedName);
713 713
            }else{
......
726 726
            List<IBotanicalName> replacementNameCandidates) {
727 727
        String line = state.getCurrentLine() +": ";
728 728
        List<IBotanicalName> replacedCandidates = new ArrayList<>();
729
        for (TaxonName<?, ?> typifiedName : homotypicGroup.getTypifiedNames()){
729
        for (TaxonName typifiedName : homotypicGroup.getTypifiedNames()){
730 730
            IBotanicalName candidate = typifiedName;
731 731
            if (candidate.getBasionymAuthorship() == null){
732 732
                if (candidate.getStatus().isEmpty()){
......
737 737
            }
738 738
        }
739 739
        if (replacedCandidates.size() == 1){
740
            TaxonName<?,?> replacedSynonym = (TaxonName)replacedCandidates.iterator().next();
740
            TaxonName replacedSynonym = (TaxonName)replacedCandidates.iterator().next();
741 741
            for (IBotanicalName replacementName : replacementNameCandidates){
742 742
                replacementName.addReplacedSynonym(replacedSynonym, null, null, null);
743 743
            }
......
772 772
    private void createBasionymRelationIfPossible(CubaImportState state, IBotanicalName name1,
773 773
            IBotanicalName name2,
774 774
            boolean name2isHomonym, boolean onlyIfNotYetExists) {
775
        TaxonName<?,?> basionymName = TaxonName.castAndDeproxy(name1);
776
        TaxonName<?,?> newCombination = TaxonName.castAndDeproxy(name2);
775
        TaxonName basionymName = TaxonName.castAndDeproxy(name1);
776
        TaxonName newCombination = TaxonName.castAndDeproxy(name2);
777 777
        //exactly one name must have a basionym author
778 778
        if (name1.getBasionymAuthorship() == null && name2.getBasionymAuthorship() == null
779 779
                || name1.getBasionymAuthorship() != null && name2.getBasionymAuthorship() != null){
app-import/src/main/java/eu/etaxonomy/cdm/io/edaphobase/EdaphobaseClassificationImport.java
102 102
                        logger.warn("Parent taxon " + parentTaxonFk + " not found for taxon " + id );
103 103
                    }else{
104 104

  
105
                        TaxonName<?,?> parentName = parent.getName();
105
                        TaxonName parentName = parent.getName();
106 106

  
107 107
                        TaxonBase<?> child = state.getRelatedObject(TAXON_NAMESPACE, String.valueOf(id), TaxonBase.class);
108
//                        TaxonName<?,?> childName = child.getName();
108
//                        TaxonName childName = child.getName();
109 109

  
110 110
//                        handleMissingNameParts(CdmBase.deproxy(childName, TaxonName.class), CdmBase.deproxy(parentName, NonViralName.class));
111 111

  
app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisSpecTaxImport.java
328 328
	private void addNameDescription(GlobisImportState state, IZoologicalName name, UUID featureUuid,
329 329
			String citedTypeLocality, String featureLabel) {
330 330
		Feature feature = getFeature(state, featureUuid,featureLabel,featureLabel, null, null);
331
		getTaxonNameDescription((TaxonName<?,?>)name, false, true);
331
		getTaxonNameDescription((TaxonName)name, false, true);
332 332

  
333 333
	}
334 334

  
......
898 898

  
899 899

  
900 900
	private Synonym getSynonym(GlobisImportState state, ResultSet rs, Integer specTaxId) throws SQLException {
901
		TaxonName<?,?> name = (TaxonName<?,?>)makeName(state, rs, specTaxId);
901
		TaxonName name = (TaxonName)makeName(state, rs, specTaxId);
902 902

  
903 903
		Synonym synonym = Synonym.NewInstance(name, state.getTransactionalSourceReference());
904 904

  
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaExcludedTaxonImport.java
169 169
        Classification classification = getClassificationService().load(state.getConfig().getClassificationUuid());
170 170
        TaxonNode plantae = classification.getChildNodes().iterator().next();
171 171

  
172
        TaxonName<?,?> name = TaxonNameFactory.NewBotanicalInstance(Rank.SUPERFAMILY());
172
        TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.SUPERFAMILY());
173 173
        name.setTitleCache("Excluded", true);
174 174
        Taxon taxon = Taxon.NewInstance(name, getSecReference(state));
175 175
        excludedFamilyNode = plantae.addChildTaxon(taxon, getSourceCitation(state), null);
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaImportBase.java
23 23
import eu.etaxonomy.cdm.model.name.IBotanicalName;
24 24
import eu.etaxonomy.cdm.model.name.INonViralName;
25 25
import eu.etaxonomy.cdm.model.name.Rank;
26
import eu.etaxonomy.cdm.model.name.TaxonName;
26 27
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
27 28
import eu.etaxonomy.cdm.model.reference.Reference;
28 29
import eu.etaxonomy.cdm.model.taxon.Taxon;
......
166 167
    }
167 168

  
168 169

  
169
    protected BotanicalName makeFamilyName(SimpleExcelTaxonImportState<CONFIG> state,
170
    protected IBotanicalName makeFamilyName(SimpleExcelTaxonImportState<CONFIG> state,
170 171
            String famStr) {
172
        TaxonName name = TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY());
171 173
        famStr = famStr.substring(0,1).toUpperCase() + famStr.substring(1).toLowerCase();
172 174
        name.setGenusOrUninomial(famStr);
173 175
        name.addSource(makeOriginalSource(state));
app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaSynonymImport.java
130 130
        if (misappliedNecAuthor != null){
131 131
            nvn.setAuthorshipCache(misappliedNecAuthor);
132 132
        }
133
        TaxonName<?,?> name = TaxonName.castAndDeproxy(nvn);
133
        TaxonName name = TaxonName.castAndDeproxy(nvn);
134 134

  
135 135
        if (hasStatus){
136 136
            try {
......
171 171
     * @param parsedSynStr
172 172
     */
173 173
    private void handleSynonymNon(SimpleExcelTaxonImportState<CONFIG> state,
174
            TaxonName<?, ?> name, String nonPart, String line) {
174
            TaxonName name, String nonPart, String line) {
175 175
        String[] splits = nonPart.split(" nec ");
176 176

  
177
        TaxonNameBase<?,?> lastHomonym = null;
177
        TaxonName lastHomonym = null;
178 178
        for (String split : splits){
179 179
            split = split.trim();
180 180
//            Saponaria illyrica Ard.
......
182 182
//            S. columnae Aurnier
183 183
//            S. columnae Aurnier nec (Rchb. f.) H. Fleischm.
184 184
//            T. glaucescens Rchb.
185
            TaxonName<?,?> nonName;
185
            TaxonName nonName;
186 186
            if (split.matches("(Saponaria illyrica Ard.|Crepis nemausensis Gouan|S. columnae Aurnier|T. glaucescens Rchb.|Linaria stricta Guss.)"
187 187
                    + "")){
188 188
                if (split.startsWith("S.")){
app-import/src/main/java/eu/etaxonomy/cdm/io/mexico/MexicoConabioTaxonImport.java
468 468
     * @param line
469 469
     * @param name
470 470
     */
471
    private void makeConceptRelation(String line, TaxonName<?,?> name) {
471
    private void makeConceptRelation(String line, TaxonName name) {
472 472
        if (name.getTaxonBases().size()==2){
473 473
            Iterator<TaxonBase> it = name.getTaxonBases().iterator();
474 474
            Taxon taxon1 = getAccepted(it.next());
app-import/src/main/java/eu/etaxonomy/cdm/io/redlist/bfnXml/in/BfnXmlImportTaxonName.java
368 368
			}
369 369
			if(elWissName.getAttributeValue(BfnXmlConstants.ATT_BEREICH, bfnNamespace).equalsIgnoreCase("wissName")){
370 370
				try{
371
					TaxonName<?, ?> nameBase = parseNonviralNames(rank,strAuthor,strSupplement,elWissName);
371
					TaxonName nameBase = parseNonviralNames(rank,strAuthor,strSupplement,elWissName);
372 372
					if(nameBase.isProtectedTitleCache() == true){
373 373
						logger.warn("Taxon " + nameBase.getTitleCache());
374 374
					}
......
465 465
				}
466 466
				if(elSynDetail.getAttributeValue(BfnXmlConstants.ATT_BEREICH).equalsIgnoreCase("wissName")){
467 467
					try{
468
						TaxonName<?, ?> nameBase = parseNonviralNames(rank,strAuthor,strSupplement,elSynDetail);
468
						TaxonName nameBase = parseNonviralNames(rank,strAuthor,strSupplement,elSynDetail);
469 469

  
470 470
						//TODO find best matching Taxa
471 471
						Synonym synonym = Synonym.NewInstance(nameBase, state.getCurrentMicroRef());
......
764 764
	 * @return
765 765
	 * @throws UnknownCdmTypeException
766 766
	 */
767
	private TaxonName<?,?> parseNonviralNames(Rank rank, String strAuthor, String strSupplement, Element elWissName)
767
	private TaxonName parseNonviralNames(Rank rank, String strAuthor, String strSupplement, Element elWissName)
768 768
			throws UnknownCdmTypeException {
769
		TaxonName<?,?> taxonNameBase = null;
769
		TaxonName taxonNameBase = null;
770 770

  
771 771
		String strScientificName = elWissName.getTextNormalize();
772 772
		/**
......
784 784
			strScientificName = StringUtils.remove(strScientificName, strSupplement);
785 785
		}
786 786
		NonViralNameParserImpl parser = NonViralNameParserImpl.NewInstance();
787
		TaxonName<?,?> nonViralName = (TaxonName<?,?>)parser.parseFullName(strScientificName, nomenclaturalCode, rank);
787
		TaxonName nonViralName = (TaxonName)parser.parseFullName(strScientificName, nomenclaturalCode, rank);
788 788
		if(nonViralName.hasProblem()){
789 789
			for(ParserProblem p:nonViralName.getParsingProblems()){
790 790
				logger.warn(++parsingProblemCounter + " " +nonViralName.getTitleCache() +" "+p.toString());

Also available in: Unified diff