Mercurial > dive4elements > gnv-client
changeset 115:158e89c2263b
Removed needless imports.
gnv-artifacts/trunk@166 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Thu, 01 Oct 2009 08:57:49 +0000 |
| parents | d8d38a4dd965 |
| children | 820238357bab |
| files | gnv-artifacts/Changelog gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/FISArtifact.java gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java gnv-artifacts/src/main/java/de/intevation/gnv/transition/MinMaxTransition.java gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java |
| diffstat | 9 files changed, 22 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/Changelog Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/Changelog Thu Oct 01 08:57:49 2009 +0000 @@ -1,3 +1,18 @@ +2009-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> + + * src/main/java/de/intevation/gnv/artifacts/fis/FISArtifact.java, + src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java, + src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java, + src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java, + src/main/java/de/intevation/gnv/transition/MinMaxTransition.java, + src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java, + src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java: + Removed needless imports. + + * src/main/java/de/intevation/gnv/utils/InputValidator.java: + Import org.apache.commons.validator.GenericValidator instead of + absolute usage in methods. + 2009-09-30 Tim Englich <tim.englich@intevation.de> * src/test/ressources/queries.properties Edited:
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Thu Oct 01 08:57:49 2009 +0000 @@ -5,13 +5,11 @@ import java.io.IOException; import java.io.OutputStream; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import javax.xml.XMLConstants; import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/FISArtifact.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/fis/FISArtifact.java Thu Oct 01 08:57:49 2009 +0000 @@ -29,9 +29,6 @@ import de.intevation.gnv.artifacts.fis.product.Product; import de.intevation.gnv.transition.DefaultInputData; import de.intevation.gnv.transition.InputData; -import de.intevation.gnv.transition.InputValue; -import de.intevation.gnv.transition.OutputMode; -import de.intevation.gnv.transition.OutputTransition; import de.intevation.gnv.utils.ArtifactFactoryUtilities; import de.intevation.gnv.utils.ArtifactXMLUtilities;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Thu Oct 01 08:57:49 2009 +0000 @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import de.intevation.gnv.geobackend.base.Result; -import de.intevation.gnv.geobackend.sde.datasources.ResultSet; import de.intevation.gnv.statistics.exception.StatisticsException;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Thu Oct 01 08:57:49 2009 +0000 @@ -5,12 +5,10 @@ import org.apache.log4j.Logger; import org.w3c.dom.Document; -import org.w3c.dom.Node; import de.intevation.artifacts.ArtifactFactory; import de.intevation.artifacts.CallContext; import de.intevation.gnv.artifacts.GNVArtifactBase; -import de.intevation.gnv.artifacts.context.GNVArtifactContext; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/MinMaxTransition.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/MinMaxTransition.java Thu Oct 01 08:57:49 2009 +0000 @@ -7,13 +7,10 @@ import java.util.Collection; import org.apache.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Node; import de.intevation.gnv.geobackend.base.Result; import de.intevation.gnv.transition.describedata.DefaultMinMaxDescribeData; import de.intevation.gnv.transition.describedata.DescribeData; -import de.intevation.gnv.transition.describedata.MinMaxDescribeData; /** * @author Tim Englich <tim.englich@intevation.de>
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/profile/vertical/VerticalProfileOutputTransition.java Thu Oct 01 08:57:49 2009 +0000 @@ -12,7 +12,6 @@ import de.intevation.gnv.chart.VerticalProfileChartFactory; import de.intevation.gnv.chart.exception.TechnicalChartException; import de.intevation.gnv.statistics.Statistics; -import de.intevation.gnv.statistics.TimeseriesStatistics; import de.intevation.gnv.statistics.VerticalProfileStatistics; import de.intevation.gnv.transition.describedata.KeyValueDescibeData; import de.intevation.gnv.transition.timeseries.TimeSeriesOutputTransition;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/ArtifactFactoryUtilities.java Thu Oct 01 08:57:49 2009 +0000 @@ -7,7 +7,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; -import de.intevation.artifactdatabase.Config; import de.intevation.artifacts.ArtifactFactory;
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Wed Sep 30 13:48:02 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java Thu Oct 01 08:57:49 2009 +0000 @@ -7,6 +7,8 @@ import de.intevation.gnv.geobackend.util.DateUtils; +import org.apache.commons.validator.GenericValidator; + /** * @author Tim Englich <tim.englich@intevation.de> * @@ -31,15 +33,15 @@ for (int i = 0; i < values.length; i++){ boolean valid; if ("Integer".equalsIgnoreCase(type)){ - valid = org.apache.commons.validator.GenericValidator.isInt(values[i].trim()); + valid = GenericValidator.isInt(values[i].trim()); }else if ("Double".equalsIgnoreCase(type)){ - valid = org.apache.commons.validator.GenericValidator.isDouble(values[i].trim()); + valid = GenericValidator.isDouble(values[i].trim()); }else if ("String".equalsIgnoreCase(type)){ - valid = org.apache.commons.validator.GenericValidator.matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO: FIXME: VALIDATE REGEXP + valid = GenericValidator.matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO: FIXME: VALIDATE REGEXP }else if ("Date".equalsIgnoreCase(type)){ - valid = org.apache.commons.validator.GenericValidator.isDate(values[i].trim(), DateUtils.DATE_PATTERN, true); + valid = GenericValidator.isDate(values[i].trim(), DateUtils.DATE_PATTERN, true); }else if ("Point".equalsIgnoreCase(type)){ - valid = org.apache.commons.validator.GenericValidator.matchRegexp(values[i], "[0-9]"); // TODO: FIXME: VALIDATE REGEXP + valid = GenericValidator.matchRegexp(values[i], "[0-9]"); // TODO: FIXME: VALIDATE REGEXP }else{ valid = false; }