OV-GSO-DC / EpnTAPClient

Commit ffe64e74e94a54578b0850f3d9ea5fefb6332ab8

Authored by Nathanael Jourdane
1 parent 4268557f
Exists in master

move Const.java and Utils.java to VOTable, in order to don't use EpnTap files fr… 

…om the VOTable application.
Showing 7 changed files with 7 additions and 9 deletions   Show diff stats
Inline Side-by-side
src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java
  Diff comments   View file @ffe64e7
@@ -21,13 +21,13 @@ import java.util.Map; @@ -21,13 +21,13 @@ import java.util.Map;
21 import java.util.logging.Level; 21 import java.util.logging.Level;
22 import java.util.logging.Logger; 22 import java.util.logging.Logger;
23 23
24 -import eu.omp.irap.vespa.epntapclient.utils.Const;  
25 import eu.omp.irap.vespa.epntapclient.utils.Queries; 24 import eu.omp.irap.vespa.epntapclient.utils.Queries;
26 import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView; 25 import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView;
27 import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView.MainViewListener; 26 import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView.MainViewListener;
28 import eu.omp.irap.vespa.epntapclient.view.Event; 27 import eu.omp.irap.vespa.epntapclient.view.Event;
29 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableController; 28 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableController;
30 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException; 29 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException;
  30 +import eu.omp.irap.vespa.epntapclient.votable.utils.Const;
31 31
32 /** 32 /**
33 * The main controller which manage views and controllers. 33 * The main controller which manage views and controllers.
src/main/java/eu/omp/irap/vespa/epntapclient/utils/Queries.java
  Diff comments   View file @ffe64e7
@@ -21,7 +21,7 @@ import java.util.List; @@ -21,7 +21,7 @@ import java.util.List;
21 import java.util.Map; 21 import java.util.Map;
22 import java.util.logging.Logger; 22 import java.util.logging.Logger;
23 23
24 -import eu.omp.irap.vespa.epntapclient.votable.Utils.StringJoiner; 24 +import eu.omp.irap.vespa.epntapclient.votable.utils.Utils.StringJoiner;
25 25
26 /** 26 /**
27 * Defines the queries and the query patterns usually used in the application. 27 * Defines the queries and the query patterns usually used in the application.
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableConnection.java
  Diff comments   View file @ffe64e7
@@ -30,13 +30,13 @@ import java.util.Date; @@ -30,13 +30,13 @@ import java.util.Date;
30 import java.util.logging.Level; 30 import java.util.logging.Level;
31 import java.util.logging.Logger; 31 import java.util.logging.Logger;
32 32
33 -import eu.omp.irap.vespa.epntapclient.utils.Const;  
34 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException; 33 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException;
35 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.BadResponseCodeException; 34 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.BadResponseCodeException;
36 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantGetErrorStream; 35 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantGetErrorStream;
37 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantGetResponseCode; 36 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantGetResponseCode;
38 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantOpenConnectionException; 37 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantOpenConnectionException;
39 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantPrintRequestResultException; 38 import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantPrintRequestResultException;
  39 +import eu.omp.irap.vespa.epntapclient.votable.utils.Const;
40 40
41 /** 41 /**
42 * This class provide HTTP connection support to send requests through POST / GET protocols. 42 * This class provide HTTP connection support to send requests through POST / GET protocols.
src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
  Diff comments   View file @ffe64e7
@@ -28,12 +28,12 @@ import javax.xml.bind.DatatypeConverter; @@ -28,12 +28,12 @@ import javax.xml.bind.DatatypeConverter;
28 28
29 import com.google.gson.Gson; 29 import com.google.gson.Gson;
30 30
31 -import eu.omp.irap.vespa.epntapclient.votable.Utils;  
32 import eu.omp.irap.vespa.epntapclient.votable.model.DataType; 31 import eu.omp.irap.vespa.epntapclient.votable.model.DataType;
33 import eu.omp.irap.vespa.epntapclient.votable.model.Field; 32 import eu.omp.irap.vespa.epntapclient.votable.model.Field;
34 import eu.omp.irap.vespa.epntapclient.votable.model.Stream; 33 import eu.omp.irap.vespa.epntapclient.votable.model.Stream;
35 import eu.omp.irap.vespa.epntapclient.votable.model.Table; 34 import eu.omp.irap.vespa.epntapclient.votable.model.Table;
36 import eu.omp.irap.vespa.epntapclient.votable.model.TableData; 35 import eu.omp.irap.vespa.epntapclient.votable.model.TableData;
  36 +import eu.omp.irap.vespa.epntapclient.votable.utils.Utils;
37 37
38 /** 38 /**
39 * @author N. Jourdane 39 * @author N. Jourdane
src/main/java/eu/omp/irap/vespa/epntapclient/utils/Const.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Const.java
  Diff comments   View file @ffe64e7
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * <http://www.gnu.org/licenses/>. 14 * <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 -package eu.omp.irap.vespa.epntapclient.utils; 17 +package eu.omp.irap.vespa.epntapclient.votable.utils;
18 18
19 /** 19 /**
20 * This class defines widely-used constants. 20 * This class defines widely-used constants.
src/main/java/eu/omp/irap/vespa/epntapclient/votable/Utils.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/votable/utils/Utils.java
  Diff comments   View file @ffe64e7
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 * <http://www.gnu.org/licenses/>. 14 * <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 -package eu.omp.irap.vespa.epntapclient.votable; 17 +package eu.omp.irap.vespa.epntapclient.votable.utils;
18 18
19 import java.io.FileWriter; 19 import java.io.FileWriter;
20 import java.io.IOException; 20 import java.io.IOException;
@@ -25,8 +25,6 @@ import java.util.logging.Logger; @@ -25,8 +25,6 @@ import java.util.logging.Logger;
25 import com.google.gson.Gson; 25 import com.google.gson.Gson;
26 import com.google.gson.GsonBuilder; 26 import com.google.gson.GsonBuilder;
27 27
28 -import eu.omp.irap.vespa.epntapclient.utils.Const;  
29 -  
30 /** 28 /**
31 * @author N. Jourdane 29 * @author N. Jourdane
32 */ 30 */
src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java
  Diff comments   View file @ffe64e7
@@ -28,7 +28,7 @@ import javax.swing.event.TableModelEvent; @@ -28,7 +28,7 @@ import javax.swing.event.TableModelEvent;
28 import javax.swing.event.TableModelListener; 28 import javax.swing.event.TableModelListener;
29 import javax.swing.table.DefaultTableModel; 29 import javax.swing.table.DefaultTableModel;
30 30
31 -import eu.omp.irap.vespa.epntapclient.votable.Utils; 31 +import eu.omp.irap.vespa.epntapclient.votable.utils.Utils;
32 32
33 /** 33 /**
34 * The main class of the View of the application. 34 * The main class of the View of the application.