/ - 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);

                 boolean proceed = MessageDialog.openQuestion(null,
                         "Save changes", "You have made changes that must be saved before this query can be executed. Would you like to proceed?");
                 if (proceed) {
                     editor.save(new NullProgressMonitor());
                     editor.save(new NullProgressMonitor(), false);
                 } else {
                     return ;
+                }

+    	}
     	public void saveModel(){
     	    saveModel(true);
+    	}
     	public void saveModel(boolean resetMerge){
     	    //delete entities
     	    for(Entry<T, DeleteConfiguratorBase> entry:toDelete.entrySet()){
     	        try {
-...
+                }
+    	    }
     	    toDelete.clear();
     	    //merge entities
     	    for(T mergeCandidate:mergeCandidates){
     	        merge(mergeCandidate, mergeTarget);
     	    if(resetMerge){
     	        //merge entities
     	        for(T mergeCandidate:mergeCandidates){
     	            merge(mergeCandidate, mergeTarget);
+    	        }
     	        mergeCandidates.clear();
     	        mergeTarget = null;
+    	    }
     	    mergeCandidates.clear();
     	    mergeTarget = null;
+    	}

Also available in: Unified diff