Project

General

Profile

« Previous | Next » 

Revision 04a79edb

Added by U-BGBM\k.luther over 8 years ago

minor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
51 51
	private ITaxonTreeNode parentTreeNode;
52 52

  
53 53
	private EntitySelectionElement<Taxon> selection_reuseExistingTaxon;
54
	private EntitySelectionElement<Reference> selection_SecRef;
54 55

  
55 56
	private Taxon taxon;
56 57

  
58
	private Reference secReference;
59

  
57 60
	private TextWithLabelElement textNewTaxonName;
58 61

  
59 62
	private CheckboxElement checkbox_openInEditor;
......
92 95
		selection_parentTaxonNode = formFactory
93 96
				.createTaxonNodeSelectionElement(getConversationHolder(), formElement, "Parent", null,
94 97
						EntitySelectionElement.DELETABLE, style);
98
		selection_SecRef = formFactory
99
				.createSelectionElement(Reference.class,getConversationHolder(), formElement, "Secundum Reference", null,
100
						EntitySelectionElement.DELETABLE, style);
95 101
		selection_reuseExistingTaxon = formFactory
96 102
				.createSelectionElement(Taxon.class,
97 103
						getConversationHolder(), formElement,
......
150 156
			setClassification(selection_classification.getEntity());
151 157
		} else if (eventSource == selection_parentTaxonNode) {
152 158
			setParentTreeNode(selection_parentTaxonNode.getEntity());
159
		} else if (eventSource == selection_SecRef) {
160
			setSecReference(selection_SecRef.getEntity());
153 161
		} else if (eventSource == selection_reuseExistingTaxon) {
154
			boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
155
			selection_reuseExistingName.setEnabled(enabled);
156
			textNewTaxonName.setEnabled(enabled);
162
				boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
163
				selection_reuseExistingName.setEnabled(enabled);
164
				textNewTaxonName.setEnabled(enabled);
165
				if (!enabled){
166
					setTaxon(selection_reuseExistingTaxon.getEntity());
167
				}
168
				complete = !textNewTaxonName.getText().isEmpty();
169

  
157 170

  
158
			setTaxon(selection_reuseExistingTaxon.getEntity());
159 171
		} else if (eventSource == selection_reuseExistingName) {
160
			boolean enabled = selection_reuseExistingName.getEntity() == null;
172
			boolean enabled = selection_reuseExistingName.getEntity() == null ;
173
			setTaxon(selection_reuseExistingName.getEntity());
161 174
			selection_reuseExistingTaxon.setEnabled(enabled);
162 175
			textNewTaxonName.setEnabled(enabled);
163 176

  
164
			setTaxon(selection_reuseExistingName.getEntity());
177
			//setTaxon(selection_reuseExistingName.getEntity());
178
			complete = !textNewTaxonName.getText().isEmpty();
165 179
		} else if (eventSource == textNewTaxonName) {
166
			boolean enabled = CdmUtils.isEmpty(textNewTaxonName.getText());
180
			boolean enabled = CdmUtils.isBlank(textNewTaxonName.getText());
167 181
			selection_reuseExistingTaxon.setEnabled(enabled);
168 182
			selection_reuseExistingName.setEnabled(enabled);
169 183

  
......
235 249
		}
236 250
	}
237 251

  
252
	private void setSecReference(Reference secRef){
253
		this.secReference = secRef;
254
		setTaxon(textNewTaxonName.getText());
255
	}
256

  
238 257
	private void setTaxon(Taxon taxon) {
239 258
		this.taxon = taxon;
259
		textNewTaxonName.setText(taxon.getName().getTitleCache());
260
		this.secReference = taxon.getSec();
240 261
	}
241 262

  
242 263
	private void setTaxon(String taxonNameString) {
......
248 269
	private void setTaxon(TaxonNameBase taxonName) {
249 270
		Reference secundum = null;
250 271
		if (getParentTreeNode() != null) {
251
			if (getParentTreeNode() instanceof Classification) {
272
			if (this.secReference != null){
273
				secundum = this.secReference;
274
			} else if (getParentTreeNode() instanceof Classification) {
252 275
				secundum = ((Classification) getParentTreeNode())
253 276
						.getReference();
254 277
			} else if (getParentTreeNode() instanceof TaxonNode) {
......
257 280
			}
258 281
		}
259 282
		taxon = Taxon.NewInstance(taxonName, secundum);
283
		//textNewTaxonName.setText(taxonName.getTitleCache());
260 284
	}
261 285

  
262 286
	private void setOpenInEditor(boolean openInEditor) {

Also available in: Unified diff