- added context menu to DerivateView

diff --git a/.gitattributes b/.gitattributes
index 780377389f5028841dce0c8316921fc14fa58985..5c1f48b05f7404c3a22ebc7f2686aa49c082e768 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -466,6 +466,7 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/c
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java -text
+eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateLabelProvider.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java -text

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index a1c1dce738f470bd83b10f004de3fda72f789a9f..f83d1f80159f15d593a2a1683ba56c4f6dd822e0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -542,6 +542,28 @@
                style="push">
          </command>
       </menuContribution>
+      <menuContribution
+            locationURI="popup:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+         <command
+               commandId="eu.etaxonomy.taxeditor.description.commands.adddescrip"
+               label="New DerivedUni"
+               style="push">
+         </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.separator1"
+               visible="true">
+         </separator>
+         <dynamic
+               class="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu"
+               id="eu.etaxonomy.taxeditor.editor.view.derivate.CreateDerivateContextMenu">
+         </dynamic>
+         <command
+               commandId="eu.etaxonomy.taxeditor.editor.command1"
+               label="bla"
+               style="push"
+               tooltip="bla">
+         </command>
+      </menuContribution>
       
       
       

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java
new file mode 100644 (file)
index 0000000..cc19ff8
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/CreateDerivateContextMenu.java
@@ -0,0 +1,29 @@
+package eu.etaxonomy.taxeditor.editor.view.derivate;
+
+import org.eclipse.jface.action.ContributionItem;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+public class CreateDerivateContextMenu extends CompoundContributionItem {
+
+    /* (non-Javadoc)
+     * @see org.eclipse.ui.actions.CompoundContributionItem#getContributionItems()
+     */
+    @Override
+    protected IContributionItem[] getContributionItems() {
+        IContributionItem[] contributionItems = new IContributionItem[] {
+                new ContributionItem() {
+                    @Override
+                    public void fill(Menu menu, int index) {
+                        MenuItem menuItem = new MenuItem(menu, SWT.None);
+                        menuItem.setText("menuItem");
+                    };
+                }
+        };
+        return contributionItems;
+    }
+
+}

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateLabelProvider.java
index c8d861b76086ad0a826ecc4d2c9f2830583115b7..b7eac16b67be281f0af323cee70ec4d769556046 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateLabelProvider.java
@@ -3,6 +3,7 @@ package eu.etaxonomy.taxeditor.editor.view.derivate;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.swt.graphics.Image;
 
 public class DerivateLabelProvider extends ColumnLabelProvider implements IStyledLabelProvider {
 
@@ -12,4 +13,20 @@ public class DerivateLabelProvider extends ColumnLabelProvider implements IStyle
                return null;
        }
 
+       /* (non-Javadoc)
+        * @see org.eclipse.jface.viewers.ColumnLabelProvider#getText(java.lang.Object)
+        */
+       @Override
+       public String getText(Object element) {
+           return super.getText(element);
+       }
+
+       /* (non-Javadoc)
+        * @see org.eclipse.jface.viewers.ColumnLabelProvider#getImage(java.lang.Object)
+        */
+       @Override
+       public Image getImage(Object element) {
+           return super.getImage(element);
+       }
+
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index ce5036414611dcb8eb1234847b8b2601fa8676ce..9547a6830222c398e2179231a5aac6cf8db0db2c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -1,11 +1,14 @@
 package eu.etaxonomy.taxeditor.editor.view.derivate;
 
+import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.ui.IWorkbenchPart;
 
@@ -23,7 +26,7 @@ import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
 public class DerivateView extends AbstractCdmEditorViewPart implements IPartContentHasDetails, IPartContentHasSupplementalData {
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.desc"{trunked}</code> */
-       public static final String ID = "eu.etaxonomy.taxeditor.editor.view.derivate.SpecimenView";
+       public static final String ID = "eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView";
 
        protected TreeViewer viewer;
 
@@ -35,6 +38,16 @@ public class DerivateView extends AbstractCdmEditorViewPart implements IPartCont
                viewer.setAutoExpandLevel(2);
         // Propagate selection from viewer
         getSite().setSelectionProvider(viewer);
+
+        //create context menu
+        MenuManager menuManager = new MenuManager();
+
+        getSite().registerContextMenu(menuManager, viewer);
+
+        Control control = viewer.getControl();
+        Menu menu = menuManager.createContextMenu(control);
+
+        control.setMenu(menu);
        }
 
        @Override