Project

General

Profile

« Previous | Next » 

Revision a1fd4a9b

Added by Katja Luther over 2 years ago

ref #9762: cultivar group for cultivar and cultivar group and rank handling

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
178 178
			switch(code){
179 179
			case ICNAFP :
180 180
				//nothing do add
181
				createBotanicalNameParts(formElement, nonViralName, style);
181
			    if (nonViralName.getRank().isCultivar()){
182
			        createCultivarNameParts(formElement, nonViralName, style);
183
			    }else{
184
			        createBotanicalNameParts(formElement, nonViralName, style);
185
			    }
182 186
				break;
183 187
			case Fungi :
184 188
				if (config == null){
......
221 225
		cultivarRanks.add(Rank.CULTIVAR());
222 226
		cultivarRanks.add(Rank.CULTIVARGROUP());
223 227
		cultivarRanks.add(Rank.GREX());
224

  
225
		combo_rank.setTerms(cultivarRanks);
228
		if (cultivarName.isCultivar()){
229
		    combo_rank.setTerms(cultivarRanks);
230
		}
231
		combo_rank.setSelection(cultivarName.getRank());
226 232

  
227 233
		if (cultivarName.getRank().equals(Rank.CULTIVAR()) || cultivarName.getRank().equals(Rank.CULTIVARGROUP())){
228
		    text_cultivarName = formFactory.createTextWithLabelElement(formElement, "Cultivar Name", cultivarName.getCultivarEpithet(), style);
229
		}
230
		if(cultivarName.getRank().equals(Rank.CULTIVARGROUP())){
231 234
		    text_cultivarGroup = formFactory.createTextWithLabelElement(formElement, "Cultivar Group", cultivarName.getCultivarGroupEpithet(), style);
232 235
		}
236
		if(cultivarName.getRank().equals(Rank.CULTIVAR())){
237
		    text_cultivarName = formFactory.createTextWithLabelElement(formElement, "Cultivar Name", cultivarName.getCultivarEpithet(), style);
238
		}
233 239
	}
234 240

  
235 241
	private void createBotanicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){

Also available in: Unified diff