Mercurial > dive4elements > river
changeset 7855:92a2b9b691e1
Fixed imports and make it build again.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 30 Apr 2014 17:23:28 +0200 |
| parents | 8c6ed23ce315 |
| children | f50eeccbbadd |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFilterFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/StaticPorosityCacheKey.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java |
| diffstat | 5 files changed, 8 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Wed Apr 30 17:16:57 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Wed Apr 30 17:23:28 2014 +0200 @@ -14,8 +14,6 @@ import org.dive4elements.artifactdatabase.state.DefaultOutput; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.State; -import org.dive4elements.artifacts.ArtifactFactory; -import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.model.FacetTypes; import org.dive4elements.river.artifacts.model.RiverFactory; import org.dive4elements.river.model.River; @@ -26,7 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; -import org.w3c.dom.Document; @Deprecated public class RiverAxisArtifact extends WMSDBArtifact {
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java Wed Apr 30 17:16:57 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java Wed Apr 30 17:23:28 2014 +0200 @@ -10,15 +10,10 @@ import java.util.List; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import com.vividsolutions.jts.geom.Envelope; -import org.dive4elements.artifacts.ArtifactFactory; -import org.dive4elements.artifacts.CallMeta; - import org.dive4elements.artifactdatabase.state.DefaultOutput; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.State; @@ -37,10 +32,6 @@ public static final String NAME = "buildings"; - private static final Logger logger = - Logger.getLogger(WMSBuildingsArtifact.class); - - @Override public String getName() { return NAME;
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFilterFacet.java Wed Apr 30 17:16:57 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFilterFacet.java Wed Apr 30 17:23:28 2014 +0200 @@ -1,11 +1,9 @@ package org.dive4elements.river.artifacts.model; -import org.apache.log4j.Logger; import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.river.artifacts.WINFOArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; import org.dive4elements.river.artifacts.context.RiverContext; import org.dive4elements.river.artifacts.math.MovingAverage; @@ -15,9 +13,6 @@ public class DifferenceCurveFilterFacet extends DifferenceCurveFacet { - private static Logger logger = Logger.getLogger(DifferenceCurveFacet.class); - - public DifferenceCurveFilterFacet() { }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/StaticPorosityCacheKey.java Wed Apr 30 17:16:57 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/StaticPorosityCacheKey.java Wed Apr 30 17:23:28 2014 +0200 @@ -8,22 +8,25 @@ package org.dive4elements.river.artifacts.model; +import java.io.Serializable; + public class StaticPorosityCacheKey +implements Serializable { public static final String CACHE_NAME = "porosity-table-static"; - private int porosity_id; + private int porosityId; public StaticPorosityCacheKey( - int porosity_id + int porosityId ) { - this.porosity_id = porosity_id; + this.porosityId = porosityId; } @Override public int hashCode() { - return (String.valueOf(porosity_id)).hashCode(); + return (String.valueOf(porosityId)).hashCode(); } @Override @@ -32,6 +35,6 @@ return false; } StaticPorosityCacheKey o = (StaticPorosityCacheKey) other; - return this.porosity_id == o.porosity_id; + return this.porosityId == o.porosityId; } }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java Wed Apr 30 17:16:57 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/PorosityFactory.java Wed Apr 30 17:23:28 2014 +0200 @@ -19,7 +19,6 @@ import org.hibernate.type.StandardBasicTypes; import org.dive4elements.river.artifacts.cache.CacheFactory; -import org.dive4elements.river.artifacts.model.StaticMorphoWidthCacheKey; import org.dive4elements.river.artifacts.model.StaticPorosityCacheKey; import org.dive4elements.river.backend.SessionHolder;