Merge branch 'develop' of github.com:genericworkflownodes/GenericKnimeNodes into develop

Author: poshul

com.genericworkflownodes.knime.config.testing/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for com.genericworkflownodes.knime.config plugin
 Bundle-SymbolicName: com.genericworkflownodes.knime.config.testing;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Vendor: Freie Universitaet Berlin, Universitaet Tuebingen, and the GenericWorkflowNodes Team
 Fragment-Host: com.genericworkflownodes.knime.config;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

com.genericworkflownodes.knime.config/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GenericKnimeNodes-Config
 Bundle-SymbolicName: com.genericworkflownodes.knime.config;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: genericnodes.config.jar,
  lib/commons-lang-2.6.jar,
  lib/dom4j-2.1.3.jar,

com.genericworkflownodes.knime.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.genericworkflownodes.knime.feature"
       label="Generic Workflow Nodes for KNIME"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="Freie Universitaet Berlin, Universitaet Tuebingen, and the GenericWorkflowNodes Team">
 
    <description url="http://www.genericworkflownodes.com">
@@ -697,13 +697,13 @@
          id="com.genericworkflownodes.knime"
          download-size="0"
          install-size="0"
-         version="1.1.0.qualifier"/>
+         version="1.2.0.qualifier"/>
 
    <plugin
          id="com.genericworkflownodes.knime.config"
          download-size="0"
          install-size="0"
-         version="1.1.0.qualifier"/>
+         version="1.2.0.qualifier"/>
 
    <plugin
          id="com.genericworkflownodes.knime.gpl3nodes"

com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/MANIFEST.MF-ResourceOnly.template

@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.knime.workbench.core;bundle-version="[4.0.0,6.0.0)",
  org.knime.workbench.repository;bundle-version="[4.0.0,6.0.0)",
  org.knime.base;bundle-version="[4.0.0,6.0.0)",
- com.genericworkflownodes.knime;bundle-version="[1.1.0,2.0.0)",
- com.genericworkflownodes.knime.config;bundle-version="[1.1.0,2.0.0)"@@dependencies@@
+ com.genericworkflownodes.knime;bundle-version="[1.2.0,2.0.0)",
+ com.genericworkflownodes.knime.config;bundle-version="[1.2.0,2.0.0)"@@dependencies@@
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11

com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/MANIFEST.MF.template

@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.knime.workbench.core;bundle-version="[4.0.0,6.0.0)",
  org.knime.workbench.repository;bundle-version="[4.0.0,6.0.0)",
  org.knime.base;bundle-version="[4.0.0,6.0.0)",
- com.genericworkflownodes.knime;bundle-version="[1.1.0,2.0.0)",
- com.genericworkflownodes.knime.config;bundle-version="[1.1.0,2.0.0)"@@dependencies@@
+ com.genericworkflownodes.knime;bundle-version="[1.2.0,2.0.0)",
+ com.genericworkflownodes.knime.config;bundle-version="[1.2.0,2.0.0)"@@dependencies@@
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 

com.genericworkflownodes.knime.node_generator/src/com/genericworkflownodes/knime/nodegeneration/templates/updatesite/CategoryXMLTemplate.java

@@ -76,7 +76,7 @@ public void registerGKNFeature() {
         //  so we don't need to update?
         elem.addElement("feature")
         	.addAttribute("id", "com.genericworkflownodes.knime.feature");
-            //.addAttribute("version", "1.1.0"); //We might need the actual qualifier. Somehow this does not work.
+            //.addAttribute("version", "1.2.0"); //We might need the actual qualifier. Somehow this does not work.
     }
 
     /**

com.genericworkflownodes.knime.testing.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.genericworkflownodes.knime.testing.feature"
       label="GenericKnimeNodes-Testing"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="Freie Universitaet Berlin, Universitaet Tuebingen, and the GenericWorkflowNodes Team">
 
    <description url="http://www.genericworkflownodes.com">

com.genericworkflownodes.knime/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GenericKnimeNodes
 Bundle-SymbolicName: com.genericworkflownodes.knime;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: genericnodes.jar,
  lib/swingx-all-1.6.4.jar,
  lib/bsh-2.0b6.jar,
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  com.genericworkflownodes.knime.config;bundle-version="1.0.0",
  org.knime.base.filehandling;bundle-version="[3.1.0,6.0.0)",
  org.knime.filehandling.core;bundle-version="4.6.0",
- org.apache.log4j;bundle-version="[2.17.0,3.0.0)",
  org.apache.commons.commons-io;bundle-version="[2.15.1,3.0.0)"
 Export-Package: com.genericworkflownodes.knime.base.data.port,
  com.genericworkflownodes.knime.commandline,

com.genericworkflownodes.knime/src/com/genericworkflownodes/util/MIMETypeHelper.java

@@ -20,8 +20,10 @@
 
 import java.io.File;
 import java.util.Optional;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+
+import org.knime.core.node.NodeLogger;
+
+import com.genericworkflownodes.knime.GenericNodesPlugin;
 
 import org.knime.base.filehandling.mime.MIMEMap;
 import org.knime.base.filehandling.mime.MIMETypeEntry;
@@ -33,6 +35,13 @@
  */
 public final class MIMETypeHelper {
 
+    /**
+     * The central static logger.
+     */
+    private static final NodeLogger LOGGER = NodeLogger
+            .getLogger(MIMETypeHelper.class);
+
+
     /**
      * Utility class should have private c'tor.
      */
@@ -62,7 +71,7 @@ public static Optional<String> getMIMEtype(String filename) {
         String foundExtension = "";
 
 
-        Logger.getLogger(org.knime.base.filehandling.mime.MIMEMap.class.getName()).setLevel(Level.OFF);
+        LOGGER.setLevel(NodeLogger.LEVEL.OFF);
 
         for (MIMETypeEntry entry : MIMEMap.getAllTypes()) {
             for (String ext : entry.getExtensions()) {
@@ -104,7 +113,7 @@ public static Optional<String> getMIMEtypeByExtension(String extension) {
         // Ensure Lowercase comparison
         extension = extension.toLowerCase();
 
-        Logger.getLogger(org.knime.base.filehandling.mime.MIMEMap.class.getName()).setLevel(Level.OFF);
+        LOGGER.setLevel(NodeLogger.LEVEL.OFF);
 
         // check existing mimetypes
         for (MIMETypeEntry entry : MIMEMap.getAllTypes()) {
@@ -133,7 +142,7 @@ public static Optional<String> getMIMEtypeExtension(String filename) {
         // Ensure lowercase comparison
         filename = filename.toLowerCase();
 
-        Logger.getLogger(org.knime.base.filehandling.mime.MIMEMap.class.getName()).setLevel(Level.OFF);
+        LOGGER.setLevel(NodeLogger.LEVEL.OFF);
 
         // check existing mimetypes
         String type = null;