cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 29 Apr 2021 11:23:36 +0000 (13:23 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 29 Apr 2021 11:24:11 +0000 (13:24 +0200)
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateContentProvider.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/derivative/DerivateLabelProvider.java

index 2611897b4bdfd4754a4dd6ab238b11d9cd6454ff..fd641d14b2df17d1333a5c38911fd3aa0cde7695 100644 (file)
@@ -115,9 +115,6 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
 
     private static final Logger logger = Logger.getLogger(ReferencingObjectsViewE4.class);
 
-    public static final String IS_LOADING = "Loading ...";
-//    public static final String CANCELED = "Canceled ...";
-
     private static final List<ReferencingObjectDto> EMPTY_LIST = Arrays.asList();  //immutable empty list
     private static final RefObjectDtoComparator COMPARATOR = new RefObjectDtoComparator();
 
index 3293b3cdb5feb23b79da50564d9f8aa9189c2ddd..030e9b80f962cce9dc6446aeadfd0d9ddf35a70c 100644 (file)
@@ -25,7 +25,6 @@ import eu.etaxonomy.taxeditor.ui.EditViewerDropAdapter;
 /**
  * @author pplitzner
  * @date 18.03.2014
- *
  */
 public class DerivateDropListener extends EditViewerDropAdapter {
 
@@ -60,13 +59,9 @@ public class DerivateDropListener extends EditViewerDropAdapter {
         return LocalSelectionTransfer.getTransfer().isSupportedType(transferType) && target instanceof TreeNode;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void dragOver(DropTargetEvent event) {
         super.dragOver(event);
         event.feedback = DND.FEEDBACK_SELECT | DND.FEEDBACK_SCROLL;
     }
-
-}
+}
\ No newline at end of file
index 528f53fba78f120022bb854ec7b196d8a19e469a..1db44967b60f269b77169ee8f6b593bcdd7e94ca 100644 (file)
@@ -186,7 +186,8 @@ public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
         * Override in subclasses if you want to have a different behaviour.
         */
        protected void setSectionTitle() {
-               Collection<ELEMENT> collection = getCollection(getEntity());
+           ENTITY entity = getEntity();
+               Collection<ELEMENT> collection = getCollection(entity);
                if(collection != null && collection.size() > 0){
                        this.setText(getTitleString() + " +");
                }else{
index 05c7925c7a2fa24e76330af1c2f7d90696c58d11..e675098c63104793ea85b71571e28b72010a7caa 100644 (file)
@@ -39,11 +39,10 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 /**
  * @author pplitzner
  * @date 16.12.2013
- *
  */
 public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> implements ITogglableMediaElement{
 
-    private final TermVocabulary mediaSpecimenVocabulary = CdmStore.getService(IVocabularyService.class).find(VocabularyEnum.MediaSpecimenKindOfUnit.getUuid());
+    private final TermVocabulary<?> mediaSpecimenVocabulary = CdmStore.getService(IVocabularyService.class).find(VocabularyEnum.MediaSpecimenKindOfUnit.getUuid());
 
     private TermComboElement<DefinedTerm> comboKindOfUnit;
     private LanguageStringWithLabelElement textTitleLanguageString;
@@ -57,10 +56,7 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
     private CheckboxElement checkIsPublish;
 
     private MediaDetailElement mediaDetailElement;
-    /**
-     * @param formFactory
-     * @param formElement
-     */
+
     public MediaSpecimenGeneralDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
         super(formFactory, formElement);
     }
@@ -93,7 +89,7 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
 //            spacer.setBackground(getPersistentBackground());
             LabelElement label2 = formFactory.createLabel(formElement, "");
 
-            selection_collection = formFactory.createSelectionElement(Collection.class,// getConversationHolder(),
+            selection_collection = formFactory.createSelectionElement(Collection.class,
                     formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
             text_accessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
 
@@ -108,7 +104,7 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
                     break;
                 }
             }
-            selection_publishedIn = formFactory.createSelectionElement(Reference.class, //getConversationHolder(),
+            selection_publishedIn = formFactory.createSelectionElement(Reference.class,
                     formElement, "Published in", publishedIn, EntitySelectionElement.ALL, style);
             text_published_in_detail = formFactory.createTextWithLabelElement(formElement, "Published in Detail", publishedInDetail, style);
             LabelElement label4 = formFactory.createLabel(formElement, "");
index 0504cbaad7e152fdd8bba0b53b8bf19c88ffd684..eb99ec733e7e671bdc9ff85b49efcdf131e2bacd 100755 (executable)
@@ -1,3 +1,11 @@
+/**
+* Copyright (C) 2013 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.view.search.derivative;
 
 import java.util.ArrayList;
@@ -27,15 +35,14 @@ public class DerivateContentProvider implements ITreeContentProvider {
        @Override
        public void dispose() {
                // TODO Auto-generated method stub
-
        }
 
        public List<SpecimenOrObservationBase> getRootElements() {
-           List<SpecimenOrObservationBase> elements = new ArrayList<SpecimenOrObservationBase>();
+           List<SpecimenOrObservationBase> elements = new ArrayList<>();
 
            if(rootNodes != null) {
                for(TreeNode node : rootNodes) {
-                   elements.add((SpecimenOrObservationBase)node.getValue());
+                   elements.add((SpecimenOrObservationBase<?>)node.getValue());
                }
            }
            return elements;
@@ -49,12 +56,10 @@ public class DerivateContentProvider implements ITreeContentProvider {
        public Object[] getElements(Object inputElement) {
            rootNodes = new ArrayList<>();
            if(inputElement instanceof Collection){
-               for (Object o: (Collection)inputElement) {
+               for (Object o: (Collection<?>)inputElement) {
                    if(o instanceof SpecimenOrObservationBase){
                        SpecimenOrObservationBase<?> rootElement = (SpecimenOrObservationBase<?>)o;
-                       if(rootElement!=null){
-                           rootNodes.add(new TreeNode(rootElement));
-                       }
+                       rootNodes.add(new TreeNode(rootElement));
                    }
             }
            }
index cf4cd7ac3415f2b6f1bd5d15afe5d213a2b6c393..94802452b7c208836545f03efd4261b2313fa58a 100644 (file)
@@ -18,6 +18,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.swt.graphics.Image;
@@ -130,8 +131,6 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
         return sampleDesignationTerm;
     }
 
-
-    /** {@inheritDoc} */
     @Override
     public String getText(Object element) {
         if(element instanceof TreeNode){
@@ -139,14 +138,13 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
         }
         String text = null;
         if(element instanceof IdentifiableEntity
-                && ((IdentifiableEntity) element).isProtectedTitleCache()){
-            return ((IdentifiableEntity) element).getTitleCache();
+                && ((IdentifiableEntity<?>) element).isProtectedTitleCache()){
+            return ((IdentifiableEntity<?>) element).getTitleCache();
         }
 
-
         //check if collection code does not exist -> use collection name then
         FormatKey collectionKey = FormatKey.COLLECTION_CODE;
-        text = CdmFormatterFactory.format(element,new FormatKey[]{FormatKey.COLLECTION_CODE});
+        text = CdmFormatterFactory.format(element, new FormatKey[]{FormatKey.COLLECTION_CODE});
         if(CdmUtils.isBlank(text)){
             collectionKey = FormatKey.COLLECTION_NAME;
         }
@@ -195,7 +193,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
         }
         else if(element instanceof IdentifiableEntity){
 
-               IdentifiableEntity identifiableEntity = (IdentifiableEntity) element;
+               IdentifiableEntity<?> identifiableEntity = (IdentifiableEntity<?>) element;
                if(identifiableEntity.isProtectedTitleCache()){
                        text = identifiableEntity.getTitleCache();
                }
@@ -215,15 +213,11 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                return text;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String getToolTipText(Object element) {
         return getDerivateText(element);
     }
 
-    /**
-     * @param conversation the conversation to set
-     */
     public void setConversation(ConversationHolder conversation) {
         this.conversation = conversation;
     }
@@ -248,7 +242,7 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
             conversation.bind();
         }
 
-        final String emptyString = "";
+        final String emptyString = StringUtils.EMPTY;
         final String separator = " ";
 
         String label = emptyString;