added fix so that nested l2-parameters in L2 process work again

Author: Thomas

calvalus-processing/pom.xml

@@ -77,6 +77,10 @@
             <groupId>org.esa.snap</groupId>
             <artifactId>snap-binning</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.esa.snap</groupId>
+            <artifactId>snap-python</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.esa.snap</groupId>
             <artifactId>snap-envisat-reader</artifactId>

calvalus-processing/src/main/java/com/bc/calvalus/processing/beam/SnapOperatorAdapter.java

@@ -30,6 +30,7 @@
 import org.esa.snap.core.gpf.OperatorSpi;
 import org.esa.snap.core.gpf.annotations.ParameterBlockConverter;
 import org.esa.snap.core.gpf.annotations.ParameterDescriptorFactory;
+import org.esa.snap.python.gpf.PyOperator;
 
 import java.io.File;
 import java.io.IOException;
@@ -153,8 +154,8 @@ private Product getProcessedProduct(Product source, Product[] inputProducts, Str
             // transform request into parameter objects
             Map<String, Object> parameterMap;
             try {
-                //parameterMap = getOperatorParameterMap(source, operatorName, operatorParameters);
-                parameterMap = getOperatorParameterMap(source, null, operatorParameters);
+                parameterMap = getOperatorParameterMap(source, operatorName, operatorParameters);
+//                parameterMap = getOperatorParameterMap(source, null, operatorParameters);
                 for (int i=0; i<getInputParameters().length; i+=2) {
                     if ("output".equals(getInputParameters()[i])) {
                         // drop parameter, is used later in SubsetProcessorAdapter
@@ -199,8 +200,8 @@ public static Map<String, Object> getOperatorParameterMap(Product inputProduct,
         } else {
             parameterBlockConverter = new ParameterBlockConverter();
         }
-        if (operatorName != null) {
-            Class<? extends Operator> operatorClass = getOperatorClass(operatorName);
+        Class<? extends Operator> operatorClass = getOperatorClass(operatorName);
+        if (!isPythonOperator(operatorClass)) {
             return parameterBlockConverter.convertXmlToMap(level2Parameters, operatorClass);
         } else {
             DomElement dom = parameterBlockConverter.convertXmlToDomElement(level2Parameters);
@@ -213,6 +214,10 @@ public static Map<String, Object> getOperatorParameterMap(Product inputProduct,
         }
     }
 
+    private static boolean isPythonOperator(Class<? extends Operator> operatorClass) {
+        return PyOperator.class.isAssignableFrom(operatorClass);
+    }
+
     private static Class<? extends Operator> getOperatorClass(String operatorName) {
         OperatorSpi operatorSpi = GPF.getDefaultInstance().getOperatorSpiRegistry().getOperatorSpi(operatorName);
         if (operatorSpi == null) {