- unified section headers for derivative details view

 - show selected element in part title of DetailsView

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
index c9ddfffb8af7fa38b4e267ce7099084339cf5bc2..07f08c70463ac355736b0020b1c02f99efb5c5fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailSection.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -192,7 +193,7 @@ public abstract class AbstractCdmDetailSection<ENTITY> extends AbstractFormSecti
         */
        protected void setSectionTitle() {
                String title = "";
-               if (getEntity() != null && (getEntity() instanceof IdentifiableEntity)) {
+               if (getEntity() != null && (getEntity() instanceof IdentifiableEntity) && !(getEntity() instanceof SpecimenOrObservationBase)) {
                        title = ": " + ((IdentifiableEntity) getEntity()).getTitleCache();
                }
                this.setText(String.format("%s%s", getHeading(), title));

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailSection.java
index c4df98d163ecdf364e2441051a08c5053621e051..f9b48e1784147b43e4752e8f9eac718467a35b40 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailSection.java
@@ -44,7 +44,7 @@ public class DnaSampleGeneralDetailSection extends AbstractCdmDetailSection<DnaS
      */
     @Override
     public String getHeading() {
-        return "General DNA";
+        return "General";
     }
 
     /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailSection.java
index bd3cc13a459ac0fb88f187db02bfa69ef110018d..427a5d737528038a3a64cac5c89da50221ee8bf3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceGeneralDetailSection.java
@@ -44,7 +44,7 @@ public class SequenceGeneralDetailSection extends AbstractCdmDetailSection<Seque
      */
     @Override
     public String getHeading() {
-        return "General Sequence";
+        return "General";
     }
 
     /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailSection.java
index 37331bf2f569c6d18744e5613050448ce9bce97a..e2fd1db1c627713b829344d05ac755f2c3ffe200 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailSection.java
@@ -44,7 +44,7 @@ public class SingleReadGeneralDetailSection extends AbstractCdmDetailSection<Sin
      */
     @Override
     public String getHeading() {
-        return "General SingleRead";
+        return "General";
     }
 
     /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
index f8b342089b0a42e220ad1dd690da910bf2a678fa..16894a55b3c75d4c8d42492204cbf001c66c8ad2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
@@ -22,7 +22,6 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
-import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider;
 
 /**
  * @author pplitzner
@@ -52,7 +51,7 @@ public class MediaSpecimenGeneralDetailSection  extends AbstractCdmDetailSection
      */
     @Override
     public String getHeading() {
-        return "General Media Specimen";
+        return "General";
     }
 
     /* (non-Javadoc)
@@ -60,27 +59,27 @@ public class MediaSpecimenGeneralDetailSection  extends AbstractCdmDetailSection
      */
     @Override
     public void setText(String title) {
-        String text = null;
-        if(getEntity()!=null && getEntity().getKindOfUnit()!=null){
-            if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getArtworkTerm())){
-                text = "Artwork";
-            }
-            else if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getLivingPlantPhotoTerm())){
-                text = "Living Plant Photo";
-            }
-            else if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getSpecimenScanTerm())){
-                text = "Specimen Scan";
-            }
-            else if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getDetailImageTerm())){
-                text = "Detail Image";
-            }
-        }
-        if(text!=null){
-            super.setText(text);
-        }
-        else{
+//        String text = null;
+//        if(getEntity()!=null && getEntity().getKindOfUnit()!=null){
+//            if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getArtworkTerm())){
+//                text = "Artwork";
+//            }
+//            else if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getLivingPlantPhotoTerm())){
+//                text = "Living Plant Photo";
+//            }
+//            else if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getSpecimenScanTerm())){
+//                text = "Specimen Scan";
+//            }
+//            else if(getEntity().getKindOfUnit().equals(DerivateLabelProvider.getDetailImageTerm())){
+//                text = "Detail Image";
+//            }
+//        }
+//        if(text!=null){
+//            super.setText(text);
+//        }
+//        else{
             super.setText(title);
-        }
+//        }
     }
 
     @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
index cd780fc68c5d3f0d2e66420cae3c283d081f1aaf..9444596f5a7d8a3a45abbaedf5397335f56300fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewPart.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.view.detail;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorPart;
@@ -42,7 +43,6 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
        /** {@inheritDoc} */
        @Override
        public void createViewer(Composite parent) {
-               //selectionService.addPostSelectionListener(this);
 
                viewer = new DetailsViewer(parent, this);
                getSite().setSelectionProvider(viewer);
@@ -67,6 +67,7 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
 
         if((part instanceof IEditorPart) || (part instanceof IPartContentHasDetails)) {
             if(structuredSelection.size() != 1){
+                setPartName(createPartTitle(null));
                 showEmptyPage();
                 return;
             }
@@ -76,20 +77,35 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
                 // do show the map for distributions
                 Feature feature = ((FeatureNodeContainer) ((IStructuredSelection) selection).getFirstElement()).getFeature();
                 if(!feature.equals(Feature.DISTRIBUTION())){
+                    setPartName(createPartTitle(null));
                     showEmptyPage();
                     return;
                 }
             }
 
+
+            setPartName(createPartTitle(((IStructuredSelection) selection).getFirstElement()));
             showViewer(part, structuredSelection);
         }else{
+            setPartName(createPartTitle(null));
             showEmptyPage();
         }
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.view.AbstractCdmViewPart#showEmptyPage()
-        */
+       private String getViewName(){
+           return "Details";
+       }
+
+       private String createPartTitle(Object selectedObject){
+           if(selectedObject!=null){
+               if(selectedObject instanceof TreeNode){
+                   selectedObject = ((TreeNode) selectedObject).getValue();
+               }
+               return getViewName()+": "+selectedObject;
+           }
+           return getViewName();
+       }
+
        @Override
        public void showEmptyPage() {
            viewer.setSelection(null);
@@ -118,14 +134,9 @@ public class DetailsViewPart extends AbstractCdmEditorViewPart implements IPartC
        public void dispose() {
                selectionService.removePostSelectionListener(this);
                super.dispose();
-               
+
        }
 
-       /**
-        * <p>onComplete</p>
-        *
-        * @return a boolean.
-        */
        @Override
     public boolean onComplete() {
                return true;