Mercurial > dive4elements > river
changeset 8220:1d3d61c8f596
Stop stupid propagation of out subtype in generators. What is this? It is not used anyway.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Mon, 08 Sep 2014 13:33:39 +0200 |
| parents | 9667900536b6 |
| children | a0994a326e2a |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/context/RiverContext.java artifacts/src/main/java/org/dive4elements/river/collections/D4EArtifactCollection.java artifacts/src/main/java/org/dive4elements/river/exports/sq/SQOverviewGenerator.java |
| diffstat | 3 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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();
--- 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);
--- 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);