ref #6907, #6931 Add "expand" item to factual data part and uses part

diff --git a/eu.etaxonomy.taxeditor.editor/fragment.e4xmi b/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
index ff49166ee0aebbefaea76946199549f069d18d7c..1e9535400931006cc2b73dec7dd4685af8d760c6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
@@ -5,6 +5,7 @@
   <imports xsi:type="commands:Command" xmi:id="_majwMEaQEeeXMc6kSYO7Xg" elementId="org.eclipse.ui.file.save"/>
   <imports xsi:type="commands:Command" xmi:id="_oBEz8GhvEee3K4uKJljEYg" elementId="eu.etaxonomy.taxeditor.store.command.featureTree.removeFeature"/>
   <imports xsi:type="commands:Command" xmi:id="_0WYQcL2lEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.workbench.command.collapse"/>
+  <imports xsi:type="commands:Command" xmi:id="_vDKPoL4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.workbench.command.expand"/>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_gSpRsDQDEeeTNOFVGI4q2w" featurename="descriptors" parentElementId="xpath:/">
     <elements xsi:type="basic:PartDescriptor" xmi:id="_gSpRsTQDEeeTNOFVGI4q2w" elementId="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView" label="%command.label.DERIVATIVE_EDITOR" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png" tooltip="%command.label.DERIVATIVE_EDITOR" allowMultiple="true" category="" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
       <tags>View</tags>
@@ -114,8 +115,9 @@
         <children xsi:type="menu:HandledMenuItem" xmi:id="_rLS9EIGxEeehlNPrK_b5JA" elementId="eu.etaxonomy.taxeditor.editor.factualData.delete" label="%command.label.30" command="_AqgMcIG5EeehlNPrK_b5JA"/>
       </menus>
       <toolbar xmi:id="_sfp2sL2jEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.editor.toolbar.0">
-        <children xsi:type="menu:HandledToolItem" xmi:id="_t7kbEL2jEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.editor.handledtoolitem.commandname41" label="%command.name.41" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/link_obj.gif" type="Check" command="_4eDWoIy0EeeQaL4TL8oz7Q"/>
-        <children xsi:type="menu:HandledToolItem" xmi:id="_1ltxYL2lEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.editor.handledtoolitem.collapse" label="Collapse" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/collapseall.gif" command="_0WYQcL2lEeeyWfw0n8-ICQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_t7kbEL2jEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.editor.handledtoolitem.factual.showIndividualAssociations" label="%command.name.41" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/link_obj.gif" type="Check" command="_4eDWoIy0EeeQaL4TL8oz7Q"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_1ltxYL2lEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.editor.factual.handledtoolitem.collapse" label="Collapse" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/collapseall.gif" command="_0WYQcL2lEeeyWfw0n8-ICQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="_xqBkML4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.editor.factual.handledtoolitem.expand" label="Expand" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/expandAll.jpg" command="_vDKPoL4vEeewU62zpvPllA"/>
       </toolbar>
     </elements>
     <elements xsi:type="basic:PartDescriptor" xmi:id="_KJxRIIZ4EeeOc9DZcjNN7g" elementId="eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4" label="%view.name.2" iconURI="" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4">
@@ -188,6 +190,10 @@
         <children xsi:type="menu:MenuSeparator" xmi:id="_xMcucJRNEeeDJ72ZvUwCLA" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.17"/>
         <children xsi:type="menu:HandledMenuItem" xmi:id="_1STmFJRMEeeDJ72ZvUwCLA" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.concept.delete" label="%command.label.35" command="_EydEsJROEeeDJ72ZvUwCLA"/>
       </menus>
+      <toolbar xmi:id="_2-u_EL4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.editor.toolbar.1">
+        <children xsi:type="menu:HandledToolItem" xmi:id="_3xn0kL4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.editor.handledtoolitem.uses.collapse" label="Collapse" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/collapseall.gif" command="_0WYQcL2lEeeyWfw0n8-ICQ"/>
+        <children xsi:type="menu:HandledToolItem" xmi:id="__fcb4L4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.editor.factual.handledtoolitem.uses.expand" label="Expand" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/expandAll.jpg" command="_vDKPoL4vEeewU62zpvPllA"/>
+      </toolbar>
     </elements>
     <elements xsi:type="basic:PartDescriptor" xmi:id="_gIHnIKNpEeebGZ23ERGMGw" elementId="eu.etaxonomy.taxeditor.editor.view.concept.graph.e4.ConceptGraphViewE4" label="%view.name.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/address-book-new.png" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.concept.graph.e4.ConceptGraphViewE4"/>
     <elements xsi:type="basic:PartDescriptor" xmi:id="_rg3MoKKbEeee0INlRJv_6Q" elementId="eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4" label="%editor.name.8" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/check.png" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4"/>

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
index 9d5477fa50a58a71c5f6aec0b0a203d02f517240..358b0d7eee2336e4ecb6ac6b090df96dbd4e0000 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
@@ -20,9 +20,6 @@ import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.e4.ui.services.EMenuService;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.AbstractTreeViewer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -32,7 +29,6 @@ import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;
 
@@ -60,7 +56,6 @@ import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;
 import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
-import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.view.e4.AbstractCdmEditorPartE4;
@@ -83,10 +78,6 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
      */
     protected Map<DescriptionBase<?>, FeatureNodeContainerTree> featureNodeContainerCache = new HashMap<DescriptionBase<?>, FeatureNodeContainerTree>();
 
-    protected ToggleDescriptionAction showAllElementsAction;
-
-    protected ToggleDescriptionAction hideAllElementsAction;
-
     protected int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;
 
     private DescriptiveContentProvider provider;
@@ -121,22 +112,8 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
         //create context menu
         menuService.registerContextMenu(viewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.factualDataView");
 
-        showAllElementsAction = new ToggleDescriptionAction(false);
-        hideAllElementsAction = new ToggleDescriptionAction(true);
-
-        //FIXME E4 implement toolbar
-//        createToolbar();
-
-        //FIXME E4 migrate drag and drop
     }
 
-//    protected void createToolbar() {
-//        IToolBarManager toolBarManager = getViewSite().getActionBars().getToolBarManager();
-//        toolBarManager.add(showAllElementsAction);
-//        toolBarManager.add(hideAllElementsAction);
-//    }
-
-
     @Override
     public void selectionChanged_internal(Object selection, MPart activePart, MPart thisPart) {
         if(activePart==thisPart){
@@ -192,46 +169,6 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
         return Messages.DescriptiveViewPart_FACTUAL_DATA;
     }
 
-    /**
-     *
-     * @author n.hoffmann
-     * @created May 28, 2010
-     * @version 1.0
-     */
-    protected class ToggleDescriptionAction extends Action{
-        private final boolean expanded;
-
-        public ToggleDescriptionAction(boolean expand){
-            super(null, IAction.AS_PUSH_BUTTON);
-            expanded = expand;
-            setImageAndTooltip();
-        }
-
-        private void setImageAndTooltip(){
-            setImageDescriptor(new ImageDescriptor() {
-                @Override
-                public ImageData getImageData() {
-                    setText(expanded ? Messages.DescriptiveViewPart_COLLAPSE_ALL : Messages.DescriptiveViewPart_EXPAND_ALL);
-                    String resource = expanded ? ImageResources.COLLAPSE_ALL : ImageResources.EXPAND_ALL;
-                    return ImageResources.getImage(resource).getImageData();
-                }
-            });
-
-            String toolTipText = expanded ? Messages.DescriptiveViewPart_COLLAPSE_ALL : Messages.DescriptiveViewPart_SHOW_ALL_DATA;
-            setToolTipText(toolTipText);
-        }
-
-        @Override
-        public void run() {
-            if(expanded){
-                ((AbstractTreeViewer) viewer).collapseAll();
-            }else{
-                ((AbstractTreeViewer) viewer).expandAll();
-            }
-            setImageAndTooltip();
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public void changed(Object object) {
@@ -295,7 +232,6 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
     }
 
     public void toggleShowOnlyIndividualAssociations(){
-        //FIXME E4 migrate toggle menu icon
         provider.toggleShowOnlyIndividualAssociations();
         viewer.refresh();
     }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
index 8aec7e406ecda851753ccb5a9008795f7a838de1..3a6b6468a62e924b5384423b884c704a462fc85e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
@@ -68,17 +68,10 @@ public class UsesViewPartE4 extends FactualDataPartE4 {
         selectionChangedListener = (event -> selService.setSelection(AbstractUtility.getElementsFromSelectionChangedEvent(event)));
         treeViewer.addSelectionChangedListener(selectionChangedListener);
 
-        //FIXME E4 migrate toggle actions
-//        showAllElementsAction = new ToggleDescriptionAction(false);
-//        hideAllElementsAction = new ToggleDescriptionAction(true);
-
         //create context menu
         menuService.registerContextMenu(treeViewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.usesView");
 
         viewer = treeViewer;
-
-        //FIXME E4 implement toolbar
-//        createToolbar();
     }
 
     @Override