Project

General

Profile

« Previous | Next » 

Revision 7d882578

Added by Andreas Müller about 7 years ago

ref #6362, ref #6365 remove occurrences of NonViralName, BotanicalName and ZoologicalName in cdmlib-app

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java
35 35
import eu.etaxonomy.cdm.model.common.CdmBase;
36 36
import eu.etaxonomy.cdm.model.common.ExtensionType;
37 37
import eu.etaxonomy.cdm.model.common.MarkerType;
38
import eu.etaxonomy.cdm.model.name.INonViralName;
38 39
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
39 40
import eu.etaxonomy.cdm.model.name.NonViralName;
40 41
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
......
138 139
		//publicationYear
139 140
		//originalPublicationYear
140 141
		//breed
141
		NonViralName<?> n = null;
142
//		INonViralName n = null;
142 143
		//n.getNomenclaturalMicroReference()
143 144
		return mapping;
144 145
	}
......
246 247

  
247 248
	//called by MethodMapper
248 249
	@SuppressWarnings("unused")
249
	private static Integer getRankFk(NonViralName<?> name){
250
	private static Integer getRankFk(INonViralName name){
250 251
		Integer result = BerlinModelTransformer.rank2RankId(name.getRank());
251 252
		if (result == null){
252 253
			logger.warn ("Rank = null is not allowed in Berlin Model. Rank was changed to KINGDOM: " + name);
......
263 264

  
264 265
	//called by MethodMapper
265 266
	@SuppressWarnings("unused")
266
	private static String getSupraGenericName(NonViralName<?> name){
267
	private static String getSupraGenericName(INonViralName name){
267 268
		if (name.isSupraGeneric()){
268 269
			return name.getGenusOrUninomial();
269 270
		}else{
......
273 274

  
274 275
	//called by MethodMapper
275 276
	@SuppressWarnings("unused")
276
	private static String getGenus(NonViralName<?> name){
277
	private static String getGenus(INonViralName name){
277 278
		if (! name.isSupraGeneric()){
278 279
			return name.getGenusOrUninomial();
279 280
		}else{
......
283 284

  
284 285
	//called by MethodMapper
285 286
	@SuppressWarnings("unused")
286
	private static String getNameCache(NonViralName<?> name){
287
	private static String getNameCache(INonViralName name){
287 288
		if (name.isProtectedNameCache()){
288 289
			return name.getNameCache();
289 290
		}else{
......
293 294

  
294 295
	//called by MethodMapper
295 296
	@SuppressWarnings("unused")
296
	private static String getFullNameCache(NonViralName<?> name){
297
	private static String getFullNameCache(INonViralName name){
297 298
		if (name.isProtectedTitleCache()){
298 299
			return name.getTitleCache();
299 300
		}else{
......
303 304

  
304 305
	//called by MethodMapper
305 306
	@SuppressWarnings("unused")
306
	private static Boolean getPreliminaryFlag(NonViralName<?> name){
307
	private static Boolean getPreliminaryFlag(INonViralName name){
307 308
		if (name.isProtectedTitleCache() || name.isProtectedNameCache()){
308 309
			if (name.isProtectedTitleCache() && name.isProtectedNameCache()){
309 310
				logger.warn("protectedTitleCache and protectedNameCache do not have the same value for name " + name.getTitleCache() + ". This can not be mapped appropriately to the Berlin Model ");

Also available in: Unified diff