cleanup

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
index 53158ef30d832c09216239b57a99250c60ec65e2..6826515b5b2d6c67f35472b137afcf0b6af1db7d 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/LifeCycleManager.java
@@ -47,7 +47,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author pplitzner
  * @date 05.07.2017
- *
  */
 public class LifeCycleManager implements IContextListener{
 
@@ -74,7 +73,6 @@ public class LifeCycleManager implements IContextListener{
     private void processAdditions(MApplication application) {
         this.application = application;
         hideParts();
-
     }
 
     @ProcessRemovals
@@ -120,24 +118,14 @@ public class LifeCycleManager implements IContextListener{
             }catch(IllegalStateException e){
                 //application does not have an active window
             }
-
         }
-
-
-
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
 
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
         hideParts();
@@ -156,9 +144,6 @@ public class LifeCycleManager implements IContextListener{
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextStart(IMemento memento, IProgressMonitor monitor) {
         PreferencesUtil.setDefaults();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
index 922835a6657bdde309aa307c7d083dd1cb961dcd..888c4411f26e5f4a282e2237c84d4a8901349d9c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermManager.java
@@ -34,17 +34,8 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  */
 public class TermManager {
 
-       private static final String TERMS = "terms";
-       private static final String TERM = "term";
-       private static final String HIDE = "hide";
-
-       private static final String CLASS = "class";
-       private static final String UUID_STRING = "uuid";
-
-
     private Map<Object, List> cachedTermMap = new HashMap<>();
 
-
     //new cache for features!!
     //dinstinguish preferences for both
     //load at start
@@ -84,7 +75,7 @@ public class TermManager {
            @SuppressWarnings("unchecked")
         List<T> terms = cachedTermMap.get(termVocabulary.getUuid());
            if(terms==null){
-               terms = getFilteredTerms(new ArrayList<T>(TermStore.getTerms(termVocabulary,null)));
+               terms = getFilteredTerms(new ArrayList<>(TermStore.getTerms(termVocabulary,null)));
                cachedTermMap.put(termVocabulary.getUuid(), terms);
            }
            return terms;
@@ -234,15 +225,6 @@ public class TermManager {
            return null;
        }
 
-       private  TermVocabularyDto getTermVocabularyByDto(Collection<TermDto> initialTerms){
-        if(!initialTerms.isEmpty()){
-            TermDto entity = initialTerms.iterator().next();
-            return entity.getVocabularyDto();
-        }
-        return null;
-    }
-
-
        /**
         * Generic method to set term preferences
         *
@@ -264,7 +246,6 @@ public class TermManager {
                clearTermMapForTermVoc(voc.getUuid());
        }
 
-
        /**
      * Generic method to set term preferences
      *
@@ -345,7 +326,8 @@ public class TermManager {
     public <T extends DefinedTermBase> List<T> getTerms(List<UUID> uuidList, Class clazz){
 
         List<T> filteredTerms = new ArrayList<>();
-        List<T> terms = TermStore.getTerms(clazz);
+        @SuppressWarnings("unchecked")
+               List<T> terms = TermStore.getTerms(clazz);
         if (uuidList == null || uuidList.isEmpty()){
             return terms;
         }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
index cae6e4b39b17c650adea93db55ce99c13eac07ef..185c5eefde18b5b81829cc98f11eacd9dd843bf3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/TermStore.java
@@ -85,7 +85,7 @@ public class TermStore {
         * @return a sorted list of terms
         */
        public static <TERM extends DefinedTermBase> List<TERM> getTerms(Class<TERM> clazz, Comparator<TERM> comparator, boolean filtered){
-               List<TERM> terms = new ArrayList<TERM>();
+               List<TERM> terms = new ArrayList<>();
 
                ITermStoreEdgeCase<TERM> edgeCase = getEdgeCase(clazz);
                if(filtered && edgeCase != null){
@@ -95,15 +95,8 @@ public class TermStore {
                }
 
                return terms;
-
        }
 
-       /**
-        *
-        * @param termClass
-        * @param comparator
-        * @return
-        */
        private static <T extends DefinedTermBase> List<T> getTermsFromService(TermType termType, Comparator<T> comparator){
            if (comparator == null){
                comparator = new DefaultTermComparator<T>();
@@ -114,12 +107,6 @@ public class TermStore {
            return terms;
        }
 
-       /**
-        *
-        * @param termClass
-        * @param comparator
-        * @return
-        */
        private static <T extends DefinedTermBase> List<T> getTermsFromService(Class<T> termClass, Comparator<T> comparator){
                if (comparator == null){
                        comparator = new DefaultTermComparator<T>();
@@ -130,9 +117,6 @@ public class TermStore {
                return terms;
        }
 
-       /**
-        * @param term a {@link eu.etaxonomy.cdm.model.term.DefinedTermBase} object.
-        */
        public static void saveTerm(DefinedTermBase term){
                CdmStore.getService(ITermService.class).saveOrUpdate(term);
        }
@@ -159,8 +143,7 @@ public class TermStore {
        /**
         * Handingling of special cases
         */
-
-       private static Set<ITermStoreEdgeCase<? extends DefinedTermBase>> termStoreEdgeCases = new HashSet<ITermStoreEdgeCase<? extends DefinedTermBase>>();
+       private static Set<ITermStoreEdgeCase<? extends DefinedTermBase>> termStoreEdgeCases = new HashSet<>();
 
        static {
                termStoreEdgeCases.add(new ITermStoreEdgeCase<Feature>() {
@@ -187,7 +170,7 @@ public class TermStore {
                        @Override
                        public List<MarkerType> getTerms() {
                                // filter out non technical markers
-                               List<MarkerType> nonTechnicalMarkerTypes = new ArrayList<MarkerType>();
+                               List<MarkerType> nonTechnicalMarkerTypes = new ArrayList<>();
                                List<MarkerType> markerTypes = TermStore.getTermsFromService(MarkerType.class, null);
 
                                for (Object type : markerTypes) {
@@ -211,26 +194,21 @@ public class TermStore {
                        public List<Rank> getTerms() {
                                if(PreferencesUtil.getSortRanksHierarchichally()){
                                        return TermStore.getTermsFromService(Rank.class, new Comparator<Rank>(){
-
-                                               @Override
-                                               public int compare(Rank o1, Rank o2) {
-                                                       return o1.compareTo(o2);
-                                               }
-
-                                       });
+                                                       @Override
+                                                       public int compare(Rank o1, Rank o2) {
+                                                               return o1.compareTo(o2);
+                                                       }
+                                               });
                                }else{
                                        return TermStore.getTermsFromService(Rank.class, null);
                                }
                        }
-
                });
                termStoreEdgeCases.add(new ITermStoreEdgeCase<PresenceAbsenceTerm>() {
-
                        @Override
                        public Class<PresenceAbsenceTerm> getTermClass() {
                                return PresenceAbsenceTerm.class;
                        }
-
                        @Override
                        public List<PresenceAbsenceTerm> getTerms() {
                                List<PresenceAbsenceTerm> presenceAbsenceTerms = TermStore.getTermsFromService(PresenceAbsenceTerm.class, null);
@@ -239,12 +217,10 @@ public class TermStore {
                        }
                });
                termStoreEdgeCases.add(new ITermStoreEdgeCase<TaxonRelationshipTypeInverseContainer>() {
-
                        @Override
                        public Class<TaxonRelationshipTypeInverseContainer> getTermClass() {
                                return TaxonRelationshipTypeInverseContainer.class;
                        }
-
                        @Override
                        public List<TaxonRelationshipTypeInverseContainer> getTerms() {
                                List<TaxonRelationshipType> excludeTaxonRelationshipTypes = Arrays.asList(new TaxonRelationshipType[]{
@@ -253,7 +229,7 @@ public class TermStore {
                                        TaxonRelationshipType.ALL_RELATIONSHIPS()
                                });
 
-                               List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<TaxonRelationshipTypeInverseContainer>();
+                               List<TaxonRelationshipTypeInverseContainer> relationshipTypeInverseContainers = new ArrayList<>();
 
                                List<TaxonRelationshipType> relationshipTypes = TermStore.getTerms(TaxonRelationshipType.class);