Mercurial > dive4elements > river
changeset 4772:f939e1e6cfa4
Sorted imports.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Sat, 05 Jan 2013 12:20:28 +0100 (2013-01-05) |
parents | e21acb4f5c62 |
children | f0b3ad10f67f |
files | flys-aft/src/main/java/de/intevation/aft/DIPSGauge.java flys-aft/src/main/java/de/intevation/aft/DischargeTable.java flys-aft/src/main/java/de/intevation/aft/Notification.java flys-aft/src/main/java/de/intevation/aft/River.java flys-aft/src/main/java/de/intevation/aft/Rivers.java flys-aft/src/main/java/de/intevation/aft/Sync.java flys-aft/src/main/java/de/intevation/aft/SyncContext.java flys-aft/src/main/java/de/intevation/aft/WQDiff.java flys-aft/src/main/java/de/intevation/db/ConnectedStatements.java flys-aft/src/main/java/de/intevation/db/ConnectionBuilder.java flys-aft/src/main/java/de/intevation/db/Statements.java flys-aft/src/main/java/de/intevation/db/SymbolicStatement.java flys-aft/src/main/java/de/intevation/utils/XML.java |
diffstat | 13 files changed, 109 insertions(+), 113 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-aft/src/main/java/de/intevation/aft/DIPSGauge.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/DIPSGauge.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,20 +1,20 @@ package de.intevation.aft; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.List; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.log4j.Logger; + import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import java.util.ArrayList; -import java.util.List; -import java.util.Date; -import java.util.Calendar; -import java.util.Collections; -import java.util.Comparator; - -import java.util.regex.Pattern; -import java.util.regex.Matcher; - -import org.apache.log4j.Logger; - public class DIPSGauge { private static Logger log = Logger.getLogger(DIPSGauge.class);
--- a/flys-aft/src/main/java/de/intevation/aft/DischargeTable.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/DischargeTable.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,17 +1,17 @@ package de.intevation.aft; -import java.util.List; -import java.util.Date; -import java.util.ArrayList; -import java.util.TreeSet; -import java.util.Set; +import de.intevation.db.ConnectedStatements; +import de.intevation.db.SymbolicStatement; +import java.sql.ResultSet; import java.sql.SQLException; -import java.sql.ResultSet; import java.sql.Types; -import de.intevation.db.SymbolicStatement; -import de.intevation.db.ConnectedStatements; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; import org.apache.log4j.Logger;
--- a/flys-aft/src/main/java/de/intevation/aft/Notification.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/Notification.java Sat Jan 05 12:20:28 2013 +0100 @@ -6,16 +6,16 @@ import java.io.InputStream; import java.io.OutputStream; +import java.net.HttpURLConnection; import java.net.URL; import java.net.URLConnection; -import java.net.HttpURLConnection; + +import org.apache.log4j.Logger; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.apache.log4j.Logger; - public class Notification { private static Logger log = Logger.getLogger(Notification.class);
--- a/flys-aft/src/main/java/de/intevation/aft/River.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/River.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,17 +1,17 @@ package de.intevation.aft; -import java.util.List; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; +import de.intevation.db.ConnectedStatements; +import de.intevation.db.SymbolicStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import de.intevation.db.ConnectedStatements; -import de.intevation.db.SymbolicStatement; +import org.apache.log4j.Logger; public class River extends IdPair
--- a/flys-aft/src/main/java/de/intevation/aft/Rivers.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/Rivers.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,15 +1,14 @@ package de.intevation.aft; -import java.util.Map; +import de.intevation.db.ConnectedStatements; + +import java.sql.ResultSet; +import java.sql.SQLException; + +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; - - -import java.sql.SQLException; -import java.sql.ResultSet; - -import de.intevation.db.ConnectedStatements; +import java.util.Map; import org.apache.log4j.Logger;
--- a/flys-aft/src/main/java/de/intevation/aft/Sync.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/Sync.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,23 +1,23 @@ package de.intevation.aft; +import de.intevation.db.ConnectionBuilder; + +import de.intevation.utils.XML; + import java.io.File; +import java.net.MalformedURLException; import java.net.URL; -import java.net.MalformedURLException; import java.sql.SQLException; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; -import org.w3c.dom.Element; +import javax.xml.xpath.XPathConstants; import org.apache.log4j.Logger; -import javax.xml.xpath.XPathConstants; - -import de.intevation.utils.XML; - -import de.intevation.db.ConnectionBuilder; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; public class Sync {
--- a/flys-aft/src/main/java/de/intevation/aft/SyncContext.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/SyncContext.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,22 +1,21 @@ package de.intevation.aft; -import java.util.Map; -import java.util.Date; -import java.util.HashMap; -import java.util.TreeMap; - -import java.sql.SQLException; -import java.sql.ResultSet; - -import org.w3c.dom.Document; - import de.intevation.db.ConnectedStatements; -import org.w3c.dom.NodeList; -import org.w3c.dom.Element; +import java.sql.ResultSet; +import java.sql.SQLException; + +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.TreeMap; import org.apache.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + public class SyncContext { private static Logger log = Logger.getLogger(SyncContext.class); @@ -189,4 +188,3 @@ } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : -
--- a/flys-aft/src/main/java/de/intevation/aft/WQDiff.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/aft/WQDiff.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,15 +1,15 @@ package de.intevation.aft; -import java.util.Collection; -import java.util.Set; -import java.util.TreeSet; -import java.util.Iterator; +import de.intevation.db.ConnectedStatements; +import de.intevation.db.SymbolicStatement; import java.sql.ResultSet; import java.sql.SQLException; -import de.intevation.db.ConnectedStatements; -import de.intevation.db.SymbolicStatement; +import java.util.Collection; +import java.util.Iterator; +import java.util.Set; +import java.util.TreeSet; public class WQDiff {
--- a/flys-aft/src/main/java/de/intevation/db/ConnectedStatements.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/db/ConnectedStatements.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,14 +1,14 @@ package de.intevation.db; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.sql.Savepoint; + +import java.util.ArrayDeque; +import java.util.Deque; import java.util.HashMap; import java.util.Map; -import java.util.Deque; -import java.util.ArrayDeque; - -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Savepoint; -import java.sql.DatabaseMetaData; import org.apache.log4j.Logger;
--- a/flys-aft/src/main/java/de/intevation/db/ConnectionBuilder.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/db/ConnectionBuilder.java Sat Jan 05 12:20:28 2013 +0100 @@ -2,18 +2,18 @@ import de.intevation.utils.XML; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.DriverManager; +import java.sql.SQLException; + import java.util.HashMap; -import org.w3c.dom.Document; - import javax.xml.xpath.XPathConstants; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.DriverManager; -import java.sql.DatabaseMetaData; +import org.apache.log4j.Logger; -import org.apache.log4j.Logger; +import org.w3c.dom.Document; public class ConnectionBuilder {
--- a/flys-aft/src/main/java/de/intevation/db/Statements.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/db/Statements.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,15 +1,14 @@ package de.intevation.db; -import java.util.Properties; - import java.io.IOException; import java.io.InputStream; -import org.apache.log4j.Logger; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; -import java.util.Map; -import java.util.HashMap; -import java.util.Enumeration; +import org.apache.log4j.Logger; public class Statements {
--- a/flys-aft/src/main/java/de/intevation/db/SymbolicStatement.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/db/SymbolicStatement.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,19 +1,19 @@ package de.intevation.db; -import java.util.List; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Timestamp; + import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.PreparedStatement; -import java.sql.Timestamp; -import java.sql.ResultSet; - import org.apache.log4j.Logger; public class SymbolicStatement {
--- a/flys-aft/src/main/java/de/intevation/utils/XML.java Sat Jan 05 12:13:16 2013 +0100 +++ b/flys-aft/src/main/java/de/intevation/utils/XML.java Sat Jan 05 12:20:28 2013 +0100 @@ -1,44 +1,44 @@ package de.intevation.utils; -import java.io.FileInputStream; import java.io.BufferedInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.StringWriter; -import org.w3c.dom.Document; - -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -import org.xml.sax.SAXException; - -import org.apache.log4j.Logger; - import java.util.HashMap; import java.util.Map; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.TransformerFactoryConfigurationError; + +import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.dom.DOMSource; + +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathVariableResolver; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactoryConfigurationError; +import org.apache.log4j.Logger; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; +import org.w3c.dom.Document; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.dom.DOMResult; +import org.xml.sax.SAXException; public final class XML {