Project

General

Profile

« Previous | Next » 

Revision 7d8cee12

Added by Katja Luther over 8 years ago

fix #5261 and minor

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.java
240 240
		ContainerFactory.createOrUpdateHeterotypicSynonymyGroups(this);
241 241
		ContainerFactory.createOrUpdateMisapplicationsGroup(this);
242 242

  
243

  
243 244
		// Redraw composite
244 245
		managedForm.reflow(true);
245 246
	}
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
91 91
		    if (!result.getExceptions().isEmpty() && result.isOk()){
92 92
		    	String separator = ", ";
93 93
			    String exceptionString = "";
94
			    int count = result.getExceptions().size();
95
			    int n = 0;
94 96
			    for (Exception exception : result.getExceptions()) {
95
		            exceptionString += exception.getLocalizedMessage()+separator;
97
			        n++;
98
		            exceptionString += exception.getLocalizedMessage();
99
		            if (n<count){
100
		                exceptionString += separator;
101
		            }
96 102
		        }
97 103

  
98
		    	MessagingUtils.informationDialog("Synonym created but taxon is not deleted.", exceptionString);
104
		    	MessagingUtils.informationDialog("Synonym created but taxon deletion not possible.", exceptionString);
99 105
		    } else if (result.isAbort() || result.isError()){
100
		    	MessagingUtils.errorDialog("Synonym could not created", null, result.toString(), TaxeditorNavigationPlugin.PLUGIN_ID, null, true);
106
		    	MessagingUtils.errorDialog("Synonym creation not possible", null, result.toString(), TaxeditorNavigationPlugin.PLUGIN_ID, null, true);
101 107
		    }
102 108
		} catch (IllegalArgumentException e) {
103 109
            MessagingUtils.errorDialog("Operation failed", this, e.getMessage(), TaxeditorNavigationPlugin.PLUGIN_ID, e, false);
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DeleteResultMessagingUtils.java
57 57
            while (objects.hasNext()){
58 58
                CdmBase object = objects.next();
59 59
                if (object instanceof IdentifiableEntity){
60
                    relatedObjects.add("[" + object.getClass().getSimpleName() + "] " +((IdentifiableEntity)object).getTitleCache() );
60

  
61
                    relatedObjects.add(((IdentifiableEntity)object).getTitleCache() );
61 62
                } else{
62 63
                    relatedObjects.add(object.getUserFriendlyTypeName());
63 64
                }
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
58 58
	        toggleable_cache.setVisible(false);
59 59
	        combo_nomenclaturalCode.setVisible(false);
60 60
	    }
61

  
61
	    textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
62 62
	    section_name = formFactory.createNameDetailSection(getConversationHolder(), formElement, null, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
63 63
	    section_name.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
64 64
	    addControl(section_name);
......
76 76
	        addElement(section_hybrid);
77 77
	    }
78 78

  
79
	    textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
79

  
80 80
    }
81 81

  
82 82
	/** {@inheritDoc} */

Also available in: Unified diff