minor

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
index 6b3143b324def03e6789e6b7ab789602423b9a09..750ee4c356f6e4dd296f37b5c6cd717a45d2f2fa 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/springframework/remoting/httpinvoker/CachingHttpInvokerProxyFactoryBean.java
@@ -29,8 +29,8 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
  * <b>Performance measurement:</b></br>
  * Supports measuring the request processing time at the client side. Setting "{@value #PROP_KEY_MEASURE_DURATION}"
  * as system parameter enables the measurement. To make the measurements appear for each request in the log, the logging <code>Level</code>
- * for <code>HttpInvokerProxyFactoryBean</code> needs to be set to at least {@link org.apache.log4j.Level#INFO}. Otherwise the duration is
- * only reported in case of errors.
+ * for <code>HttpInvokerProxyFactoryBean</code> needs to be set to at least {@link org.apache.logging.log4j.Level#INFO}. 
+ * Otherwise the duration is only reported in case of errors.
  *
  * @author a.kohlbecker
  * @since Feb 4, 2020

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
index 427f656007ff82597ab3ffa38926bebbd6053cc0..48ce6465bc7fe847a7c154dcaa8cea28b6e10ffd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MessagingUtils.java
@@ -48,7 +48,7 @@ public class MessagingUtils {
      *
      * @param clazz
      *            a {@link java.lang.Class} object.
-     * @return a {@link org.apache.log4j.Logger} object.
+     * @return a {@link org.apache.logging.log4j.Logger} object.
      */
     public static Logger getLog4JLogger(Class<?> clazz) {
         return LogManager.getLogger(clazz);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java
index beb40d0d99475f12a482ea087c14853077f48018..183063936ed9de47bb5b2d14de337dc912921b5e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/NaturalLanguageDetailElement.java
@@ -10,7 +10,8 @@ package eu.etaxonomy.taxeditor.ui.section.description;
 
 import java.util.List;
 
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -81,7 +82,7 @@ public class NaturalLanguageDetailElement extends AbstractCdmDetailElement<Taxon
 
                private TaxonDescription entity;
                private NaturalLanguageGenerator generator = new NaturalLanguageGenerator();
-               private TermTree featureTree = PreferencesUtil.getDefaultFeatureTreeForStructuredDescription();
+               private TermTree<?> featureTree = PreferencesUtil.getDefaultFeatureTreeForStructuredDescription();
                private Display display = Display.getCurrent();
 
                public FetchNaturalLanguageDescriptionJob(String jobName, TaxonDescription entity){