# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1410176019 -7200
# Node ID 1d3d61c8f596fe56b757bb428bbaa132a72023fd
# Parent  9667900536b680e4778d3db3bc1a71bc33432cca
Stop stupid propagation of out subtype in generators. What is this? It is not used anyway.

diff -r 9667900536b6 -r 1d3d61c8f596 artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java	Mon Sep 08 13:17:49 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java	Mon Sep 08 13:33:39 2014 +0200
@@ -93,10 +93,8 @@
      */
     public static OutGenerator getOutGenerator(
         CallContext context,
-        String      name,
-        String      type)
-    {
-
+        String      name
+    ) {
         RiverContext flysContext = context instanceof RiverContext
             ? (RiverContext) context
             : (RiverContext) context.globalContext();
diff -r 9667900536b6 -r 1d3d61c8f596 artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java
--- a/artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java	Mon Sep 08 13:17:49 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java	Mon Sep 08 13:33:39 2014 +0200
@@ -322,7 +322,7 @@
         CollectionAttribute attr,
         String              out
     ) {
-        OutGenerator outGen = RiverContext.getOutGenerator(getContext(), out, null);
+        OutGenerator outGen = RiverContext.getOutGenerator(getContext(), out);
 
         if (outGen == null) {
             return null;
@@ -387,7 +387,7 @@
             ? type
             : name;
 
-        OutGenerator generator = RiverContext.getOutGenerator(context, key, subtype);
+        OutGenerator generator = RiverContext.getOutGenerator(context, key);
 
         if (generator == null) {
             log.error("There is no generator specified for output: " + name);
diff -r 9667900536b6 -r 1d3d61c8f596 artifacts/src/main/java/org/dive4elements/river/exports/sq/SQOverviewGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQOverviewGenerator.java	Mon Sep 08 13:17:49 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/sq/SQOverviewGenerator.java	Mon Sep 08 13:33:39 2014 +0200
@@ -90,8 +90,7 @@
             ChartGenerator2 g =
                 (ChartGenerator2)RiverContext.getOutGenerator(
                     context,
-                    name,
-                    null);
+                    name);
             /* Make sure master is also set in those */
             g.setMasterArtifact(master);