cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 7 Dec 2022 10:30:44 +0000 (11:30 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 8 Dec 2022 17:36:01 +0000 (18:36 +0100)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CategoricalDataHistogram.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DefaultTermComparator.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/term/TermComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/AbstractApplicableElementForDto.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDtoDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/StateVocabularyCollectionElement.java

index a9817cb3239ca374b1fb42324ea0e18de689982e..abdbeb8d3fc85b6915978d7a058ca19fa59d53f5 100644 (file)
@@ -20,7 +20,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author n.hoffmann
  * @date Jan 18, 2012
- *
  */
 public class DefaultTermComparator<T extends DefinedTermBase> implements Comparator<T> {
        @Override
index b01659cbb938ae78a9cbac8e5e9eb76d933bb3a8..7ae70e3df909c12f6801c5e79fd9e893a09e7ba1 100755 (executable)
@@ -64,7 +64,8 @@ public class TermComboElement<T extends DefinedTermBase>
        }
 
        private final TermType termType;
-       private final TermVocabulary termVocabulary;
+       @SuppressWarnings("rawtypes")
+    private final TermVocabulary termVocabulary;
        private final Class<T> termClass;
 
        private List<T> customPreferredTerms;
@@ -99,7 +100,7 @@ public class TermComboElement<T extends DefinedTermBase>
     public TermComboElement(CdmFormFactory formFactory,
             ICdmFormElement parentElement, Class<T> termClass, String labelString, T selection, boolean addEmptyElement,
             int style, boolean useAbbrevLabel) {
-        this(formFactory, parentElement, termClass, null, null, null,labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
+        this(formFactory, parentElement, termClass, null, null, null, labelString, selection, addEmptyElement, style, useAbbrevLabel, null);
     }
 
     public TermComboElement(CdmFormFactory formFactory,
@@ -145,7 +146,7 @@ public class TermComboElement<T extends DefinedTermBase>
         combo.addSelectionListener(this);
         combo.addDisposeListener(this);
         if (comparator == null){
-            setTermComparator(new DefaultTermComparator<T>());
+            setTermComparator(new DefaultTermComparator<>());
         }else{
                populateTerms();
         }
@@ -158,7 +159,7 @@ public class TermComboElement<T extends DefinedTermBase>
        }
 
        protected void addTerms(List<T> preferredTerms) {
-               terms = new ArrayList<T>();
+               terms = new ArrayList<>();
                Collections.sort(preferredTerms, termComparator);
                if(addEmptyElement){
                    // Add an empty element for when nothing was selected yet
index 806b0e146d3e92d433e4be1f4bc8b1a60e983a63..c81f5589abbc12bd374a45b7cf67e1c394863549 100755 (executable)
@@ -945,18 +945,6 @@ public class CdmFormFactory extends FormToolkit {
         return element;
     }
 
-    /**
-     * @deprecated Use {@link #createDefinedTermComboElement(TermType, ICdmFormElement, String, DefinedTermBase, int)} instead
-     */
-    @Deprecated
-    public <T extends DefinedTermBase> TermComboElement<T> createTermComboElement(Class<T> termComboType,
-            ICdmFormElement parentElement, String labelString, T selection, int style) {
-        TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termComboType, labelString, selection, true, style);
-        adapt(element);
-        parentElement.addElement(element);
-        return element;
-    }
-
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
             TermType termType,
             ICdmFormElement parentElement,
@@ -1066,13 +1054,13 @@ public class CdmFormFactory extends FormToolkit {
                Comparator<T> comparator) {
 
            if(termType!=null){
-               TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+               TermComboElement<T> element = new TermComboElement<>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
                adapt(element);
                parentElement.addElement(element);
                return element;
            }
            else if(termVocabulary!=null){
-               TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+               TermComboElement<T> element = new TermComboElement<>(this, parentElement, termVocabulary, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
 //             if (comparator!= null){
 //                     element.setTermComparator(comparator);
 //             }
@@ -1081,7 +1069,7 @@ public class CdmFormFactory extends FormToolkit {
                return element;
            }else if (terms != null){
 
-               TermComboElement<T> element = new TermComboElement<T>(this, parentElement, terms, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+               TermComboElement<T> element = new TermComboElement<>(this, parentElement, terms, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
 
             adapt(element);
             parentElement.addElement(element);
@@ -1104,13 +1092,13 @@ public class CdmFormFactory extends FormToolkit {
                    int style,
                    boolean useAbbrevLabel,
                    Comparator<T> comparator) {
-               if(termType!=null){
-                   TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
+
+              if(termType!=null){
+                   TermComboElement<T> element = new TermComboElement<>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
                    adapt(element);
                    parentElement.addElement(element);
                    return element;
                }
-
                else {
                    //this should never happen
                    return null;
index 1d6f48b0a4240e8bad7a21d18ea10143e0dbc084..be4fee8238fa06725489bc995e4a4988caed05f1 100644 (file)
@@ -27,7 +27,6 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 /**
  * @author pplitzner
  * @since Aug 16, 2019
- *
  */
 public abstract class AbstractApplicableElement extends AbstractEntityCollectionElement<FeatureState> {
 
@@ -46,7 +45,7 @@ public abstract class AbstractApplicableElement extends AbstractEntityCollection
         comboState = formFactory.createDefinedTermComboElement(Collections.EMPTY_LIST, element, getComboLabel(), null, style);
         comboState.setEnabled(false);
         selectFeature.setEnabled(false);
-        
+
         selectFeature.setEntity(entity.getFeature());
         comboState.setSelection(entity.getState());
     }
index 698497c0211fac7cbc3a0259690b14d4d7bf93ae..66aabfd2707713e0d4272fca6370f692e2733114 100644 (file)
@@ -19,14 +19,10 @@ import org.eclipse.swt.graphics.Color;
 
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.description.FeatureState;
 import eu.etaxonomy.cdm.model.description.State;
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
-import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.persistence.dto.FeatureStateDto;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.TermManager;
 import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -37,18 +33,15 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 /**
  * @author pplitzner
  * @since Aug 16, 2019
- *
  */
 public abstract class AbstractApplicableElementForDto extends AbstractEntityCollectionElement<FeatureStateDto> {
 
     protected TermComboElement<State> comboState;
     protected EntitySelectionElement<Feature> selectFeature;
-    
 
     public AbstractApplicableElementForDto(CdmFormFactory formFactory, AbstractFormSection section, FeatureStateDto entity,
             SelectionListener removeListener, Color backgroundColor, int style) {
         super(formFactory, section, entity, removeListener, backgroundColor, style);
-
     }
 
     @Override
@@ -67,7 +60,6 @@ public abstract class AbstractApplicableElementForDto extends AbstractEntityColl
                if (terms.size() == 1){
                        comboState.setSelection(terms.get(0));
                }
-        
        }
 
     protected abstract String getComboLabel();
@@ -83,11 +75,11 @@ public abstract class AbstractApplicableElementForDto extends AbstractEntityColl
     @Override
     public void handleEvent(Object eventSource) {
     }
-    
+
     @Override
     public void setEnabled(boolean enabled){
        super.setEnabled(enabled);
        this.comboState.setEnabled(false);
        this.selectFeature.setEnabled(false);
     }
-}
+}
\ No newline at end of file
index e6958c90a4489d7ba9715b9f9831f63e12d2fbc5..83838c646569558e36795813a8ae7edddc2e8947 100755 (executable)
@@ -47,10 +47,8 @@ import eu.etaxonomy.taxeditor.ui.section.vocabulary.StatisticalMeasureCollection
 import eu.etaxonomy.taxeditor.ui.section.vocabulary.StatisticalMeasureDtoCollectionSection;
 
 /**
- *
  * @author pplitzner
  * @since Dec 21, 2017
- *
  */
 public class CharacterDtoDetailElement extends AbstractCdmDetailElement<CharacterDto> {
 
index cf63b1701fbf49d607b0a0814d14b78e38d13b88..66c73ed9450107a419256282f65b9b7500031c31 100644 (file)
@@ -15,7 +15,8 @@ import java.util.ListIterator;
 import java.util.Map;\r
 import java.util.Set;\r
 \r
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;\r
+import org.apache.logging.log4j.LogManager;\r
+import org.apache.logging.log4j.Logger;\r
 import org.eclipse.swt.events.SelectionEvent;\r
 import org.eclipse.swt.events.SelectionListener;\r
 \r
@@ -35,19 +36,17 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;\r
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;\r
 \r
-\r
 /**\r
  * The context manager mediates context start/stop and workbench shutdowns to all registered listeners.\r
  *\r
  * @author a.theys\r
  * @created mar 13, 2012\r
- * @version 1.0\r
  */\r
 public class UseRecordDetailElement extends\r
                AbstractCdmDetailElement<CategoricalData> implements SelectionListener {\r
 \r
        @SuppressWarnings("unused")\r
-       private static final Logger logger = LogManager.getLogger(UseRecordDetailElement.class);\r
+       private static final Logger logger = LogManager.getLogger();\r
 \r
        private TermComboElement<State> combo_UseCategory;\r
        private TermComboElement<State> combo_UseSubCategory;\r
@@ -61,7 +60,6 @@ public class UseRecordDetailElement extends
                super(formFactory, formElement);\r
        }\r
 \r
-       /** {@inheritDoc} */\r
        @Override\r
        protected void createControls(ICdmFormElement formElement,\r
                        CategoricalData entity, int style) {\r
@@ -111,13 +109,10 @@ public class UseRecordDetailElement extends
                } else {\r
                        combo_EthnicGroup.setEnabled(false);\r
                }\r
-\r
        }\r
 \r
        /**\r
         * Returns the select modifier\r
-        * @param comboCategory\r
-        * @return\r
         */\r
        private DefinedTerm modifierSelection(String comboCategory) {\r
                if(!getEntity().getModifiers().isEmpty()) {\r
@@ -130,13 +125,11 @@ public class UseRecordDetailElement extends
                        return null;\r
                }\r
                return null;\r
-\r
        }\r
 \r
        /**\r
         * Returns the selected state\r
         * @param comboCategory\r
-        * @return\r
         */\r
        private State stateSelection(String comboCategory) {\r
                if (!getEntity().getStateData().isEmpty()) {\r
@@ -155,7 +148,6 @@ public class UseRecordDetailElement extends
                        return null;\r
                }\r
                return null;\r
-\r
        }\r
 \r
        /**\r
@@ -179,11 +171,8 @@ public class UseRecordDetailElement extends
                return termsToAdd;\r
        }\r
 \r
-\r
        /**\r
         * This function sets the Use Category combo term\r
-        * @param listOfTerms\r
-        * @return\r
         */\r
        private List<State> setUseCategoryComboTerms(List<State> listOfTerms) {\r
                List<State> termsToAdd = new ArrayList<State>();\r
@@ -236,9 +225,7 @@ public class UseRecordDetailElement extends
                                        }\r
                                }\r
                        }\r
-\r
                }\r
-\r
                else {\r
                        return null;\r
                }\r
@@ -348,7 +335,7 @@ public class UseRecordDetailElement extends
                                if (!getEntity().getStateData().isEmpty()) {\r
                                        Iterator<StateData> itr = getEntity().getStateData().iterator();\r
                                        while(itr.hasNext()) {\r
-                                               StateData stateToRemove = itr.next();\r
+                                               itr.next();\r
                                                itr.remove();\r
                                        }\r
                                        List<State> termsSubCategory = new ArrayList<State>();\r
index f7a18d8441bc01b5de30218a4fba96a4d7073269..6bcaf7e4b2887c7ea1e63b0abdd8289f7ba373a8 100644 (file)
@@ -11,10 +11,10 @@ package eu.etaxonomy.taxeditor.ui.section.vocabulary;
 import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Color;
 
-import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.State;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.taxeditor.ui.combo.VocabularyComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -24,26 +24,15 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
 /**
  * @author pplitzner
  * @date Apr 27, 2015
- *
  */
 public class StateVocabularyCollectionElement extends AbstractEntityCollectionElement<TermVocabulary<State>> {
 
 
     private VocabularyComboElement<State, TermVocabulary<State>> comboStateVocabulary;
 
-    /**
-     * @param formFactory
-     * @param section
-     * @param entity
-     * @param removeListener
-     * @param isChoosableEntity
-     * @param backgroundColor
-     * @param style
-     */
     public StateVocabularyCollectionElement(CdmFormFactory formFactory, AbstractFormSection section, TermVocabulary<State> entity,
             SelectionListener removeListener, Color backgroundColor, int style) {
         super(formFactory, section, entity, removeListener, backgroundColor, style);
-
     }
 
     @Override
@@ -78,5 +67,4 @@ public class StateVocabularyCollectionElement extends AbstractEntityCollectionEl
             }
         }
     }
-
-}
+}
\ No newline at end of file