/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java - Diff - EDIT - EDIT Project Management

« Previous | Next »

Revision 35ee4164

ref #6932 Do not reset merge candidates when saving before merge

+                }
                 @Override
                 public boolean canModify(Object element, String property) {
                     return true;
                     return false;
+                }
             });
-...
+    	}
     	@Override
         @Persist
     	@Persist
     	public void save(IProgressMonitor monitor) {
     	    input.saveModel();
     	    save(monitor, true);
+    	}
     	public void save(IProgressMonitor monitor, boolean resetMerge) {
     	    input.saveModel(resetMerge);
     	    // commit the conversation and start a new transaction immediately
     	    conversation.commit(true);

Also available in: Unified diff