Project

General

Profile

« Previous | Next » 

Revision 74f35d5f

Added by Katja Luther about 6 years ago

minor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/RemotingCdmUpdateOperation.java
20 20
import org.eclipse.e4.ui.model.application.MApplication;
21 21
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
22 22
import org.eclipse.e4.ui.workbench.modeling.EPartService;
23
import org.eclipse.swt.widgets.Display;
24 23

  
25 24
import eu.etaxonomy.cdm.api.application.CdmChangeEvent.Action;
26 25
import eu.etaxonomy.cdm.api.service.UpdateResult;
27
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
28
import eu.etaxonomy.cdm.model.common.CdmBase;
29
import eu.etaxonomy.cdm.model.taxon.Synonym;
30
import eu.etaxonomy.cdm.model.taxon.Taxon;
31
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
32 26

  
33 27

  
34 28
/**
......
41 35
    protected UpdateResult updateResult;
42 36
    public static boolean throwExceptions = false;
43 37
    protected EPartService partService = null;
38

  
44 39
    protected MPart activePart = null;
45 40
    protected MApplication application = null;
46 41

  
47 42
    /**
48 43
     * @param label
49 44
     */
50
    public RemotingCdmUpdateOperation(String label, Action action, Object source, boolean async, 
45
    public RemotingCdmUpdateOperation(String label, Action action, Object source, boolean async,
51 46
    		EPartService partService,
52 47
    		MPart activePart,
53 48
    		MApplication application) {
......
56 51
        this.activePart = activePart;
57 52
        this.application = application;
58 53
    }
59
    
54

  
60 55
    public RemotingCdmUpdateOperation(String label, Action action, Object source, boolean async){
61 56
        super(label, action, source, async);
62
       
57

  
63 58
    }
64 59

  
65 60
    /* (non-Javadoc)
......
143 138
        }
144 139
        return null;
145 140
    }
146
    
147
  
141

  
142

  
148 143
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/e4/RemotingCdmHandlerE4.java
18 18
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
19 19
import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
20 20
import org.eclipse.e4.ui.services.IServiceConstants;
21
import org.eclipse.e4.ui.workbench.modeling.EModelService;
21 22
import org.eclipse.e4.ui.workbench.modeling.EPartService;
22 23
import org.eclipse.jface.dialogs.ErrorDialog;
23 24
import org.eclipse.jface.viewers.IStructuredSelection;
......
36 37
    protected String label;
37 38
    protected EPartService partService;
38 39
	protected MApplication application;
40
	protected EModelService modelService;
39 41

  
40 42
    public RemotingCdmHandlerE4(String label) {
41 43
        this.label = label;
......
45 47
    public void execute(@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
46 48
            @Named(IServiceConstants.ACTIVE_SHELL)Shell shell,
47 49
            @Named(IServiceConstants.ACTIVE_PART)MPart activePart,
48
            MHandledMenuItem menuItem, EPartService partService, UISynchronize sync, MApplication application) {
50
            MHandledMenuItem menuItem, EPartService partService, UISynchronize sync, MApplication application,EModelService modelService) {
49 51
        this.partService = partService;
50 52
        this.application = application;
53
        this.modelService = modelService;
51 54
        IStatus allowStatus = allowOperations(selection, shell, activePart, menuItem);
52 55
        if(allowStatus.isOK()) {
53 56
            AbstractOperation op = prepareOperation(selection, shell, activePart, menuItem);

Also available in: Unified diff