- enhanced DNA icon

 - enhanced context menu for derivate creation

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
index d00c9357541c73beec506ccfcb3341cd0e5ea429..6567989899c7e9602f93f925a0432dfeebfccc92 100644 (file)
--- 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
@@ -44,37 +44,40 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
                             final Object selectedElement = ((TreeSelection) selection).getFirstElement();
                             //context menu for FieldUnit
                             if(selectedElement instanceof FieldUnit){
-                                MenuItem createSpecimen = new MenuItem(menu, SWT.None);
-                                createSpecimen.setText("Specimen");
                                 FieldUnit fieldUnit = (FieldUnit) selectedElement;
-                                createSpecimen.addSelectionListener(new WidgetSelectionListener(fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen)));
-
-                                MenuItem createLivingPlantPhoto = new MenuItem(menu, SWT.None);
-                                createLivingPlantPhoto.setText("Living Plant Photo");
-                                createLivingPlantPhoto.addSelectionListener(new WidgetSelectionListener(fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
+                                createMenuItem(menu, "Specimen", fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen));
+                                new MenuItem(menu, SWT.SEPARATOR);
+                                createMenuItem(menu, "Tissue Sample", fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.TissueSample));
+                                createMenuItem(menu, "DNA Sample", fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.DnaSample));
+                                createMenuItem(menu, "Specimen Scan", fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage));
+                                createMenuItem(menu, "Artwork", fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage));
+                                createMenuItem(menu, "Living Plant Photo", fieldUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage));
                             }
                             //context menu for Specimen
                             else if(selectedElement instanceof DerivedUnit && ((DerivedUnit)selectedElement).getRecordBasis()==SpecimenOrObservationType.PreservedSpecimen){
                                 DerivedUnit derivedUnit = (DerivedUnit) selectedElement;
-                                MenuItem createTissueSample = new MenuItem(menu, SWT.None);
-                                createTissueSample.setText("Tissue Sample");
-                                createTissueSample.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.TissueSample)));
-
-                                MenuItem createDNASample = new MenuItem(menu, SWT.None);
-                                createDNASample.setText("DNA Sample");
-                                createDNASample.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.DnaSample)));
-
-                                MenuItem createSpecimenScan = new MenuItem(menu, SWT.None);
-                                createSpecimenScan.setText("Specimen Scan");
-                                createSpecimenScan.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
 
-                                MenuItem createArtwork = new MenuItem(menu, SWT.None);
-                                createArtwork.setText("Artwork");
-                                createArtwork.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
-
-                                MenuItem createLivingPlantPhoto = new MenuItem(menu, SWT.None);
-                                createLivingPlantPhoto.setText("Living Plant Photo");
-                                createLivingPlantPhoto.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
+                                createMenuItem(menu, "Tissue Sample", derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.TissueSample));
+                                createMenuItem(menu, "DNA Sample", derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.DnaSample));
+                                createMenuItem(menu, "Specimen Scan", derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage));
+                                createMenuItem(menu, "Artwork", derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage));
+                                createMenuItem(menu, "Living Plant Photo", derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage));
+//
+//                                MenuItem createDNASample = new MenuItem(menu, SWT.None);
+//                                createDNASample.setText("DNA Sample");
+//                                createDNASample.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.DnaSample)));
+//
+//                                MenuItem createSpecimenScan = new MenuItem(menu, SWT.None);
+//                                createSpecimenScan.setText("Specimen Scan");
+//                                createSpecimenScan.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
+//
+//                                MenuItem createArtwork = new MenuItem(menu, SWT.None);
+//                                createArtwork.setText("Artwork");
+//                                createArtwork.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
+//
+//                                MenuItem createLivingPlantPhoto = new MenuItem(menu, SWT.None);
+//                                createLivingPlantPhoto.setText("Living Plant Photo");
+//                                createLivingPlantPhoto.addSelectionListener(new WidgetSelectionListener(derivedUnit, DerivedUnit.NewInstance(SpecimenOrObservationType.StillImage)));
                             }
                             else{
                                 MenuItem menuItem = new MenuItem(menu, SWT.None);
@@ -83,6 +86,18 @@ public class CreateDerivateContextMenu extends CompoundContributionItem {
                             }
                         }
                     }
+
+                    /**
+                     * @param parent
+                     * @param menuItem
+                     * @param childToCreate
+                     * @param menu
+                     */
+                    private void createMenuItem(Menu menu, String menuLabel, SpecimenOrObservationBase<?> parent, DerivedUnit childToCreate) {
+                        MenuItem menuItem = new MenuItem(menu, SWT.None);
+                        menuItem.setText(menuLabel);
+                        menuItem.addSelectionListener(new WidgetSelectionListener(parent, childToCreate));
+                    }
                 }
         };
         return contributionItems;

diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png
index f80d8dc57401d283e5a5e70fdb9b78ec84b337e5..47cbb1cba66c765804ea409f8ae80ea04458b96d 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png and b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png differ