Project

General

Profile

« Previous | Next » 

Revision dc4dc742

Added by Katja Luther about 5 years ago

fix #8234: moveDescriptionOperation should be executed while saving

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
40 40 
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
41 41 
import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
42 42 
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionToOtherTaxonOperation;
43 
import eu.etaxonomy.taxeditor.model.AbstractUtility;
44 43 
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
45 44 
import eu.etaxonomy.taxeditor.model.MessagingUtils;
46 45 
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
......
145 144 
                    this,
146 145 
                    editor,
147 146 
                    editor.getEditorInput());
148 
            AbstractUtility.executeOperation(operation, sync);
147 
            editor.getEditorInput().addOperation(operation);
148 
            editor.setDirty();
149 
            editor.getTaxon().removeDescription(taxonDescription);
150 
            editor.redraw();
151 
           // AbstractUtility.executeOperation(operation, sync);
149 152 
        }
150 153 

  		




  151
  154
  
    

  		




  ......




  159
  162
  
    
            @Override


  		




  160
  163
  
    
            public void run() {


  		




  161
  164
  
    
                //FIXME E4 migrate


  		




  162
  
  
    
//                AbstractUtility.close(editor);


  		




  163
  
  
    
//


  		




  164
  165
  
    
                try {


  		




  165
  
  
    
//                    MultiPageTaxonEditor possibleOpenEditor = (MultiPageTaxonEditor) EditorUtil.findEditorByTaxonNodeUuid(newAcceptedTaxonNodeUuid);


  		




  166
  
  
    
//                    if(possibleOpenEditor != null){


  		




  167
  
  
    
//                        AbstractUtility.close(possibleOpenEditor);


  		




  168
  
  
    
//                    }


  		




  169
  
  
    
//                    EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, oldAcceptedTaxonNodeUuid);


  		




  170
  
  
    
//                    EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAME_EDITOR, newAcceptedTaxonNodeUuid);


  		




  171
  166
  
    
                    EditorUtil.openTaxonNodeE4(newAcceptedTaxonNodeUuid, modelService, partService, application);


  		




  172
  
  
    
                    EditorUtil.openTaxonNodeE4(oldAcceptedTaxonNodeUuid, modelService, partService, application);


  		




  173
  
  
    
//                } catch (PartInitException e) {


  		




  174
  
  
    
//                    MessagingUtils.error(this.getClass(), e);


  		




  175
  
  
    
//                    throw new RuntimeException(e);


  		




  176
  167
  
    
                } catch (Exception e) {


  		




  177
  168
  
    
                    MessagingUtils.warningDialog(Messages.MoveDescriptionToOtherTaxonHandler_CREATE_FAILED, this, e.getMessage());


  		




  178
  169
  
    
                }


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java
    
  





  67
  67
  
    
	@Override


  		




  68
  68
  
    
	public IStatus execute(IProgressMonitor monitor, IAdaptable info)


  		




  69
  69
  
    
			throws ExecutionException {


  		




  70
  
  
    
		monitor.worked(20);


  		




  
  70
  
    
	    if (monitor != null){


  		




  
  71
  
    
	        monitor.worked(20);


  		




  
  72
  
    
	    }


  		




  71
  73
  
    
		bind();


  		




  72
  74
  
    
		CdmStore.getService(IDescriptionService.class).moveTaxonDescription(description.getUuid(), newAcceptedTaxonNode.getTaxon().getUuid());


  		




  73
  
  
    
		monitor.worked(40);


  		




  
  75
  
    
		if (monitor != null){


  		




  
  76
  
    
            monitor.worked(40);


  		




  
  77
  
    
        }


  		




  74
  78
  
    

  		




  75
  79
  
    
		return postExecute(description);


  		




  76
  80
  
    
	}


  		












Also available in:  Unified diff