Commit ffe64e74e94a54578b0850f3d9ea5fefb6332ab8
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
src/main/java/eu/omp/irap/vespa/epntapclient/controller/EpnTapController.java
... | ... | @@ -21,13 +21,13 @@ import java.util.Map; |
21 | 21 | import java.util.logging.Level; |
22 | 22 | import java.util.logging.Logger; |
23 | 23 | |
24 | -import eu.omp.irap.vespa.epntapclient.utils.Const; | |
25 | 24 | import eu.omp.irap.vespa.epntapclient.utils.Queries; |
26 | 25 | import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView; |
27 | 26 | import eu.omp.irap.vespa.epntapclient.view.EpnTapMainView.MainViewListener; |
28 | 27 | import eu.omp.irap.vespa.epntapclient.view.Event; |
29 | 28 | import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableController; |
30 | 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 | 33 | * The main controller which manage views and controllers. | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/utils/Queries.java
... | ... | @@ -21,7 +21,7 @@ import java.util.List; |
21 | 21 | import java.util.Map; |
22 | 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 | 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
... | ... | @@ -30,13 +30,13 @@ import java.util.Date; |
30 | 30 | import java.util.logging.Level; |
31 | 31 | import java.util.logging.Logger; |
32 | 32 | |
33 | -import eu.omp.irap.vespa.epntapclient.utils.Const; | |
34 | 33 | import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException; |
35 | 34 | import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.BadResponseCodeException; |
36 | 35 | import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantGetErrorStream; |
37 | 36 | import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantGetResponseCode; |
38 | 37 | import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableException.CantSendQueryException.CantOpenConnectionException; |
39 | 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 | 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
... | ... | @@ -28,12 +28,12 @@ import javax.xml.bind.DatatypeConverter; |
28 | 28 | |
29 | 29 | import com.google.gson.Gson; |
30 | 30 | |
31 | -import eu.omp.irap.vespa.epntapclient.votable.Utils; | |
32 | 31 | import eu.omp.irap.vespa.epntapclient.votable.model.DataType; |
33 | 32 | import eu.omp.irap.vespa.epntapclient.votable.model.Field; |
34 | 33 | import eu.omp.irap.vespa.epntapclient.votable.model.Stream; |
35 | 34 | import eu.omp.irap.vespa.epntapclient.votable.model.Table; |
36 | 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 | 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
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
... | ... | @@ -14,7 +14,7 @@ |
14 | 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 | 19 | import java.io.FileWriter; |
20 | 20 | import java.io.IOException; |
... | ... | @@ -25,8 +25,6 @@ import java.util.logging.Logger; |
25 | 25 | import com.google.gson.Gson; |
26 | 26 | import com.google.gson.GsonBuilder; |
27 | 27 | |
28 | -import eu.omp.irap.vespa.epntapclient.utils.Const; | |
29 | - | |
30 | 28 | /** |
31 | 29 | * @author N. Jourdane |
32 | 30 | */ | ... | ... |
src/main/java/eu/omp/irap/vespa/epntapclient/votable/view/VOTableView.java
... | ... | @@ -28,7 +28,7 @@ import javax.swing.event.TableModelEvent; |
28 | 28 | import javax.swing.event.TableModelListener; |
29 | 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 | 34 | * The main class of the View of the application. | ... | ... |