ref #6566 Remove unused dynamic context menu + l10n
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 18 May 2017 07:42:47 +0000 (09:42 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 18 May 2017 07:47:05 +0000 (09:47 +0200)
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java [deleted file]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java [deleted file]

index 946d554bcfa59b4755a152e43501f0f9cf8276d3..2e883cdaa80f60c4062dd7e6414104ed1bd7a245 100644 (file)
       </menuContribution>
       <menuContribution
             locationURI="popup:eu.etaxonomy.taxeditor.editor.XXXpopupmenu.specimeneditor">
-         <separator
-               name="eu.etaxonomy.taxeditor.editor.separator4"
-               visible="true">
-         </separator>
-         <dynamic
-               class="eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu.DerivateViewContextMenu"
-               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateContextMenu">
-         </dynamic>
          <dynamic
                class="eu.etaxonomy.taxeditor.view.CdmViewerContextMenu"
                id="eu.etaxonomy.taxeditor.editor.derivativeEditor.CdmViewerContextMenu">
index 597f3fdf2e17adeb5314296db3f8a243986382af..51c8dd2295414980137447fbdfbb49f803742621 100644 (file)
@@ -50,16 +50,6 @@ public class Messages extends NLS {
     public static String ConceptContainer_SEC_REQUIRED;
     public static String ConceptGraphView_VIEWER_NAME;
        public static String ConceptViewPart_VIEWER_NAME;
-       public static String CreateDerivateContextMenu_ADD;
-    public static String CreateDerivateContextMenu_DNA_SAMPLE;
-    public static String CreateDerivateContextMenu_MEDIA;
-    public static String CreateDerivateContextMenu_MEDIA_EXISTING;
-    public static String CreateDerivateContextMenu_MEDIA_SPECIMEN;
-    public static String CreateDerivateContextMenu_NO_CHILD_DERIVATE;
-    public static String CreateDerivateContextMenu_SEQUENCE;
-    public static String CreateDerivateContextMenu_SINGLE_READ;
-    public static String CreateDerivateContextMenu_SPECIMEN;
-    public static String CreateDerivateContextMenu_TISSUE_SAMPLE;
     public static String CreateFieldUnitContextMenu_CREATE_FIELD_UNIT;
        public static String CreateFieldUnitContextMenu_CREATE_FIELD_UNIT_FOR;
        public static String DefaultOpenSpecimenEditorForTypeSpecimenHandler_COULD_NOT_OPEN;
index 394a2dbbb2f612cb55024c73475cfd8f4d3d6ca0..982fa7b3bd70768e71e686ae9daaa49640bebb1b 100644 (file)
@@ -1,13 +1,3 @@
-CreateDerivateContextMenu_ADD=Add...
-CreateDerivateContextMenu_DNA_SAMPLE=DNA Sample
-CreateDerivateContextMenu_MEDIA=Media...
-CreateDerivateContextMenu_MEDIA_EXISTING=Use existing media item
-CreateDerivateContextMenu_MEDIA_SPECIMEN=Media item
-CreateDerivateContextMenu_NO_CHILD_DERIVATE=No child derivatives
-CreateDerivateContextMenu_SEQUENCE=Consensus Sequence
-CreateDerivateContextMenu_SINGLE_READ=Single Read
-CreateDerivateContextMenu_SPECIMEN=Specimen
-CreateDerivateContextMenu_TISSUE_SAMPLE=Tissue Sample
 CreateFieldUnitContextMenu_CREATE_FIELD_UNIT=Create new field unit
 CreateFieldUnitContextMenu_CREATE_FIELD_UNIT_FOR=Create new field unit for %s
 SingleReadSequenceContextMenu_REMOVE_FROM_SEQUENCE=Remove from this Sequence
index 5e2ca74cfb6214e66d4079e30077558c91398036..41328ec4fd83ffc77531b2e6602497fe291c2f6e 100644 (file)
@@ -1,13 +1,3 @@
-CreateDerivateContextMenu_ADD=Hinzufügen...
-CreateDerivateContextMenu_DNA_SAMPLE=DNA Probe
-CreateDerivateContextMenu_MEDIA=Media...
-CreateDerivateContextMenu_MEDIA_EXISTING=Vorhandendes Medienobjekt verwenden
-CreateDerivateContextMenu_MEDIA_SPECIMEN=Medienobjekt
-CreateDerivateContextMenu_NO_CHILD_DERIVATE=Keine Kind-Derivate
-CreateDerivateContextMenu_SEQUENCE=Konsensussequenz
-CreateDerivateContextMenu_SINGLE_READ=Single Read
-CreateDerivateContextMenu_SPECIMEN=Beleg
-CreateDerivateContextMenu_TISSUE_SAMPLE=Gewebeprobe
 CreateFieldUnitContextMenu_CREATE_FIELD_UNIT=Erzeuge neue Field Unit
 CreateFieldUnitContextMenu_CREATE_FIELD_UNIT_FOR=Erzeuge neue Field Unit für %s
 SingleReadSequenceContextMenu_REMOVE_FROM_SEQUENCE=Von Sequenz entfernen
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
deleted file mode 100644 (file)
index 0d9d17e..0000000
+++ /dev/null
@@ -1,254 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu;
-
-import org.eclipse.jface.action.ContributionItem;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreeNode;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.CompoundContributionItem;
-
-import eu.etaxonomy.cdm.api.application.CdmApplicationState;
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
-import eu.etaxonomy.cdm.api.service.IOccurrenceService;
-import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.molecular.DnaSample;
-import eu.etaxonomy.cdm.model.molecular.Sequence;
-import eu.etaxonomy.cdm.model.molecular.SingleRead;
-import eu.etaxonomy.cdm.model.occurrence.DerivationEvent;
-import eu.etaxonomy.cdm.model.occurrence.DerivationEventType;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
-import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.ui.dialog.selection.MediaSelectionDialog;
-
-/**
- * Context menu for the creation of derivates in the derivate hierarchy.
- *
- */
-public class CreateDerivateContextMenu extends CompoundContributionItem {
-
-    private static final String SINGLE_READ = Messages.CreateDerivateContextMenu_SINGLE_READ;
-    private static final String CONSENSUS_SEQUENCE = Messages.CreateDerivateContextMenu_SEQUENCE;
-    private static final String MEDIA_SPECIMEN = Messages.CreateDerivateContextMenu_MEDIA_SPECIMEN;
-    private static final String DNA_SAMPLE = Messages.CreateDerivateContextMenu_DNA_SAMPLE;
-    private static final String TISSUE_SAMPLE = Messages.CreateDerivateContextMenu_TISSUE_SAMPLE;
-    private static final String SPECIMEN = Messages.CreateDerivateContextMenu_SPECIMEN;
-
-    @Override
-    protected IContributionItem[] getContributionItems() {
-        IContributionItem[] contributionItems = new IContributionItem[] {
-                new ContributionItem() {
-                    @Override
-                    public void fill(Menu menu, int index) {
-                        MenuItem addItem = new MenuItem(menu, SWT.CASCADE);
-                        addItem.setText(Messages.CreateDerivateContextMenu_ADD);
-                        Menu addMenu = new Menu(menu);
-                        addItem.setMenu(addMenu);
-                        final IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-                        final ISelection selection = window.getActivePage().getSelection();
-                        TreeNode selectedTreeNode = EditorUtil.getTreeNodeOfSelection(selection);
-                        if(selectedTreeNode!=null){
-                            //context menu for FieldUnit
-                            if(selectedTreeNode.getValue() instanceof FieldUnit){
-                                createMenuItem(addMenu, SPECIMEN, selectedTreeNode, DerivedUnit.class, SpecimenOrObservationType.PreservedSpecimen, DerivationEventType.GATHERING_IN_SITU());
-                                new MenuItem(addMenu, SWT.SEPARATOR);
-                                createMenuItem(addMenu, TISSUE_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample, DerivationEventType.PREPARATION());
-                                createMenuItem(addMenu, DNA_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION());
-                                createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.StillImage, DerivationEventType.ACCESSIONING());
-                                return;
-                            }
-                            //context menu for Specimen
-                            else if(selectedTreeNode.getValue() instanceof DerivedUnit && ((DerivedUnit)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
-
-                                createMenuItem(addMenu, TISSUE_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.TissueSample, DerivationEventType.PREPARATION());
-                                createMenuItem(addMenu, DNA_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION());
-                                createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.StillImage, DerivationEventType.ACCESSIONING());
-                                return;
-                            }
-                            //context menu for TissueSample
-                            else if(selectedTreeNode.getValue() instanceof DnaSample && ((DnaSample)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.TissueSample){
-                               createMenuItem(addMenu, DNA_SAMPLE, selectedTreeNode, DnaSample.class, SpecimenOrObservationType.DnaSample, DerivationEventType.DNA_EXTRACTION());
-                               createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.StillImage, DerivationEventType.ACCESSIONING());
-                                return;
-                            }
-                            //context menu for DnaSample
-                            else if(selectedTreeNode.getValue() instanceof DnaSample && ((DnaSample)selectedTreeNode.getValue()).getRecordBasis()==SpecimenOrObservationType.DnaSample){
-                                createMenuItem(addMenu, CONSENSUS_SEQUENCE, selectedTreeNode, Sequence.class, null, null);
-                                createMenuItem(addMenu, MEDIA_SPECIMEN, selectedTreeNode, MediaSpecimen.class, SpecimenOrObservationType.StillImage, DerivationEventType.ACCESSIONING());
-                                return;
-                            }
-                            //context menu for Sequence
-                            else if(selectedTreeNode.getValue() instanceof Sequence){
-                                createMenuItem(addMenu, SINGLE_READ, selectedTreeNode, SingleRead.class, null, null);
-                                return;
-                            }
-                        }
-                        MenuItem menuItem = new MenuItem(addMenu, SWT.NONE);
-                        menuItem.setText(Messages.CreateDerivateContextMenu_NO_CHILD_DERIVATE);
-                        menuItem.setEnabled(false);
-                    }
-
-
-                }
-        };
-        return contributionItems;
-    }
-
-    private void createMenuItem(Menu menu, String menuLabel, final TreeNode selectedNode, Class<?> childClass, final SpecimenOrObservationType specimenType, final DerivationEventType derivationEventType) {
-        if(specimenType!=null && specimenType.equals(SpecimenOrObservationType.StillImage)){
-            //media submenu
-            MenuItem mediaItem = new MenuItem(menu, SWT.CASCADE);
-            mediaItem.setText(Messages.CreateDerivateContextMenu_MEDIA);
-            Menu mediaMenu = new Menu(menu);
-            mediaItem.setMenu(mediaMenu);
-
-            //media specimen menu
-            MenuItem menuItem = new MenuItem(mediaMenu, SWT.NONE);
-            menuItem.setText(menuLabel);
-            menuItem.addSelectionListener(new WidgetSelectionListener(selectedNode, childClass, specimenType, derivationEventType));
-
-            //existing media menu
-            MenuItem existingMediaItem = new MenuItem(mediaMenu, SWT.NONE);
-            existingMediaItem.setText(Messages.CreateDerivateContextMenu_MEDIA_EXISTING);
-            existingMediaItem.addSelectionListener(new SelectionAdapter() {
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    //select media
-                    Media media = MediaSelectionDialog.select(AbstractUtility.getShell(), null, null);
-                    if(media!=null){
-                        //create MediaSpecimen
-                        MediaSpecimen mediaSpecimen = MediaSpecimen.NewInstance(specimenType);
-                        mediaSpecimen.setMediaSpecimen(media);
-
-                        //attach to parent
-                        if(selectedNode.getValue() instanceof SpecimenOrObservationBase){
-                            SpecimenOrObservationBase<?> specimenOrObservationBase = (SpecimenOrObservationBase<?>)selectedNode.getValue();
-
-                            specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, mediaSpecimen, derivationEventType));
-                            mediaSpecimen.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
-                            mediaSpecimen.getTitleCache(); //update title cache
-                            CdmStore.getService(IOccurrenceService.class).merge(specimenOrObservationBase, true);
-                           
-                        }
-
-                        //refresh view
-                        DerivateView derivateView = null;
-                        if(AbstractUtility.getActivePart() instanceof DerivateView){
-                            derivateView = (DerivateView) AbstractUtility.getActivePart();
-                        }
-                        if(derivateView!=null){
-
-                            derivateView.getConversationHolder().commit();
-                            derivateView.refreshTree(mediaSpecimen);
-                        }
-                    }
-                }
-            });
-        }
-        else{
-            MenuItem menuItem = new MenuItem(menu, SWT.NONE);
-            menuItem.setText(menuLabel);
-            menuItem.addSelectionListener(new WidgetSelectionListener(selectedNode, childClass, specimenType, derivationEventType));
-        }
-    }
-
-    private class WidgetSelectionListener extends SelectionAdapter{
-
-        private final TreeNode selectedNode;
-        //TODO: we need a common interface for the generic like e.g. "IDerivateHierarchyNode"
-        private final Class<?> childClass;
-        private final SpecimenOrObservationType specimenType;
-        private final DerivationEventType derivationEventType;
-
-        /**
-         * @param selectedNode
-         * @param specimenType
-         */
-        public WidgetSelectionListener(TreeNode selectedNode, Class<?> childClass, SpecimenOrObservationType specimenType, DerivationEventType derivationEventType) {
-            this.selectedNode = selectedNode;
-            this.childClass = childClass;
-            this.specimenType = specimenType;
-            this.derivationEventType = derivationEventType;
-        }
-
-        @Override
-        public void widgetSelected(SelectionEvent e) {
-            DerivateView derivateView = null;
-            if(AbstractUtility.getActivePart() instanceof DerivateView){
-                derivateView = (DerivateView) AbstractUtility.getActivePart();
-            }
-            if(derivateView!=null){
-                if(derivateView.isDirty()){
-                    e.doit = false;
-                    MessagingUtils.warningDialog(DerivateView.VIEW_HAS_UNSAVED_CHANGES, this, DerivateView.YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION);
-                    return;
-                }
-            }
-
-            Object createdElement = null;
-            Object selectedDerivate = selectedNode.getValue();
-            if(selectedDerivate instanceof DnaSample && ((DnaSample) selectedDerivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
-                DnaSample dnaSample = (DnaSample)selectedDerivate;
-                if(childClass.equals(Sequence.class)){
-                    Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0); //$NON-NLS-1$
-                    createdElement = newInstance;
-                }
-                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
-            } else if(selectedDerivate instanceof Sequence){
-                SingleRead newInstance = SingleRead.NewInstance();
-                ((Sequence) selectedDerivate).addSingleRead(newInstance);
-                createdElement = newInstance;
-                CdmApplicationState.getCurrentAppConfig().getSequenceService().merge((Sequence)selectedDerivate, true);
-                
-            }
-            if(selectedDerivate instanceof SpecimenOrObservationBase && DerivedUnit.class.isAssignableFrom(childClass)){
-                SpecimenOrObservationBase<?> specimenOrObservationBase = (SpecimenOrObservationBase<?>)selectedDerivate;
-                DerivedUnit derivedUnit;
-                if(childClass.equals(DnaSample.class)){
-                    derivedUnit = DnaSample.NewInstance();
-                    if(specimenType==SpecimenOrObservationType.DnaSample){
-                        derivedUnit.setRecordBasis(SpecimenOrObservationType.DnaSample);
-                    }
-                    else if(specimenType==SpecimenOrObservationType.TissueSample){
-                        derivedUnit.setRecordBasis(SpecimenOrObservationType.TissueSample);
-                    }
-                }
-                else if(childClass.equals(MediaSpecimen.class)){
-                    derivedUnit = MediaSpecimen.NewInstance(specimenType);
-                    //a MediaSpecimen with no media attached does not make sense. Hence we add one
-                    ((MediaSpecimen)derivedUnit).setMediaSpecimen(Media.NewInstance());
-                }
-                else{
-                    derivedUnit = DerivedUnit.NewInstance(specimenType);
-                }
-                specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, derivedUnit, derivationEventType));
-                derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
-                derivedUnit.getTitleCache(); //update title cache
-                createdElement = derivedUnit;
-                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate, true);
-                
-            }
-
-            //refresh view
-            if(derivateView!=null){
-                derivateView.getConversationHolder().commit();
-                derivateView.refreshTree(createdElement);
-            }
-        }
-    }
-
-}
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/DerivateViewContextMenu.java
deleted file mode 100644 (file)
index e7bf789..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.view.derivate.contextMenu;
-
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.actions.CompoundContributionItem;
-
-public class DerivateViewContextMenu extends CompoundContributionItem  {
-
-    @Override
-    protected IContributionItem[] getContributionItems() {
-        IContributionItem[] contributionItems = new IContributionItem[] {
-                new CreateDerivateContextMenu(),
-                new Separator(),
-//                new ListenToSelectionChangeContextMenu(),
-        };
-        return contributionItems;
-    }
-
-}