cleanup

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index b29770f438b8477abb337c72ebef17cd1c43f5c8..57f3dbbfb971a8581b847494866b173262bc35f0 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -531,12 +531,4 @@ Bundle-ClassPath: .,
  lib/iiif-apis-0.3.9.jar,
  lib/jboss-transaction-api_1.2_spec-1.1.1.Final.jar,
  lib/mysql-connector-java-8.0.29.jar
-Comment: currently excluded - 
- lib/activation-1.1.1.jar,
- lib/avro-1.6.3.jar,
- lib/hibernate-c3p0-5.1.17.Final.jar,
- lib/jaxen-1.2.0.jar,
- lib/jta-1.1.jar,
- lib/lsid-server-1.1.2.jar,
- lib/wsdl4j-1.6.3.jar,
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java b/eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java
index 6ed6f13a5ee2add10f31454ae3604c0567d29ebd..718525438d120f8b000ea37bba4e251092af0761 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java
+++ b/eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java
@@ -1,3 +1,11 @@
+/**
+* Copyright (C) 2007 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.help;
 
 import org.eclipse.jface.resource.ImageDescriptor;
@@ -14,27 +22,22 @@ public class Activator extends AbstractUIPlugin {
 
        // The shared instance
        private static Activator plugin;
-       
+
        /**
         * The constructor
         */
        public Activator() {
        }
 
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-        */
-       public void start(BundleContext context) throws Exception {
+
+       @Override
+    public void start(BundleContext context) throws Exception {
                super.start(context);
                plugin = this;
        }
 
-       /*
-        * (non-Javadoc)
-        * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-        */
-       public void stop(BundleContext context) throws Exception {
+       @Override
+    public void stop(BundleContext context) throws Exception {
                plugin = null;
                super.stop(context);
        }

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 64ca0927bdeed66eb0ab1195ad52904297ff3997..a259c97d476902a28cca5a9c54ec05383bf17ddf 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
@@ -164,7 +164,7 @@ public class TermManager {
                                        filteredTerms.add(type);
                                }
                        }
-                       
+
                        if(PreferencesUtil.getBooleanValue(getPrefName(term), true)){
                                filteredTerms.add(term);
                        }
@@ -193,10 +193,10 @@ public class TermManager {
 
                return filteredTerms;
        }
-       
+
        public <T extends DefinedTermBase>List<T> createTermListFromString(String stringValue, TermType type){
                 List<String> checked = new ArrayList<>();
-       
+
                if (stringValue != null){
                        String[] listChecked = stringValue.split(";"); //$NON-NLS-1$
                        String[] listCheckedComma = stringValue.split(","); //$NON-NLS-1$
@@ -214,7 +214,7 @@ public class TermManager {
         protected <T extends DefinedTermBase>List<T> getTermsFromStringValues(List<String> listValue, TermType type) {
                Collection<DefinedTermBase> termlist = new ArrayList<>();
                ITermService termService = CdmStore.getService(ITermService.class);
-               Set<UUID> uuidList = new HashSet();
+               Set<UUID> uuidList = new HashSet<>();
                for (String s : listValue) {
                    if (!StringUtils.isBlank(s)){
                        UUID uuid = UUID.fromString(s);
@@ -225,14 +225,14 @@ public class TermManager {
                    termlist = termService.find(uuidList);
                }
 
-               if (listValue == null || listValue.isEmpty() ){
+               if (listValue.isEmpty() ){
                    termlist = termService.listByTermType(type, null, null, null, null);
 
                }
 
                return new ArrayList(termlist);
            }
-       
+
        /**
      * Generic method to get term preferences for a term vocabulary
      *