From 7dc8933231da557d394e523075ee85c6b90ceb69 Mon Sep 17 00:00:00 2001 From: Nathanael Jourdane Date: Thu, 14 Apr 2016 16:17:13 +0200 Subject: [PATCH] remove TODOs, use GitLab issues instead. --- src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java | 4 +++- src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java | 4 ++-- src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java | 2 -- src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java | 7 ------- src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java | 1 - src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java | 15 +-------------- src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java | 2 -- src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java | 3 --- src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableParser.java | 1 - src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java | 2 -- 10 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java b/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java index 8177f9b..3366a8d 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapMainApp.java @@ -21,6 +21,8 @@ import java.util.logging.Logger; import javax.swing.JFrame; import javax.swing.SwingUtilities; +import com.google.gson.Gson; + import eu.omp.irap.vespa.epntapclient.controller.EpnTapController; /** @@ -44,7 +46,7 @@ public class EpnTapMainApp { * @param args The program arguments (not used). */ public static void main(final String[] args) { - EpnTapMainApp.logger.info("Lauching EPN-TAP application..."); + EpnTapMainApp.logger.info("Lauching EPNTAP app with arguments: " + new Gson().toJson(args)); SwingUtilities.invokeLater(new Runnable() { @Override diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java b/src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java index 9e35baf..20bf744 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java @@ -127,10 +127,10 @@ public class EpnTapController implements ViewListener { try { voTablePath = resultsController.fillTable(selectedTableServiceURL, "ADQL", query); } catch (CantDisplayVOTableException e) { - // TODO Auto-generated catch block + // TODO Create exception e.printStackTrace(); } catch (CantSendQueryException e) { - // TODO Auto-generated catch block + // TODO Create exception e.printStackTrace(); } } diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java b/src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java index a84f84e..7fdc807 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/view/ParamField.java @@ -110,7 +110,6 @@ public abstract class ParamField extends JPanel { this.paramName = paramName; buildParamField(); - // TODO: Add tooltip text based on rr.table_column.column_description } private void buildParamField() { @@ -440,7 +439,6 @@ public abstract class ParamField extends JPanel { for (int i = 0; i < count; i++) { JsonObject elmt = hits.get(i).getAsJsonObject(); targetNames[i] = elmt.get("name").toString().replace("\"", ""); - // TODO: Display "[name] ([type])" on the JComboBox, but only "[name]" on the query. } return targetNames; } diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java b/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java index 6573e1a..cd53a16 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/RequestPanel.java @@ -78,9 +78,6 @@ public class RequestPanel extends JPanel { setPreferredSize(new Dimension(GUIDim.RIGHT_PANEL_WIDTH, GUIDim.TOP_PANEL_HEIGHT)); setMinimumSize(new Dimension(GUIDim.RIGHT_PANEL_MIN_WIDTH, GUIDim.TOP_PANEL_MIN_HEIGHT)); - // TODO: Use a JScrollPane. - // TODO: Get max row number from the GUI - this.add(buildParamPanel(), this); this.add(buildQueryPanel(), this); this.add(buildButtonPanel(), this); @@ -92,10 +89,6 @@ public class RequestPanel extends JPanel { * @return The JPanel. */ private JPanel buildParamPanel() { - // TODO: new GUI field column to allow the user to select the comparison operator: - // - if the field is a String: listbox with 'xx', '%xx', 'xx%', and '%xx%'. - // - if the field is a numeric value: listbox with <, <=, =, =>, >. - // TODO use enums for the parameters names paramFields = new ArrayList<>(); paramFields.add(new TargetNameField(viewListener, "target_name")); paramFields.add(new DateRangeField(viewListener, "time_")); diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java b/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java index 21099ee..38120b1 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/view/panels/ServicesPanel.java @@ -73,7 +73,6 @@ public class ServicesPanel extends JPanel { setPreferredSize(new Dimension(GUIDim.LEFT_PANEL_WIDTH, GUIDim.TOP_PANEL_HEIGHT)); setMinimumSize(new Dimension(GUIDim.LEFT_PANEL_MIN_WIDTH, GUIDim.TOP_PANEL_MIN_HEIGHT)); - // TODO: Support multi-selection voTableView.getTable().getSelectionModel() .addListSelectionListener(new ListSelectionListener() { diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java index c668bba..e139814 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/VOTableApp.java @@ -45,27 +45,14 @@ public class VOTableApp { /** * Main function to start the application as standalone. * - * 
-	 * **Usage 1**: `VOtableApp pathToVOTable`
-	 * Display the VOTable stored in the specified XML file.
-	 * - `pathToVOTable`: The path to an XML file representing a VOtable;
-	 *
-	 * **Usage 2**: `VOtableApp targetURL type language query`
-	 * Display the VOTable resulting the service or registry request.
-	 * - `targetURL`: The URL of the service or registry to ask, ie `http://cdpp-epntap.cesr.fr`;
-	 * - `language`: The language of the query, ie `ADQL`;
-	 * - `query`: The query in the specified language in double quotes, ie. `"SELECT * FROM amdadb.epn_core"`
-	 *
- * * @param args The program arguments */ public static void main(final String[] args) { - VOTableApp.logger.info("Lauching VOTable app with arguments:\n" + new Gson().toJson(args)); + VOTableApp.logger.info("Lauching VOTable app with arguments: " + new Gson().toJson(args)); SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - // TODO: Add option to export to CSV and HTML in CLI. VOTableController voTableControl; if (args.length == 1) { try { diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java index 68741ff..bfe9179 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableController.java @@ -102,12 +102,10 @@ public class VOTableController { voTable = VOTableParser.parseVOTable(voTablePath); - // TODO: Handle the case when there are more than 1 resource or table. if (voTable.getRESOURCE().size() > 1) { throw new SeveralResourcesException(voTablePath); } - // TODO: Iterate over all potential ERROR tags if ("ERROR".equals(voTable.getRESOURCE().get(0).getINFO().get(0).getValueAttribute())) { String errorInfo = voTable.getRESOURCE().get(0).getINFO().get(0).getValue(); throw new ErrorMessageInVOTableException(errorInfo); diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java index c11aca1..4c758d2 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java @@ -278,7 +278,6 @@ public class VOTableDataParser { */ private static void parseBinary2Stream(Stream stream, List fields) { VOTableDataParser.logger.info("Parsing data in BINARY2 stream..."); - // TODO Implement parseBinary2Stream() } /** @@ -287,7 +286,6 @@ public class VOTableDataParser { */ private static void parseTableDataStream(TableData tabledata, List fields) { VOTableDataParser.logger.info("Parsing data in TABLEDATA stream..."); - // TODO Implement parseTableDataStream() } /** @@ -296,6 +294,5 @@ public class VOTableDataParser { */ private static void parseFITSStream(Stream stream, List fields) { VOTableDataParser.logger.info("Parsing data in FITS stream..."); - // TODO Implement parseFITSStream() } } diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableParser.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableParser.java index dd2d09b..7e26214 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableParser.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableParser.java @@ -72,7 +72,6 @@ public final class VOTableParser { * @throws CantDisplayVOTableException VOTable is not valid or not writable. */ public static VOTABLE parseVOTable(String voTablePath) throws CantDisplayVOTableException { - // TODO: Change the name of the 2nd INFO tag instead of editing the XSD file. VOTABLE voTable; JAXBContext jc; try { diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java index 4912afc..c3be494 100644 --- a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java +++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java @@ -36,7 +36,6 @@ import eu.omp.irap.vespa.epntapclient.votable.utils.Utils; */ public class VOTableView extends JPanel implements TableModelListener { - // TODO: Create class VOTableCLI the view for a CLI usage /** The serial version UID. */ private static final long serialVersionUID = 1L; @@ -110,7 +109,6 @@ public class VOTableView extends JPanel implements TableModelListener { if (e.getType() != TableModelEvent.UPDATE) { return; } - // TODO : Create VOTableListener interface } } -- libgit2 0.21.2