Revision 9092e20b
Added by Patrick Plitzner over 5 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditor.java | ||
---|---|---|
21 | 21 |
import org.eclipse.core.runtime.IProgressMonitor; |
22 | 22 |
import org.eclipse.e4.ui.di.Focus; |
23 | 23 |
import org.eclipse.e4.ui.di.Persist; |
24 |
import org.eclipse.e4.ui.di.UISynchronize; |
|
24 | 25 |
import org.eclipse.e4.ui.model.application.ui.MDirtyable; |
25 | 26 |
import org.eclipse.e4.ui.model.application.ui.basic.MPart; |
26 | 27 |
import org.eclipse.e4.ui.services.EMenuService; |
... | ... | |
77 | 78 |
@Inject |
78 | 79 |
private MDirtyable dirty; |
79 | 80 |
|
81 |
@Inject |
|
82 |
private UISynchronize sync; |
|
83 |
|
|
80 | 84 |
@Inject |
81 | 85 |
private MPart thisPart; |
82 | 86 |
|
... | ... | |
106 | 110 |
TermTransfer.getInstance(), |
107 | 111 |
LocalSelectionTransfer.getTransfer()}; |
108 | 112 |
viewer.addDragSupport(ops, transfers, new FeatureNodeDragListener(viewer)); |
109 |
viewer.addDropSupport(ops, transfers, new FeatureNodeDropAdapter(this, viewer));
|
|
113 |
viewer.addDropSupport(ops, transfers, new FeatureTreeDropAdapter(this, viewer, sync));
|
|
110 | 114 |
viewer.addSelectionChangedListener(this); |
111 | 115 |
|
112 | 116 |
List<FeatureTree> trees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null); |
... | ... | |
196 | 200 |
|
197 | 201 |
CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(getRootEntities()); |
198 | 202 |
|
199 |
initialiseRootEntities();
|
|
203 |
initializeTrees();
|
|
200 | 204 |
|
201 | 205 |
this.setDirty(false); |
202 | 206 |
} |
203 | 207 |
|
204 |
private void initialiseRootEntities() {
|
|
208 |
private void initializeTrees() {
|
|
205 | 209 |
Object[] expandedElements = viewer.getExpandedElements(); |
206 | 210 |
viewer.getTree().removeAll(); |
207 | 211 |
List<FeatureTree> trees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null); |
... | ... | |
282 | 286 |
|
283 | 287 |
@Override |
284 | 288 |
public boolean postOperation(Object objectAffectedByOperation) { |
285 |
initialiseRootEntities();
|
|
289 |
initializeTrees();
|
|
286 | 290 |
viewer.refresh(); |
287 | 291 |
if(objectAffectedByOperation instanceof FeatureNode){ |
288 | 292 |
FeatureNode node = (FeatureNode)objectAffectedByOperation; |
Also available in: Unified diff
ref #6805 Fix term dragging into feature tree editor