package eu.etaxonomy.taxeditor.featuretree.e4;
-import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.inject.Inject;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.e4.ui.di.Focus;
import org.eclipse.e4.ui.di.Persist;
+import org.eclipse.e4.ui.di.UISynchronize;
import org.eclipse.e4.ui.model.application.ui.MDirtyable;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.services.EMenuService;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IMemento;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.description.FeatureNode;
import eu.etaxonomy.cdm.model.description.FeatureTree;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
+import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
+import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
+import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.IContextListener;
+import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
-import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
+import eu.etaxonomy.taxeditor.store.AppModelId;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.dialog.selection.FeatureTreeSelectionDialog;
-import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.workbench.part.IE4ViewerPart;
/**
* @date 06.06.2017
*
*/
-public class FeatureTreeEditor implements ICdmEntitySessionEnabled, ModifyListener, ISelectionChangedListener,
- IE4ViewerPart, IE4SavablePart, IPartContentHasDetails, IPartContentHasSupplementalData, IContextListener, IConversationEnabled {
+public class FeatureTreeEditor implements IFeatureTreeEditor, ISelectionChangedListener,
+ IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
+ IContextListener, IConversationEnabled, IDirtyMarkable {
private ConversationHolder conversation;
@Inject
private MDirtyable dirty;
- private FeatureTreeEditorComposite composite;
+ @Inject
+ private UISynchronize sync;
@Inject
private MPart thisPart;
+ private TreeViewer viewer;
+
@Inject
public FeatureTreeEditor() {
CdmStore.getContextManager().addContextListener(this);
}
- /** {@inheritDoc} */
@PostConstruct
public void createControl(Composite parent, EMenuService menuService){
if (CdmStore.isActive()){
else{
return;
}
- composite = new FeatureTreeEditorComposite(parent, SWT.NULL);
- composite.init(new FeatureNodeDragListener(composite.getViewer()),
- new FeatureNodeDropAdapter(dirty, composite.getViewer()), this, new SelectionAdapter() {
+ parent.setLayout(new FillLayout());
+ viewer = new TreeViewer(parent);
+ viewer.setContentProvider(new FeatureTreeContentProvider());
+ viewer.setLabelProvider(new FeatureTreeLabelProvider());
+
+ int ops = DND.DROP_COPY | DND.DROP_MOVE;
+ Transfer[] transfers = new Transfer[] {
+ FeatureNodeTransfer.getInstance(),
+ TermTransfer.getInstance(),
+ LocalSelectionTransfer.getTransfer()};
+ viewer.addDragSupport(ops, transfers, new FeatureNodeDragListener(viewer));
+ viewer.addDropSupport(ops, transfers, new FeatureTreeDropAdapter(this, viewer, sync));
+ viewer.addSelectionChangedListener(this);
+ viewer.getTree().addKeyListener(new KeyAdapter() {
@Override
- public void widgetSelected(SelectionEvent e) {
- if(isDirty()){
- MessageDialog dialog;
- String[] buttonLables = {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL};
- dialog = new MessageDialog(null, "Unsaved changes", null, "You have unsaved changes. Do you want to save?",
- MessageDialog.QUESTION_WITH_CANCEL, 0, buttonLables);
- int returnCode = dialog.open();
-
- if (returnCode == 0){
- //YES
- save(new NullProgressMonitor());
- } else if (returnCode == 1){
- //NO
- if(CdmStore.isActive()){
- clearSession();
- initSession();
- composite.setSelectedTree(null);
- }
- } else if (returnCode == 2){
- //CANCEL
- return;
- }
+ public void keyPressed(KeyEvent e) {
+ if(e.stateMask == SWT.MOD1 && e.keyCode == 'c'){
+ copy(viewer.getStructuredSelection());
}
- FeatureTree tree = FeatureTreeSelectionDialog.select(composite.getDisplay().getActiveShell(), //conversation,
- null);
- if (tree != null) {
- composite.setSelectedTree(tree);
+ else if(e.stateMask == SWT.MOD1 && e.keyCode == 'v'){
+ paste(viewer.getStructuredSelection());
}
}
- }, this);
+ });
+
+ List<FeatureTree> trees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
+ Collections.sort(trees, (tree1, tree2) -> tree1.getTitleCache().compareTo(tree2.getTitleCache()));
+ viewer.setInput(trees);
//create context menu
- menuService.registerContextMenu(composite.getViewer().getControl(), "eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor");
+ menuService.registerContextMenu(viewer.getControl(), AppModelId.POPUPMENU_EU_ETAXONOMY_TAXEDITOR_STORE_POPUPMENU_FEATURETREEEDITOR);
+ }
+
+ public void paste(IStructuredSelection selection) {
+ if (StoreUtil.promptCheckIsDirty(this)) {
+ return;
+ }
+
+ ISelection clipBoardSelection = LocalSelectionTransfer.getTransfer().getSelection();
+ Object firstElement = selection.getFirstElement();
+ FeatureNode parentNode = null;
+ if(firstElement instanceof FeatureNode){
+ parentNode = (FeatureNode) firstElement;
+ }
+ else if(firstElement instanceof FeatureTree){
+ parentNode = ((FeatureTree)firstElement).getRoot();
+ }
+ if(parentNode!=null){
+ FeatureNode copiedNode = (FeatureNode) ((IStructuredSelection)clipBoardSelection).getFirstElement();
+
+ AddFeatureOperation operation = new AddFeatureOperation(copiedNode.getFeature(), parentNode, this, this);
+ AbstractUtility.executeOperation(operation, sync);
+ }
+
+ }
+
+ public void copy(IStructuredSelection selection) {
+ LocalSelectionTransfer.getTransfer().setSelection(selection);
}
private void initSession(){
if(conversation == null){
conversation = CdmStore.createConversation();
}
- if(cdmEntitySession!=null){
+ if(cdmEntitySession==null){
cdmEntitySession = CdmStore.getCurrentSessionManager().newSession(this, true);
}
}
this.dirty.setDirty(isDirty);
}
- public boolean isDirty(){
- return dirty.isDirty();
- }
-
- public FeatureTree getSelectedFeatureTree(){
- return composite.getFeatureTree();
- }
-
- /** {@inheritDoc} */
@Override
- public void modifyText(ModifyEvent e) {
- composite.getFeatureTree().setTitleCache(((Text) e.widget).getText(), true);
- setDirty(true);
+ public boolean isDirty(){
+ return dirty.isDirty();
}
- /** {@inheritDoc} */
@Override
public void selectionChanged(SelectionChangedEvent event) {
//propagate selection
- selService.setSelection(AbstractUtility.getElementsFromSelectionChangedEvent(event));
+ selService.setSelection(event.getSelection());
}
@Focus
public void focus(){
- if(composite!=null){
- composite.getViewer().getControl().setFocus();
+ if(viewer!=null){
+ viewer.getControl().setFocus();
}
if(conversation!=null && !conversation.isBound()){
conversation.bind();
@Override
public void refresh(){
- composite.getViewer().refresh();
+ viewer.refresh();
}
public TreeViewer getViewer(){
- return composite.getViewer();
+ return viewer;
}
- /**
- * {@inheritDoc}
- */
@Override
public IStructuredSelection getSelection() {
- return (IStructuredSelection) composite.getViewer().getSelection();
+ return (IStructuredSelection) viewer.getSelection();
}
- /**
- * {@inheritDoc}
- */
@Override
public ConversationHolder getConversationHolder() {
return conversation;
// commit the conversation and start a new transaction immediately
conversation.commit(true);
- CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(composite.getFeatureTree());
+ CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(getRootEntities());
+
+ initializeTrees();
this.setDirty(false);
}
+ private void initializeTrees() {
+ Object[] expandedElements = viewer.getExpandedElements();
+ viewer.getTree().removeAll();
+ List<FeatureTree> trees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
+ viewer.setInput(trees);
+ viewer.setExpandedElements(expandedElements);
+ }
+
@PreDestroy
public void dispose(){
+ selService.setSelection(null);
clearSession();
}
return propertyPathMap;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<FeatureTree> getRootEntities() {
- List<FeatureTree> root = new ArrayList<>();
- root.add(composite.getFeatureTree());
- return root;
+ return (List<FeatureTree>) viewer.getInput();
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStop(IMemento memento, IProgressMonitor monitor) {
//close view when workbench closes
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStart(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextRefresh(IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void update(CdmDataChangeMap arg0) {
}
+ @Override
+ public void changed(Object element) {
+ dirty.setDirty(true);
+ viewer.refresh();
+ }
+
+ @Override
+ public void forceDirty() {
+ dirty.setDirty(true);
+ }
+
+ @Override
+ public boolean postOperation(Object objectAffectedByOperation) {
+ initializeTrees();
+ viewer.refresh();
+ if(objectAffectedByOperation instanceof FeatureNode){
+ FeatureNode node = (FeatureNode)objectAffectedByOperation;
+ viewer.expandToLevel(node.getFeatureTree(), 1);
+ }
+ if(objectAffectedByOperation!=null){
+ StructuredSelection selection = new StructuredSelection(objectAffectedByOperation);
+ viewer.setSelection(selection);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean onComplete() {
+ return false;
+ }
+
}
BGBM BDI Projects / taxeditor.git / blobdiff