Solves an issue with opening taxa from navigator. Improving BulkEditor context menu.

diff --git a/.gitattributes b/.gitattributes
index 7078b5e67f16d30ea774de01895428d122e2d9b7..5d3a0dd98fe2518996c1beeb60090e74717213f9 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -93,6 +93,7 @@ taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddDerivedUnitMediaHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AddFieldObjectMediaHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java -text

+taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java -text

 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/MergeGroupHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/RemoveMergeCandidateHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/MergeGroupHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java -text
 taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/RemoveMergeCandidateHandler.java -text

diff --git a/taxeditor-bulkeditor/plugin.xml b/taxeditor-bulkeditor/plugin.xml
index 807fedb286422639f2553f468b07ca2f05a79c4e..21004cd3d86dd3e4b2d825e44fea656569538725 100644 (file)
--- a/taxeditor-bulkeditor/plugin.xml
+++ b/taxeditor-bulkeditor/plugin.xml
@@ -55,10 +55,35 @@
       </menuContribution>\r
       <menuContribution\r
             locationURI="popup:#BulkEditorContext">\r
       </menuContribution>\r
       <menuContribution\r
             locationURI="popup:#BulkEditorContext">\r

+         <menu\r
+               label="New">\r
+            <dynamic\r
+                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"\r
+                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">\r
+            </dynamic>\r
+         </menu>\r

          <separator\r
                name="taxeditor-bulkeditor.separator1"\r
                visible="true">\r
          </separator>\r
          <separator\r
                name="taxeditor-bulkeditor.separator1"\r
                visible="true">\r
          </separator>\r

+         <command\r
+               commandId="org.eclipse.ui.views.showView"\r
+               label="Show Details"\r
+               style="push">\r
+            <parameter\r
+                  name="org.eclipse.ui.views.showView.viewId"\r
+                  value="eu.etaxonomy.taxeditor.editor.forms.detailsView">\r
+            </parameter>\r
+         </command>\r
+         <command\r
+               commandId="bulkeditor.commands.referencingobjects"\r
+               label="Show Referencing Objects"\r
+               style="push">\r
+         </command>\r
+         <separator\r
+               name="taxeditor-bulkeditor.separator4"\r
+               visible="true">\r
+         </separator>\r

          <command\r
                commandId="bulkeditor.commands.setmergetarget"\r
                label="Set Current Line as Target for Duplicate Removal"\r
          <command\r
                commandId="bulkeditor.commands.setmergetarget"\r
                label="Set Current Line as Target for Duplicate Removal"\r


@@ -105,31 +130,6 @@
                name="taxeditor-bulkeditor.separator2"\r
                visible="true">\r
          </separator>\r
                name="taxeditor-bulkeditor.separator2"\r
                visible="true">\r
          </separator>\r

-         <command\r
-               commandId="bulkeditor.commands.referencingobjects"\r
-               label="Show Referencing Objects"\r
-               style="push">\r
-         </command>\r
-         <command\r
-               commandId="org.eclipse.ui.views.showView"\r
-               label="Show Details"\r
-               style="push">\r
-            <parameter\r
-                  name="org.eclipse.ui.views.showView.viewId"\r
-                  value="eu.etaxonomy.taxeditor.editor.forms.detailsView">\r
-            </parameter>\r
-         </command>\r
-         <separator\r
-               name="taxeditor-bulkeditor.separator3"\r
-               visible="true">\r
-         </separator>\r
-         <menu\r
-               label="New">\r
-            <dynamic\r
-                  class="eu.etaxonomy.taxeditor.bulkeditor.command.DynamicNewObjectMenu"\r
-                  id="eu.etaxonomy.taxeditor.bulkeditor.dynamicNewMenu">\r
-            </dynamic>\r
-         </menu>\r

          <menu\r
                label="Set Marker Type">\r
             <dynamic\r
          <menu\r
                label="Set Marker Type">\r
             <dynamic\r


@@ -137,6 +137,15 @@
                   id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">\r
             </dynamic>\r
          </menu>\r
                   id="eu.etaxonomy.taxeditor.bulkeditor.dynamicMarkerTypeEditingMenu">\r
             </dynamic>\r
          </menu>\r

+         <separator\r
+               name="taxeditor-bulkeditor.separator3"\r
+               visible="true">\r
+         </separator>\r
+         <command\r
+               commandId="org.eclipse.ui.edit.delete"\r
+               label="Delete"\r
+               style="push">\r
+         </command>\r

       </menuContribution>\r
    </extension>\r
    <extension\r
       </menuContribution>\r
    </extension>\r
    <extension\r


@@ -244,7 +253,7 @@
          point="org.eclipse.ui.views">\r
       <view\r
             class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"\r
          point="org.eclipse.ui.views">\r
       <view\r
             class="eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView"\r

-            id="eu.etaxonomy.taxeditor.bulkeditor.referencingobjectsview"\r
+            id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"\r

             name="Referencing Objects"\r
             restorable="false">\r
       </view>\r
             name="Referencing Objects"\r
             restorable="false">\r
       </view>\r


@@ -317,6 +326,18 @@
             </with>\r
          </activeWhen>\r
       </handler>\r
             </with>\r
          </activeWhen>\r
       </handler>\r

+      <handler\r
+            class="eu.etaxonomy.taxeditor.bulkeditor.handler.DeleteHandler"\r
+            commandId="org.eclipse.ui.edit.delete">\r
+         <activeWhen>\r
+            <with\r
+                  variable="activePartId">\r
+               <equals\r
+                     value="bulkeditor.editor">\r
+               </equals>\r
+            </with>\r
+         </activeWhen>\r
+      </handler>\r

    </extension>\r
    <extension\r
          point="org.eclipse.ui.preferencePages">\r
    </extension>\r
    <extension\r
          point="org.eclipse.ui.preferencePages">\r


@@ -372,6 +393,17 @@
             properties="isDerivedUnitEditor"\r
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">\r
       </propertyTester>\r
             properties="isDerivedUnitEditor"\r
             type="eu.etaxonomy.taxeditor.bulkeditor.BulkEditor">\r
       </propertyTester>\r

+   </extension>\r
+   <extension\r
+         point="org.eclipse.ui.perspectiveExtensions">\r
+      <perspectiveExtension\r
+            targetID="*">\r
+         <showInPart\r
+               id="eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects"></showInPart>\r
+         <showInPart\r
+               id="eu.etaxonomy.taxeditor.view.detail">\r
+         </showInPart>\r
+      </perspectiveExtension>\r

    </extension>
 <!-- start set marker -->\r
 \r
    </extension>
 <!-- start set marker -->\r
 \r

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index 9b9d200017bbe53d76619244fcb543815e4badf5..3f543dcbd7639d4fadf28a8e0c1be6b7e3f6d90e 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@ -10,6 +10,7 @@
 
 package eu.etaxonomy.taxeditor.bulkeditor;
 
 
 package eu.etaxonomy.taxeditor.bulkeditor;
 

+import org.eclipse.jface.action.IMenuManager;

 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;


@@ -31,6 +32,7 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;

+import org.eclipse.ui.texteditor.ITextEditorActionConstants;

 
 import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineDocumentProvider;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor;
 
 import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineDocumentProvider;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.AnnotatedLineEditor;


@@ -290,4 +292,14 @@ public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDe
        public AbstractBulkEditorInput getEditorInput() {
                return (AbstractBulkEditorInput) super.getEditorInput();
        }
        public AbstractBulkEditorInput getEditorInput() {
                return (AbstractBulkEditorInput) super.getEditorInput();
        }

+       
+       protected void editorContextMenuAboutToShow(IMenuManager menu) {
+               super.editorContextMenuAboutToShow(menu);
+               menu.remove(ITextEditorActionConstants.SHIFT_RIGHT);
+               menu.remove(ITextEditorActionConstants.SHIFT_LEFT);
+               menu.remove(ITextEditorActionConstants.CONTEXT_PREFERENCES);
+
+               IMenuManager showInMenu = menu.findMenuUsingPath("viewsShowIn");
+               System.out.println(showInMenu);
+       }

 }
 }

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
new file mode 100644 (file)
index 0000000..4433592
--- /dev/null
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -0,0 +1,33 @@
+// $Id$
+/**
+* Copyright (C) 2007 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.bulkeditor.handler;
+
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+/**
+ * @author n.hoffmann
+ * @created Mar 11, 2011
+ * @version 1.0
+ */
+public class DeleteHandler extends AbstractHandler {
+
+       /* (non-Javadoc)
+        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
+        */
+       @Override
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
+}

diff --git a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index 2acee1d6fb9df84ed513f95ae3dd74d995366566..5cbfc77a9aad63f7a51850c89090902e86df3d97 100644 (file)
--- a/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/taxeditor-bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -55,7 +55,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart implements ISele
                        .getLogger(ReferencingObjectsView.class);
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.bulkeditor.refer"{trunked}</code> */
                        .getLogger(ReferencingObjectsView.class);
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.bulkeditor.refer"{trunked}</code> */

-       public static final String ID = "eu.etaxonomy.taxeditor.bulkeditor.referencingobjectsview";
+       public static final String ID = "eu.etaxonomy.taxeditor.bulkeditor.view.referencingobjects";

        
        private TableViewer viewer;
 
        
        private TableViewer viewer;
 

diff --git a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
index c54e8bac2782408e146f56136225d22785669382..354448c372c94c0d8f22c7bf12b38a38c26cf1cb 100644 (file)
--- a/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
+++ b/taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
@@ -112,6 +112,10 @@ public class NavigationUtil extends AbstractUtility{
                                        NavigationUtil.error(NavigationUtil.class, "Error opening the editor", e);
                                }
                        }
                                        NavigationUtil.error(NavigationUtil.class, "Error opening the editor", e);
                                }
                        }

+               }else if(selectedObject instanceof ICdmBase){
+                       openEditor((ICdmBase) selectedObject); 
+               }else{
+                       NavigationUtil.error(NavigationUtil.class, new IllegalArgumentException("Selected object is not supported: " + selectedObject));

                }
        }
        
                }
        }