Project

General

Profile

« Previous | Next » 

Revision 947bebd6

Added by Katja Luther over 8 years ago

#5114 fix

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
79 79
					element.removeSynonym(synonym);
80 80

  
81 81
				} else {
82

  
82
//TODO: this should be moved to the handler, the operations should not contain ui code
83 83
					DeleteResult result = service.deleteSynonym(synonym.getUuid(), element.getUuid(), null);
84 84
					if (result.isError()){
85 85
						DeleteResultMessagingUtils.messageDialogWithDetails(result, "Delete failed", TaxeditorEditorPlugin.PLUGIN_ID);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DeleteResultMessagingUtils.java
67 67
            for (String relatedObject: relatedObjects){
68 68

  
69 69
                relatedObjectsString.append(relatedObject);
70
                relatedObjectsString.append("\n");
70
                relatedObjectsString.append(System.lineSeparator());
71 71
            }
72 72
        }
73 73
        message = message + "\n" ;
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
95 95
		selection_parentTaxonNode = formFactory
96 96
				.createTaxonNodeSelectionElement(getConversationHolder(), formElement, "Parent", null,
97 97
						EntitySelectionElement.DELETABLE, style);
98
		selection_SecRef = formFactory
99
				.createSelectionElement(Reference.class,getConversationHolder(), formElement, "Secundum Reference", null,
100
						EntitySelectionElement.DELETABLE, style);
98

  
101 99
		selection_reuseExistingTaxon = formFactory
102 100
				.createSelectionElement(Taxon.class,
103 101
						getConversationHolder(), formElement,
......
109 107
						getConversationHolder(), formElement,
110 108
						"Reuse existing name", null,
111 109
						EntitySelectionElement.DELETABLE, style);
112

  
110
		selection_SecRef = formFactory
111
                .createSelectionElement(Reference.class,getConversationHolder(), formElement, "Secundum Reference", null,
112
                        EntitySelectionElement.DELETABLE, style);
113 113
		textNewTaxonName = formFactory.createTextWithLabelElement(formElement,
114 114
				"New Taxon", "", style);
115 115
		textNewTaxonName.setFocus();
......
241 241
			selection_classification.setEntity(classification);
242 242
			selection_parentTaxonNode.setEntity(null);
243 243
			selection_parentTaxonNode.setClassification(classification);
244
			selection_SecRef.setEntity(classification.getReference());
244 245
		} else if (parentTreeNode instanceof TaxonNode) {
245 246
			classification = (Classification) HibernateProxyHelper
246 247
					.deproxy(((TaxonNode) parentTreeNode).getClassification());
247 248
			selection_classification.setEntity(classification);
248 249
			selection_parentTaxonNode.setEntity((TaxonNode) parentTreeNode);
249 250
			selection_parentTaxonNode.setClassification(classification);
251
			selection_SecRef.setEntity(((TaxonNode)parentTreeNode).getTaxon().getSec());
250 252
		} else if(parentTreeNode == null){
251 253
			this.parentTreeNode = selection_classification.getEntity();
252 254
		}
......
260 262
	private void setTaxon(Taxon taxon) {
261 263
		this.taxon = taxon;
262 264
		textNewTaxonName.setText(taxon.getName().getTitleCache());
263
		this.secReference = taxon.getSec();
265
		selection_SecRef.setEntity(taxon.getSec());
264 266
	}
265 267

  
266 268
	private void setTaxon(String taxonNameString) {

Also available in: Unified diff