Skip to content
Snippets Groups Projects
Commit 3ee8d15f authored by gmantele's avatar gmantele
Browse files

[TAP] Rename TAPMetadata.TableIterator into TAPMetadata.TAPTableIterator (it...

[TAP] Rename TAPMetadata.TableIterator into TAPMetadata.TAPTableIterator (it iterates only on the content of a TAPTable object and not on a data table. + Typos
parent 33417858
No related branches found
No related tags found
No related merge requests found
......@@ -27,9 +27,7 @@ import org.json.JSONException;
import org.json.JSONWriter;
import cds.savot.writer.SavotWriter;
import adql.db.DBColumn;
import tap.ServiceConnection;
import tap.TAPException;
import tap.TAPExecutionReport;
......
......@@ -20,7 +20,6 @@ package tap.formatter;
*/
import java.io.IOException;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
......@@ -31,10 +30,8 @@ import org.json.JSONWriter;
import tap.ServiceConnection;
import tap.TAPException;
import tap.TAPExecutionReport;
import tap.metadata.TAPColumn;
import tap.metadata.TAPTypes;
import adql.db.DBColumn;
public class ResultSet2JsonFormatter extends JSONFormat<ResultSet> implements ResultSetFormatter {
......
......@@ -26,7 +26,6 @@ import tap.TAPException;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
......@@ -34,7 +33,6 @@ import java.sql.SQLException;
import tap.ServiceConnection;
import tap.metadata.TAPColumn;
import tap.metadata.TAPTypes;
import adql.db.DBColumn;
/**
......
......@@ -24,14 +24,12 @@ import java.io.IOException;
import tap.TAPExecutionReport;
import tap.TAPJob;
import tap.TAPException;
import uws.job.Result;
import java.io.OutputStream;
import java.io.PrintWriter;
import cds.savot.writer.SavotWriter;
import tap.ServiceConnection;
import tap.metadata.TAPColumn;
import tap.metadata.VotType;
......
......@@ -112,7 +112,7 @@ public class TAPMetadata implements Iterable<TAPSchema>, VOSIResource, TAPResour
}
public Iterator<TAPTable> getTables(){
return new TableIterator(this);
return new TAPTableIterator(this);
}
public boolean hasTable(String schemaName, String tableName){
......@@ -155,11 +155,11 @@ public class TAPMetadata implements Iterable<TAPSchema>, VOSIResource, TAPResour
return nbTables;
}
public static class TableIterator implements Iterator<TAPTable> {
public static class TAPTableIterator implements Iterator<TAPTable> {
private Iterator<TAPSchema> it;
private Iterator<TAPTable> itTables;
public TableIterator(TAPMetadata tapSchema){
public TAPTableIterator(TAPMetadata tapSchema){
it = tapSchema.iterator();
if (it.hasNext())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment