merge trunk to branch

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / descriptive / DescriptiveViewPart.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
index b3799a0c3726771848b7df051ff53e77931fb27c..30db42aed714313840fd633d7008222a9d05882f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveViewPart.java
@@ -42,6 +42,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor;
+import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;
 import eu.etaxonomy.taxeditor.editor.key.AbstractGraphKeyEditor;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainerTree;
@@ -62,31 +63,25 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.desc"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.editor.view.descriptive";
        
-       private TreeViewer viewer;
+       protected TreeViewer viewer;
        
-       private Map<TaxonDescription, FeatureNodeContainerTree> featureNodeContainerCache = new HashMap<TaxonDescription, FeatureNodeContainerTree>();
+       protected Map<TaxonDescription, FeatureNodeContainerTree> featureNodeContainerCache = new HashMap<TaxonDescription, FeatureNodeContainerTree>();
 
-       private ToggleDescriptionAction showAllElementsAction;
+       protected ToggleDescriptionAction showAllElementsAction;
 
-       private ToggleDescriptionAction hideAllElementsAction;
+       protected ToggleDescriptionAction hideAllElementsAction;
 
-       private int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;
+       protected int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;
        
        /** {@inheritDoc} */
        @Override
        public void createViewer(Composite parent) {
-               
                viewer = new TreeViewer(new Tree(parent, SWT.MULTI | SWT.H_SCROLL
                                | SWT.V_SCROLL | SWT.FULL_SELECTION));
-                               
                viewer.setContentProvider(new DescriptiveContentProvider(featureNodeContainerCache));           
                viewer.setLabelProvider(new DescriptiveLabelProvider());
-               
                viewer.setSorter(new DescriptiveViewerSorter());
-               
                viewer.setAutoExpandLevel(2);
-               
-               
                Transfer[] transfers = new Transfer[] { DescriptionElementTransfer.getInstance() };
                viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
                                this));
@@ -123,7 +118,7 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
                return super.getInitialSelection();
        }
 
-       private void createToolbar() {
+       protected void createToolbar() {
                IToolBarManager toolBarManager = getViewSite().getActionBars().getToolBarManager();
                toolBarManager.add(showAllElementsAction);
                toolBarManager.add(hideAllElementsAction);
@@ -132,7 +127,7 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
        /*
         * TODO add to the views menu
         */
-       private void createMenu(){
+       protected void createMenu(){
                MenuManager menuManager = new MenuManager();
                menuManager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
                
@@ -165,6 +160,11 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
                        return;
                }
                
+               if(part instanceof DefinedTermEditor){
+                       showEmptyPage();
+                       return;
+               }
+               
                if(part instanceof MultiPageTaxonEditor){
                        if(! part.equals(this.part)){
                                IEditorInput input = ((IEditorPart) part).getEditorInput();
@@ -181,7 +181,7 @@ public class DescriptiveViewPart extends AbstractCdmEditorViewPart implements IP
         * @created May 28, 2010
         * @version 1.0
         */
-       private class ToggleDescriptionAction extends Action{
+       protected class ToggleDescriptionAction extends Action{
                private boolean expanded;
                
                public ToggleDescriptionAction(boolean expand){