Merge branch 'release/5.32.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / description / NaturalLanguageDetailElement.java

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 289ef4ea92728930b852335597c4e3f771cdd976..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
@@ -6,12 +6,13 @@
 * 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.ui.section.description;
 
 import java.util.List;
 
-import org.apache.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;
 import org.eclipse.core.runtime.Status;
@@ -36,13 +37,11 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  *
  * @author n.hoffmann
  * @created Sep 16, 2010
- * @version 1.0
  */
 public class NaturalLanguageDetailElement extends AbstractCdmDetailElement<TaxonDescription> {
 
+       private static final Logger logger = LogManager.getLogger(NaturalLanguageDetailElement.class);
 
-       private static final Logger logger = Logger
-                       .getLogger(NaturalLanguageDetailElement.class);
        private LabelElement label;
 
        /**
@@ -83,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){