Project

General

Profile

« Previous | Next » 

Revision 8263cbc9

Added by Patrick Plitzner over 6 years ago

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

View differences:

eu.etaxonomy.taxeditor.editor/fragment.e4xmi
5 5 
  <imports xsi:type="commands:Command" xmi:id="_majwMEaQEeeXMc6kSYO7Xg" elementId="org.eclipse.ui.file.save"/>
6 6 
  <imports xsi:type="commands:Command" xmi:id="_oBEz8GhvEee3K4uKJljEYg" elementId="eu.etaxonomy.taxeditor.store.command.featureTree.removeFeature"/>
7 7 
  <imports xsi:type="commands:Command" xmi:id="_0WYQcL2lEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.workbench.command.collapse"/>
8 
  <imports xsi:type="commands:Command" xmi:id="_vDKPoL4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.workbench.command.expand"/>
8 9 
  <fragments xsi:type="fragment:StringModelFragment" xmi:id="_gSpRsDQDEeeTNOFVGI4q2w" featurename="descriptors" parentElementId="xpath:/">
9 10 
    <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">
10 11 
      <tags>View</tags>
......
114 115 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_rLS9EIGxEeehlNPrK_b5JA" elementId="eu.etaxonomy.taxeditor.editor.factualData.delete" label="%command.label.30" command="_AqgMcIG5EeehlNPrK_b5JA"/>
115 116 
      </menus>
116 117 
      <toolbar xmi:id="_sfp2sL2jEeeyWfw0n8-ICQ" elementId="eu.etaxonomy.taxeditor.editor.toolbar.0">
117 
        <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"/>
118 
        <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"/>
118 
        <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"/>
119 
        <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"/>
120 
        <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"/>
119 121 
      </toolbar>
120 122 
    </elements>
121 123 
    <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 190 
        <children xsi:type="menu:MenuSeparator" xmi:id="_xMcucJRNEeeDJ72ZvUwCLA" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.17"/>
189 191 
        <children xsi:type="menu:HandledMenuItem" xmi:id="_1STmFJRMEeeDJ72ZvUwCLA" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.concept.delete" label="%command.label.35" command="_EydEsJROEeeDJ72ZvUwCLA"/>
190 192 
      </menus>
193 
      <toolbar xmi:id="_2-u_EL4vEeewU62zpvPllA" elementId="eu.etaxonomy.taxeditor.editor.toolbar.1">
194 
        <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"/>
195 
        <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"/>
196 
      </toolbar>
191 197 
    </elements>
192 198 
    <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"/>
193 199 
    <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"/>
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
20 20 
import org.eclipse.e4.core.contexts.IEclipseContext;
21 21 
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
22 22 
import org.eclipse.e4.ui.services.EMenuService;
23 
import org.eclipse.jface.action.Action;
24 
import org.eclipse.jface.action.IAction;
25 
import org.eclipse.jface.resource.ImageDescriptor;
26 23 
import org.eclipse.jface.viewers.AbstractTreeViewer;
27 24 
import org.eclipse.jface.viewers.IStructuredSelection;
28 25 
import org.eclipse.jface.viewers.ITreeContentProvider;
......
32 29 
import org.eclipse.swt.SWT;
33 30 
import org.eclipse.swt.dnd.DND;
34 31 
import org.eclipse.swt.dnd.Transfer;
35 
import org.eclipse.swt.graphics.ImageData;
36 32 
import org.eclipse.swt.widgets.Composite;
37 33 
import org.eclipse.swt.widgets.Tree;
38 34 

  		




  ......




  60
  56
  
    
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;


  		




  61
  57
  
    
import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData;


  		




  62
  58
  
    
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;


  		




  63
  
  
    
import eu.etaxonomy.taxeditor.model.ImageResources;


  		




  64
  59
  
    
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;


  		




  65
  60
  
    
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;


  		




  66
  61
  
    
import eu.etaxonomy.taxeditor.view.e4.AbstractCdmEditorPartE4;


  		




  ......




  83
  78
  
    
     */


  		




  84
  79
  
    
    protected Map<DescriptionBase<?>, FeatureNodeContainerTree> featureNodeContainerCache = new HashMap<DescriptionBase<?>, FeatureNodeContainerTree>();


  		




  85
  80
  
    

  		




  86
  
  
    
    protected ToggleDescriptionAction showAllElementsAction;


  		




  87
  
  
    

  		




  88
  
  
    
    protected ToggleDescriptionAction hideAllElementsAction;


  		




  89
  
  
    

  		




  90
  81
  
    
    protected int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;


  		




  91
  82
  
    

  		




  92
  83
  
    
    private DescriptiveContentProvider provider;


  		




  ......




  121
  112
  
    
        //create context menu


  		




  122
  113
  
    
        menuService.registerContextMenu(viewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.factualDataView");


  		




  123
  114
  
    

  		




  124
  
  
    
        showAllElementsAction = new ToggleDescriptionAction(false);


  		




  125
  
  
    
        hideAllElementsAction = new ToggleDescriptionAction(true);


  		




  126
  
  
    

  		




  127
  
  
    
        //FIXME E4 implement toolbar


  		




  128
  
  
    
//        createToolbar();


  		




  129
  
  
    

  		




  130
  
  
    
        //FIXME E4 migrate drag and drop


  		




  131
  115
  
    
    }


  		




  132
  116
  
    

  		




  133
  
  
    
//    protected void createToolbar() {


  		




  134
  
  
    
//        IToolBarManager toolBarManager = getViewSite().getActionBars().getToolBarManager();


  		




  135
  
  
    
//        toolBarManager.add(showAllElementsAction);


  		




  136
  
  
    
//        toolBarManager.add(hideAllElementsAction);


  		




  137
  
  
    
//    }


  		




  138
  
  
    

  		




  139
  
  
    

  		




  140
  117
  
    
    @Override


  		




  141
  118
  
    
    public void selectionChanged_internal(Object selection, MPart activePart, MPart thisPart) {


  		




  142
  119
  
    
        if(activePart==thisPart){


  		




  ......




  192
  169
  
    
        return Messages.DescriptiveViewPart_FACTUAL_DATA;


  		




  193
  170
  
    
    }


  		




  194
  171
  
    

  		




  195
  
  
    
    /**


  		




  196
  
  
    
     *


  		




  197
  
  
    
     * @author n.hoffmann


  		




  198
  
  
    
     * @created May 28, 2010


  		




  199
  
  
    
     * @version 1.0


  		




  200
  
  
    
     */


  		




  201
  
  
    
    protected class ToggleDescriptionAction extends Action{


  		




  202
  
  
    
        private final boolean expanded;


  		




  203
  
  
    

  		




  204
  
  
    
        public ToggleDescriptionAction(boolean expand){


  		




  205
  
  
    
            super(null, IAction.AS_PUSH_BUTTON);


  		




  206
  
  
    
            expanded = expand;


  		




  207
  
  
    
            setImageAndTooltip();


  		




  208
  
  
    
        }


  		




  209
  
  
    

  		




  210
  
  
    
        private void setImageAndTooltip(){


  		




  211
  
  
    
            setImageDescriptor(new ImageDescriptor() {


  		




  212
  
  
    
                @Override


  		




  213
  
  
    
                public ImageData getImageData() {


  		




  214
  
  
    
                    setText(expanded ? Messages.DescriptiveViewPart_COLLAPSE_ALL : Messages.DescriptiveViewPart_EXPAND_ALL);


  		




  215
  
  
    
                    String resource = expanded ? ImageResources.COLLAPSE_ALL : ImageResources.EXPAND_ALL;


  		




  216
  
  
    
                    return ImageResources.getImage(resource).getImageData();


  		




  217
  
  
    
                }


  		




  218
  
  
    
            });


  		




  219
  
  
    

  		




  220
  
  
    
            String toolTipText = expanded ? Messages.DescriptiveViewPart_COLLAPSE_ALL : Messages.DescriptiveViewPart_SHOW_ALL_DATA;


  		




  221
  
  
    
            setToolTipText(toolTipText);


  		




  222
  
  
    
        }


  		




  223
  
  
    

  		




  224
  
  
    
        @Override


  		




  225
  
  
    
        public void run() {


  		




  226
  
  
    
            if(expanded){


  		




  227
  
  
    
                ((AbstractTreeViewer) viewer).collapseAll();


  		




  228
  
  
    
            }else{


  		




  229
  
  
    
                ((AbstractTreeViewer) viewer).expandAll();


  		




  230
  
  
    
            }


  		




  231
  
  
    
            setImageAndTooltip();


  		




  232
  
  
    
        }


  		




  233
  
  
    
    }


  		




  234
  
  
    

  		




  235
  172
  
    
    /** {@inheritDoc} */


  		




  236
  173
  
    
    @Override


  		




  237
  174
  
    
    public void changed(Object object) {


  		




  ......




  295
  232
  
    
    }


  		




  296
  233
  
    

  		




  297
  234
  
    
    public void toggleShowOnlyIndividualAssociations(){


  		




  298
  
  
    
        //FIXME E4 migrate toggle menu icon


  		




  299
  235
  
    
        provider.toggleShowOnlyIndividualAssociations();


  		




  300
  236
  
    
        viewer.refresh();


  		




  301
  237
  
    
    }


  		












  

    
      eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
    
  





  68
  68
  
    
        selectionChangedListener = (event -> selService.setSelection(AbstractUtility.getElementsFromSelectionChangedEvent(event)));


  		




  69
  69
  
    
        treeViewer.addSelectionChangedListener(selectionChangedListener);


  		




  70
  70
  
    

  		




  71
  
  
    
        //FIXME E4 migrate toggle actions


  		




  72
  
  
    
//        showAllElementsAction = new ToggleDescriptionAction(false);


  		




  73
  
  
    
//        hideAllElementsAction = new ToggleDescriptionAction(true);


  		




  74
  
  
    

  		




  75
  71
  
    
        //create context menu


  		




  76
  72
  
    
        menuService.registerContextMenu(treeViewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.usesView");


  		




  77
  73
  
    

  		




  78
  74
  
    
        viewer = treeViewer;


  		




  79
  
  
    

  		




  80
  
  
    
        //FIXME E4 implement toolbar


  		




  81
  
  
    
//        createToolbar();


  		




  82
  75
  
    
    }


  		




  83
  76
  
    

  		




  84
  77
  
    
    @Override


  		












Also available in:  Unified diff