Mercurial > dive4elements > river

changeset 8002:4366ec0d8f8f facet-metadata

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed unused imports and avoid using RiverUtils.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 03 Jul 2014 11:34:30 +0200
parents 5277483044d9
children 06668e62cd7b
files artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java artifacts/src/main/java/org/dive4elements/river/exports/process/MiddleBedHeightProcessor.java
diffstat 2 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java	Thu Jul 03 11:33:41 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/BedHeightProcessor.java	Thu Jul 03 11:34:30 2014 +0200
@@ -8,7 +8,6 @@
 
 package org.dive4elements.river.exports.process;
 
-import java.util.List;
 import java.util.Map;
 
 import org.apache.log4j.Logger;
@@ -17,16 +16,13 @@
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
-import org.dive4elements.river.artifacts.model.minfo.BedHeightSingleData;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
+import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.exports.XYChartGenerator;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
 import org.dive4elements.river.jfree.StyledXYSeries;
-import org.dive4elements.river.model.BedHeightSingleValue;
 import org.dive4elements.river.themes.ThemeDocument;
-import org.dive4elements.river.utils.RiverUtils;
 
 public class BedHeightProcessor extends DefaultProcessor {
 
@@ -113,7 +109,8 @@
     public String getAxisLabel(DiagramGenerator generator) {
         D4EArtifact flys = (D4EArtifact) generator.getMaster();
 
-        String unit = RiverUtils.getRiver(flys).getWstUnit().getName();
+        RiverAccess access = new RiverAccess(flys);
+        String unit = access.getRiver().getWstUnit().getName();
 
         if (yAxisLabel != null && !yAxisLabel.isEmpty()) {
             return generator.msg(
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/MiddleBedHeightProcessor.java	Thu Jul 03 11:33:41 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/MiddleBedHeightProcessor.java	Thu Jul 03 11:34:30 2014 +0200
@@ -12,18 +12,15 @@
 
 import org.apache.log4j.Logger;
 
-import org.jfree.data.xy.XYSeries;
-
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifacts.CallContext;
 
 import org.dive4elements.river.artifacts.D4EArtifact;
+import org.dive4elements.river.artifacts.access.RiverAccess;
 import org.dive4elements.river.artifacts.model.FacetTypes;
-import org.dive4elements.river.artifacts.model.minfo.MiddleBedHeightData;
 import org.dive4elements.river.themes.ThemeDocument;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
-import org.dive4elements.river.utils.RiverUtils;
 import org.dive4elements.river.jfree.StyledXYSeries;
 
 public class MiddleBedHeightProcessor extends DefaultProcessor {
@@ -74,7 +71,8 @@
     public String getAxisLabel(DiagramGenerator generator) {
         D4EArtifact flys = (D4EArtifact) generator.getMaster();
 
-        String unit = RiverUtils.getRiver(flys).getWstUnit().getName();
+        RiverAccess access = new RiverAccess(flys);
+        String unit = access.getRiver().getWstUnit().getName();
 
         if (yAxisLabel != null && !yAxisLabel.isEmpty()) {
             return generator.msg(
http://dive4elements.wald.intevation.org