Project

General

Profile

« Previous | Next » 

Revision 557e4df8

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

fixing problem of reusing name for creation of taxon

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
53 53
            Taxon taxon = taxonNodePage.getTaxon();
54 54
            try{
55 55
                TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());
56
                taxonNode = CdmStore.getService(ITaxonNodeService.class).merge(taxonNode);
57
                generatedTaxonNodeUuid = taxonNode.getUuid();
56
                generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);
57
               // generatedTaxonNodeUuid = taxonNode.getUuid();
58 58
                Set<CdmBase> affectedObjects = new HashSet<CdmBase>();
59 59
                //FIXME:Remoting Hack for now - need to generalise this
60 60
                // by making the affected objects a set of ICdmBase
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
170 170

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

  
176
			setTaxon(selection_reuseExistingName.getEntity());
177
			//setTaxon(selection_reuseExistingName.getEntity());
177 178
			complete = !textNewTaxonName.getText().isEmpty();
178 179
		} else if (eventSource == textNewTaxonName) {
179 180
			boolean enabled = CdmUtils.isBlank(textNewTaxonName.getText());
......
279 280
			}
280 281
		}
281 282
		taxon = Taxon.NewInstance(taxonName, secundum);
283
		setTaxon(taxon);
282 284
	}
283 285

  
284 286
	private void setOpenInEditor(boolean openInEditor) {

Also available in: Unified diff