ref #9280 adapt TaxEditor to new Term.getLabel() (cont.)

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
index 2be7d7433ff2d48d0e12718b5ae661bd1fcb335b..212e3020775352c9a9b59ba21ea0ee4df0d69193 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
@@ -282,7 +282,7 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
         composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
         composite.setLayout(new GridLayout(2, false));
         Label label = new Label(composite, SWT.NONE);
-        label.setText(termType.getMessage());
+        label.setText(termType.getLabel());
         Button btnRefresh = new Button(composite, SWT.PUSH);
         btnRefresh.setImage(ImageResources.getImage(ImageResources.REFRESH));
         btnRefresh.setToolTipText("Refresh");

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java.orig b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java.orig
new file mode 100644 (file)
index 0000000..da723c7
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java.orig
@@ -0,0 +1,73 @@
+/**
+* Copyright (C) 2017 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+
+import javax.inject.Named;
+
+import org.eclipse.e4.core.di.annotations.CanExecute;
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.di.UISynchronize;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.services.IServiceConstants;
+
+import eu.etaxonomy.cdm.model.term.TermTree;
+import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
+import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.operation.CreateFeatureTreeOperation;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
+
+/**
+ * @author pplitzner
+ * @since Jul 12, 2017
+ */
+public class CreateFeatureTreeHandler {
+
+    @Execute
+    public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart, UISynchronize sync){
+        IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+
+        if (StoreUtil.promptCheckIsDirty(editor)) {
+            return;
+        }
+<<<<<<< HEAD
+        Object[] expandedElements =  ((AbstractTermTreeEditor)editor).getViewer().getExpandedElements();
+        TermTree newTree = TermTree.NewInstance(editor.getTermType());
+=======
+
+        TermTree<?> newTree = TermTree.NewInstance(editor.getTermType());
+>>>>>>> cleanup
+        newTree.setAllowDuplicates(false);
+        newTree.setFlat(false);
+        newTree.setOrderRelevant(true);
+        newTree.setTitleCache(String.format("New %s tree", editor.getTermType().getMessage()));
+
+        CreateFeatureTreeOperation operation = new CreateFeatureTreeOperation(newTree, editor, editor);
+        TermTreeDto newDto = TermTreeDto.fromTree(newTree);
+        editor.setDirty();
+//        AbstractUtility.executeOperation(operation, sync);
+        editor.addOperation(operation);
+        ((AbstractTermTreeEditor)editor).putTree(newDto);
+        ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
+
+        ((AbstractTermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
+
+    }
+
+    @CanExecute
+    public boolean canExecute(
+            @Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
+            MHandledMenuItem menuItem) {
+        boolean canExecute = false;
+        canExecute = thisPart.getObject() instanceof IFeatureTreeEditor;
+        menuItem.setVisible(canExecute);
+        return canExecute;
+    }
+}