Changeset: 17fbaf2635bb for monetdb-java
URL: http://dev.monetdb.org/hg/monetdb-java?cmd=changeset;node=17fbaf2635bb
Modified Files:
src/main/java/nl/cwi/monetdb/client/JMonetDB.java
src/main/java/nl/cwi/monetdb/client/JdbcClient.java
src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
src/main/java/nl/cwi/monetdb/util/Exporter.java
src/main/java/nl/cwi/monetdb/util/SQLRestore.java
src/main/java/nl/cwi/monetdb/util/XMLExporter.java
Branch: default
Log Message:
Expand import java.*.* statements
Also removed trailing spaces and tabs
diffs (truncated from 650 to 300 lines):
diff --git a/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
b/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
--- a/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
+++ b/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
@@ -8,10 +8,17 @@
package nl.cwi.monetdb.client;
-import nl.cwi.monetdb.util.*;
-import nl.cwi.monetdb.merovingian.*;
-import java.io.*;
-import java.util.*;
+import nl.cwi.monetdb.merovingian.Control;
+import nl.cwi.monetdb.merovingian.SabaothDB;
+import nl.cwi.monetdb.util.CmdLineOpts;
+import nl.cwi.monetdb.util.OptionsException;
+
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* This program mimics the monetdb tool. It is meant as demonstration
diff --git a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
b/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
--- a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
+++ b/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
@@ -8,12 +8,36 @@
package nl.cwi.monetdb.client;
-import nl.cwi.monetdb.util.*;
-import java.sql.*;
-import java.io.*;
-import java.util.*;
-import java.util.zip.*;
-import java.net.*;
+import nl.cwi.monetdb.util.CmdLineOpts;
+import nl.cwi.monetdb.util.Exporter;
+import nl.cwi.monetdb.util.OptionsException;
+import nl.cwi.monetdb.util.SQLExporter;
+import nl.cwi.monetdb.util.XMLExporter;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
/**
* This program acts like an extended client program for MonetDB. Its
@@ -250,7 +274,7 @@ public final class JdbcClient {
dbmd = null;
}
stmt = con.createStatement();
-
+
// see if we will have to perform a database dump (only in SQL
mode)
if ("sql".equals(lang) && copts.getOption("dump").isPresent()) {
ResultSet tbl;
@@ -1171,7 +1195,6 @@ class Table {
return fqname;
}
-
static Table findTable(String fqname, List<Table> list) {
for (Table l : list) {
if (l.fqname.equals(fqname))
diff --git a/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
b/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
--- a/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
+++ b/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
@@ -8,7 +8,12 @@
package nl.cwi.monetdb.mcl.io;
-import java.io.*;
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
/**
* Write text to a character-output stream, buffering characters so as
diff --git a/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
b/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
--- a/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
+++ b/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
@@ -8,11 +8,11 @@
package nl.cwi.monetdb.merovingian;
-import java.util.*;
+import java.util.Date;
/**
* Implementation of the Sabaoth C-struct as Java object.
- *
+ *
* This Class implements a parser for the string representation of a
* sabaoth information struct as returned by monetdbd.
* <br />
@@ -93,7 +93,6 @@ public class SabaothDB {
}
}
-
/**
* Constructs a new SabaothDB object from a String.
*
diff --git a/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
b/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
--- a/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
+++ b/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
@@ -8,26 +8,33 @@
package nl.cwi.monetdb.util;
-import java.util.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
public class CmdLineOpts {
/** the arguments we handle */
private Map<String, OptionContainer> opts = new HashMap<String,
OptionContainer>();
/** the options themself */
private List<OptionContainer> options = new
ArrayList<OptionContainer>();
-
+
/** no arguments */
- public static int CAR_ZERO = 0;
+ public static int CAR_ZERO = 0;
/** always one argument */
- public static int CAR_ONE = 1;
+ public static int CAR_ONE = 1;
/** zero or one argument */
public static int CAR_ZERO_ONE = 2;
/** zero or many arguments */
public static int CAR_ZERO_MANY = 3;
/** one or many arguments */
public static int CAR_ONE_MANY = 4;
-
+
public CmdLineOpts() {
}
@@ -80,8 +87,8 @@ public class CmdLineOpts {
for (Enumeration<?> e = prop.propertyNames();
e.hasMoreElements(); ) {
String key = (String) e.nextElement();
OptionContainer option = opts.get(key);
- if (option == null) throw
- new OptionsException("Unknown option: "
+ key);
+ if (option == null)
+ throw new OptionsException("Unknown
option: " + key);
option.resetArguments();
option.addArgument(prop.getProperty(key));
}
@@ -205,7 +212,7 @@ public class CmdLineOpts {
// yes, we don't care about branch mispredictions here
;)
if (maxlen < len) maxlen = len;
}
-
+
// get the individual strings
StringBuilder ret = new StringBuilder();
for (OptionContainer oc : options) {
@@ -320,7 +327,6 @@ public class CmdLineOpts {
}
name = (longa != null) ? longa : shorta;
-
options.add(this);
}
diff --git a/src/main/java/nl/cwi/monetdb/util/Exporter.java
b/src/main/java/nl/cwi/monetdb/util/Exporter.java
--- a/src/main/java/nl/cwi/monetdb/util/Exporter.java
+++ b/src/main/java/nl/cwi/monetdb/util/Exporter.java
@@ -8,11 +8,12 @@
package nl.cwi.monetdb.util;
-import java.io.*;
-import java.sql.*;
+import java.io.PrintWriter;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
import java.util.Arrays;
-
public abstract class Exporter {
protected PrintWriter out;
protected boolean useSchema;
@@ -32,13 +33,13 @@ public abstract class Exporter {
public abstract void setProperty(int type, int value) throws Exception;
public abstract int getProperty(int type) throws Exception;
-
+
//=== shared utilities
-
+
public void useSchemas(boolean use) {
useSchema = use;
}
-
+
/**
* returns the given string between two double quotes for usage as
* identifier such as column or table name in SQL queries.
diff --git a/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
b/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
--- a/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
+++ b/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
@@ -30,7 +30,7 @@ public class SQLRestore {
private final String _user;
private final String _password;
private final String _dbName;
-
+
public SQLRestore(String host, int port, String user, String password,
String dbName) throws IOException {
if (host == null || user == null || password == null || dbName
== null)
throw new NullPointerException();
@@ -40,16 +40,16 @@ public class SQLRestore {
_password = password;
_dbName = dbName;
}
-
+
private static class ServerResponseReader implements Runnable {
private final BufferedMCLReader _is;
private final AtomicBoolean _errorState = new
AtomicBoolean(false);
- private String _errorMessage = null;
-
- ServerResponseReader(BufferedMCLReader is) {
+ private String _errorMessage = null;
+
+ ServerResponseReader(BufferedMCLReader is) {
_is = is;
}
-
+
public void run() {
try {
while (true) {
@@ -57,7 +57,7 @@ public class SQLRestore {
if (line == null)
break;
int result = _is.getLineType();
- switch (result) {
+ switch (result) {
case BufferedMCLReader.ERROR:
_errorMessage = line;
_errorState.set(true);
@@ -66,7 +66,6 @@ public class SQLRestore {
// do nothing...
}
}
-
} catch (IOException e) {
_errorMessage = e.getMessage();
_errorState.set(true);
@@ -78,7 +77,7 @@ public class SQLRestore {
}
}
}
-
+
/**
* @return whether the server has responded with an error. Any
* error is regarded as fatal.
@@ -86,20 +85,19 @@ public class SQLRestore {
public boolean inErrorState() {
return _errorState.get();
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
