# HG changeset patch # User Raimund Renkert # Date 1398863552 -7200 # Node ID 8d5ca5175038be8d5dfcbf3660c01d0c8123186e # Parent 8036688f24e1dd58fec80a926eba9e1b1af034dd Updated signature of artifacts setup method; Removed unnecessary setup overrides. diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/AnnotationArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -83,7 +83,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("AnnotationArtifact.setup"); String filter = StaticD4EArtifact.getDatacageIDValue(data); @@ -91,7 +92,7 @@ if (splits.length > 1) { addStringData("nameFilter", splits[1]); } - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/AreaArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/AreaArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/AreaArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -76,11 +76,12 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.info("AreaArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); // TODO yet unused. String ids = getDatacageIDValue(data); diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -74,7 +74,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("BedHeightsArtifact.setup"); @@ -132,7 +133,7 @@ addFacets(STATIC_STATE_NAME, facets); } } - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } @Override diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/ChartArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/ChartArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/ChartArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -49,7 +49,8 @@ ArtifactFactory factory, Object context, CallMeta callmeta, - Document data) + Document data, + List loadFacets) { logger.debug("ChartArtifact.setup"); this.identifier = identifier; diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/CrossSectionArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -110,11 +110,12 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.info("CrossSectionArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); String ids = getDatacageIDValue(data); diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/D4EArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -199,11 +199,12 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List facets) { log.debug("Setup this artifact with the uuid: " + identifier); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, facets); RiverContext flysContext = RiverUtils.getFlysContext(context); diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/ExternalWMSArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/ExternalWMSArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/ExternalWMSArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -46,11 +46,12 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.info("ExternalWMSArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); String ids = getDatacageIDValue(data); diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityMeasurementArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityMeasurementArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityMeasurementArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -112,7 +112,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("FlowVelocityMeasurementArtifact.setup"); @@ -168,7 +169,7 @@ } spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityModelArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityModelArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/FlowVelocityModelArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -141,7 +141,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("FlowVelocityModelArtifact.setup"); @@ -201,7 +202,7 @@ } spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -77,7 +77,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("GaugeDischargeArtifact.setup"); String ids = StaticD4EArtifact.getDatacageIDValue(data); @@ -90,7 +91,7 @@ if (splitIds.length > 2) { facetWishName = splitIds[2]; } - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeCurveArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeCurveArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeCurveArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -81,7 +81,8 @@ ArtifactFactory factory, Object context, CallMeta callmeta, - Document data) + Document data, + List loadFacets) { logger.debug("GaugeDischargeCurveArtifact.setup"); @@ -169,7 +170,7 @@ addFacets(STATIC_STATE_NAME, fs); - super.setup(identifier, factory, context, callmeta, data); + super.setup(identifier, factory, context, callmeta, data, loadFacets); } @Override diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/HYKArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/HYKArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/HYKArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -64,7 +64,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.info("HYKArtifact.setup"); @@ -74,7 +75,7 @@ addStringData(HYK_ID, ids); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -107,7 +107,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("MainValuesArtifact.setup"); state = new StaticState(STATIC_STATE_NAME); @@ -117,7 +118,7 @@ List fs = new ArrayList(); addFacets(state.getID(), fs); spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); String restriction = getDatacageIDValue(data); logger.debug("mainvalue restriction " + restriction); boolean restricted = restriction.endsWith("q") || restriction.endsWith("w"); diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/ManualPointsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/ManualPointsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/ManualPointsArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -58,10 +58,11 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("ManualPointsArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); initialize(null, context, callMeta); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/MapArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MapArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MapArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -43,7 +43,8 @@ ArtifactFactory factory, Object context, CallMeta callmeta, - Document data) + Document data, + List loadFacets) { logger.debug("MapArtifact.setup"); this.identifier = identifier; diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/QSectorArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/QSectorArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/QSectorArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -64,10 +64,11 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("QSectorArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); initialize(null, context, callMeta); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -39,20 +39,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("RiverAxisArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SQRelationArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -54,8 +54,9 @@ ArtifactFactory factory, Object context, CallMeta callmeta, - Document data - ) { + Document data, + List loadFacets) + { logger.debug("SQRelationArtifact.setup()"); String code = getDatacageIDValue(data); @@ -65,7 +66,7 @@ if (code != null && !code.isEmpty()) { /* Case that we were instantiated from the datacage */ addStringData("ids", code); - super.setup(identifier, factory, context, callmeta, data); + super.setup(identifier, factory, context, callmeta, data, loadFacets); return; } @@ -92,7 +93,7 @@ Resources.getMsg(callmeta, "static.sq.station", "Station"), "String", station)); - super.setup(identifier, factory, context, callmeta, data); + super.setup(identifier, factory, context, callmeta, data, loadFacets); // When we are in this case we did not come from the datacage // e.g. had an ID string set. So we also did not have a template // set and initialize is not called. So we have to do this ourself. diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentDensityArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentDensityArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentDensityArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -118,7 +118,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("SedimentDensityArtifact.setup"); @@ -151,7 +152,7 @@ } spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/SedimentYieldArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -126,7 +126,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("SedimentYieldArtifact.setup"); @@ -240,7 +241,7 @@ } spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticD4EArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticD4EArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticD4EArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -135,10 +135,11 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("StaticD4EArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticMorphWidthArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticMorphWidthArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticMorphWidthArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -64,7 +64,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("setup"); @@ -87,7 +88,7 @@ addFacets(STATIC_STATE_NAME, facets); } - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } @Override diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -103,7 +103,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("StaticWKmsArtifact.setup"); @@ -179,7 +180,7 @@ } spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -96,7 +96,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("StaticWQKmsArtifact.setup"); @@ -125,7 +126,7 @@ } // Do this AFTER we have set the col_pos etc. - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSBuildingsArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -42,20 +42,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSBuildingsArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSDBArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSDBArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSDBArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -41,11 +41,12 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("WMSDBArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); String ids = getDatacageIDValue(data); diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFixpointsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFixpointsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFixpointsArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSFixpointsArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmapsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmapsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmapsArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSFloodmapsArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmarksArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmarksArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodmarksArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSFloodmarksArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodplainArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodplainArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSFloodplainArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSFloodplainArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSGaugeLocationArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSGaugeLocationArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSGaugeLocationArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -10,16 +10,11 @@ import java.util.List; -import org.w3c.dom.Document; - import org.apache.log4j.Logger; import com.vividsolutions.jts.geom.Envelope; import com.vividsolutions.jts.geom.Geometry; -import org.dive4elements.artifacts.ArtifactFactory; -import org.dive4elements.artifacts.CallMeta; - import org.dive4elements.artifactdatabase.state.Facet; import org.dive4elements.artifactdatabase.state.DefaultOutput; import org.dive4elements.artifactdatabase.state.State; @@ -27,7 +22,6 @@ import org.dive4elements.river.model.River; import org.dive4elements.river.model.GaugeLocation; -import org.dive4elements.river.artifacts.WMSDBArtifact.WMSDBState; import org.dive4elements.river.artifacts.model.FacetTypes; import org.dive4elements.river.artifacts.model.RiverFactory; import org.dive4elements.river.utils.RiverUtils; @@ -44,20 +38,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSGaugeLocationArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSLinesArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSLinesArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSLinesArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSHWSLinesArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSPointsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSPointsArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHWSPointsArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSHWSPointsArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSHydrBoundaryArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryPolyArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryPolyArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSHydrBoundaryPolyArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSHydrBoundaryArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSJettiesArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSJettiesArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSJettiesArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSJettiesArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSKmArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSKmArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSKmArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -48,11 +48,12 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("WMSKmArtifact.setup"); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSLineArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSLineArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSLineArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSLineArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WMSQPSArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSQPSArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WMSQPSArtifact.java Wed Apr 30 15:12:32 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; @@ -42,20 +37,6 @@ @Override - public void setup( - String identifier, - ArtifactFactory factory, - Object context, - CallMeta callMeta, - Document data) - { - logger.debug("WMSQPSArtifact.setup"); - - super.setup(identifier, factory, context, callMeta, data); - } - - - @Override public String getName() { return NAME; } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WQKmsInterpolArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WQKmsInterpolArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WQKmsInterpolArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -92,7 +92,8 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { logger.debug("WQKmsInterpolArtifact.setup"); @@ -157,7 +158,7 @@ } spawnState(); - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); } diff -r 8036688f24e1 -r 8d5ca5175038 artifacts/src/main/java/org/dive4elements/river/artifacts/WaterlevelArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WaterlevelArtifact.java Wed Apr 30 14:12:59 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WaterlevelArtifact.java Wed Apr 30 15:12:32 2014 +0200 @@ -64,9 +64,10 @@ ArtifactFactory factory, Object context, CallMeta callMeta, - Document data) + Document data, + List loadFacets) { - super.setup(identifier, factory, context, callMeta, data); + super.setup(identifier, factory, context, callMeta, data, loadFacets); // For w_differences, also allow q-facets. if(filterFacets != null) { List list = new ArrayList();