Project

General

Profile

« Previous | Next » 

Revision 29024880

Added by Andreas Müller over 6 years ago

cleanup

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java
113 113
	public static final UUID uuidUserDefinedModifierVocabulary = UUID.fromString("2a8b3838-3a95-49ea-9ab2-3049614b5884");
114 114
	public static final UUID uuidUserDefinedKindOfUnitVocabulary = UUID.fromString("e7c5deb2-f485-4a66-9104-0c5398efd481");
115 115

  
116
	public static final UUID uuidUserDefinedLanguageVocabulary = UUID.fromString("463a96f1-20ba-4a4c-9133-854c1682bd9b");
116 117

  
117 118

  
118 119
	private static final String UuidOnly = "UUIDOnly";
......
431 432
			namedArea = CdmBase.deproxy(term,NamedArea.class);
432 433

  
433 434
			if (vocabularyPreference == null){
434
				vocabularyPreference =  new ArrayList<TermVocabulary<NamedArea>>();
435
				vocabularyPreference =  new ArrayList<>();
435 436
			}
436 437
			if (vocabularyPreference.isEmpty()){  //add TDWG vocabulary if preferences are empty
437 438
				vocabularyPreference.add(Country.GERMANY().getVocabulary());
......
890 891

  
891 892
				language.setUuid(uuid);
892 893
				if (voc == null){
893
					UUID uuidLanguageVoc = UUID.fromString("463a96f1-20ba-4a4c-9133-854c1682bd9b");
894
					UUID uuidLanguageVoc = uuidUserDefinedLanguageVocabulary;
894 895
					boolean isOrdered = false;
895 896
					voc = getVocabulary(TermType.Language, uuidLanguageVoc, "User defined languages", "User defined languages", "User defined languages", null, isOrdered, language);
896 897
				}

Also available in: Unified diff