Project

General

Profile

« Previous | Next » 

Revision 6a45f6a2

Added by Alex Theys almost 12 years ago

AT: committing changes to the TaxEditor Post second round of code review

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
134 134
				text = "No data provided";
135 135
			}
136 136
			else {
137
				((CategoricalData)element).putModifyingText(CdmStore.getDefaultLanguage(), text);
137
				String[] textElements = text.split(";");
138
				String dataportalString = textElements[0] + ";" + textElements[1] + ";" + textElements[5] + ";" + textElements[2] + ";" + textElements[3] + ";" + textElements[4] + ";" ;  
139
				
140
				((CategoricalData)element).putModifyingText(CdmStore.getDefaultLanguage(), dataportalString);
138 141
			}
139 142
			return text;
140 143
		}
......
168 171
		else if ((term.getVocabulary() != null) && (term.getPartOf() == null) && (term.getVocabulary().getTitleCache().equals(vocabularyExpected))) {
169 172
			return true;
170 173
		}
171
		else if ((vocabularyExpected.equals("Ethnic Group"))  && (term.getVocabulary() != null) && ((term.getPartOf() != null))) {
174
		else if ((vocabularyExpected.equals(UsageTermCollection.ethnicGroupLabel))  && (term.getVocabulary() == null) && ((term.getPartOf() != null))) {
172 175
			return true;
173 176
		}
174 177
	return false;

Also available in: Unified diff