From 3ee8d15f5c08b4eee7898d43df72d73a1a90c15b Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Thu, 26 Jun 2014 15:04:39 +0200
Subject: [PATCH] [TAP] Rename TAPMetadata.TableIterator into
TAPMetadata.TAPTableIterator (it iterates only on the content of a TAPTable
object and not on a data table. + Typos
---
src/tap/formatter/JSONFormat.java | 2 --
src/tap/formatter/ResultSet2JsonFormatter.java | 3 ---
src/tap/formatter/ResultSet2VotableFormatter.java | 2 --
src/tap/formatter/VOTableFormat.java | 2 --
src/tap/metadata/TAPMetadata.java | 6 +++---
5 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/tap/formatter/JSONFormat.java b/src/tap/formatter/JSONFormat.java
index c15625f..431ee98 100644
--- a/src/tap/formatter/JSONFormat.java
+++ b/src/tap/formatter/JSONFormat.java
@@ -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;
diff --git a/src/tap/formatter/ResultSet2JsonFormatter.java b/src/tap/formatter/ResultSet2JsonFormatter.java
index d7e47f8..2d3561b 100644
--- a/src/tap/formatter/ResultSet2JsonFormatter.java
+++ b/src/tap/formatter/ResultSet2JsonFormatter.java
@@ -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 {
diff --git a/src/tap/formatter/ResultSet2VotableFormatter.java b/src/tap/formatter/ResultSet2VotableFormatter.java
index cc841bd..2452e6f 100644
--- a/src/tap/formatter/ResultSet2VotableFormatter.java
+++ b/src/tap/formatter/ResultSet2VotableFormatter.java
@@ -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;
/**
diff --git a/src/tap/formatter/VOTableFormat.java b/src/tap/formatter/VOTableFormat.java
index e5b5625..fa3220c 100644
--- a/src/tap/formatter/VOTableFormat.java
+++ b/src/tap/formatter/VOTableFormat.java
@@ -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;
diff --git a/src/tap/metadata/TAPMetadata.java b/src/tap/metadata/TAPMetadata.java
index 9dda1b9..e3c36c7 100644
--- a/src/tap/metadata/TAPMetadata.java
+++ b/src/tap/metadata/TAPMetadata.java
@@ -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())
--
GitLab