OV-GSO-DC / EpnTAPClient

Commit 5e72363b0bcd265c66517b101a8305fda9a8377b

Authored by Nathanael Jourdane
1 parent 6492c851
Exists in master

Change project architecture.

Showing 8 changed files with 14 additions and 68 deletions   Show diff stats
Inline Side-by-side
src/main/java/eu/omp/irap/vespa/epntapclient/lib/EpnTapController.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapController.java
  Diff comments   View file @5e72363
@@ -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.lib; 17 +package eu.omp.irap.vespa.epntapclient;
18 18
19 import java.util.HashMap; 19 import java.util.HashMap;
20 import java.util.Map; 20 import java.util.Map;
src/main/java/eu/omp/irap/vespa/epntapclient/lib/EpnTapFacade.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapFacade.java
  Diff comments   View file @5e72363
@@ -14,14 +14,14 @@ @@ -14,14 +14,14 @@
14 * <http://www.gnu.org/licenses/>. 14 * <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 -package eu.omp.irap.vespa.epntapclient.lib; 17 +package eu.omp.irap.vespa.epntapclient;
18 18
19 import java.util.List; 19 import java.util.List;
20 import java.util.Map; 20 import java.util.Map;
21 import java.util.logging.Logger; 21 import java.util.logging.Logger;
22 22
23 -import eu.omp.irap.vespa.epntapclient.lib.resource.VOResourceCtrl;  
24 -import eu.omp.irap.vespa.epntapclient.lib.resource.VOResourceException; 23 +import eu.omp.irap.vespa.epntapclient.resource.VOResourceCtrl;
  24 +import eu.omp.irap.vespa.epntapclient.resource.VOResourceException;
25 import eu.omp.irap.vespa.epntapclient.service.Service; 25 import eu.omp.irap.vespa.epntapclient.service.Service;
26 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource; 26 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource;
27 27
src/main/java/eu/omp/irap/vespa/epntapclient/lib/EpnTapInterface.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapInterface.java
  Diff comments   View file @5e72363
@@ -14,12 +14,12 @@ @@ -14,12 +14,12 @@
14 * <http://www.gnu.org/licenses/>. 14 * <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 -package eu.omp.irap.vespa.epntapclient.lib; 17 +package eu.omp.irap.vespa.epntapclient;
18 18
19 import java.util.List; 19 import java.util.List;
20 import java.util.Map; 20 import java.util.Map;
21 21
22 -import eu.omp.irap.vespa.epntapclient.lib.resource.VOResourceException; 22 +import eu.omp.irap.vespa.epntapclient.resource.VOResourceException;
23 import eu.omp.irap.vespa.epntapclient.service.Service; 23 import eu.omp.irap.vespa.epntapclient.service.Service;
24 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource; 24 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource;
25 25
src/main/java/eu/omp/irap/vespa/epntapclient/lib/EpnTapService.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/granule/Granule.java
  Diff comments   View file @5e72363
@@ -14,14 +14,14 @@ @@ -14,14 +14,14 @@
14 * <http://www.gnu.org/licenses/>. 14 * <http://www.gnu.org/licenses/>.
15 */ 15 */
16 16
17 -package eu.omp.irap.vespa.epntapclient.lib; 17 +package eu.omp.irap.vespa.epntapclient.granule;
18 18
19 import java.util.Date; 19 import java.util.Date;
20 20
21 /** 21 /**
22 * @author N. Jourdane 22 * @author N. Jourdane
23 */ 23 */
24 -public class EpnTapService { 24 +public class Granule {
25 25
26 public String granuleUid; 26 public String granuleUid;
27 27
src/main/java/eu/omp/irap/vespa/epntapclient/gui/GUIController.java
  Diff comments   View file @5e72363
@@ -23,7 +23,7 @@ import java.nio.file.Paths; @@ -23,7 +23,7 @@ import java.nio.file.Paths;
23 import java.util.logging.Level; 23 import java.util.logging.Level;
24 import java.util.logging.Logger; 24 import java.util.logging.Logger;
25 25
26 -import eu.omp.irap.vespa.epntapclient.lib.EpnTapController; 26 +import eu.omp.irap.vespa.epntapclient.EpnTapController;
27 import eu.omp.irap.vespa.epntapclient.service.Queries; 27 import eu.omp.irap.vespa.epntapclient.service.Queries;
28 import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException; 28 import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantDisplayVOTableException;
29 import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantSendQueryException; 29 import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantSendQueryException;
src/main/java/eu/omp/irap/vespa/epntapclient/lib/ServicesManager.java deleted
View file @6492c85
@@ -1,54 +0,0 @@ @@ -1,54 +0,0 @@
1 -/*  
2 - * This file is a part of EpnTAPClient.  
3 - * This program aims to provide EPN-TAP support for software clients, like CASSIS spectrum analyzer.  
4 - * See draft specifications: https://voparis-confluence.obspm.fr/pages/viewpage.action?pageId=559861  
5 - * Copyright (C) 2016 Institut de Recherche en Astrophysique et Planétologie.  
6 - *  
7 - * This program is free software: you can  
8 - * redistribute it and/or modify it under the terms of the GNU General Public License as published  
9 - * by the Free Software Foundation, either version 3 of the License, or (at your option) any later  
10 - * version. This program is distributed in the hope that it will be useful, but WITHOUT ANY  
11 - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  
12 - * PURPOSE. See the GNU General Public License for more details. You should have received a copy of  
13 - * the GNU General Public License along with this program. If not, see  
14 - * <http://www.gnu.org/licenses/>.  
15 - */  
16 -  
17 -package eu.omp.irap.vespa.epntapclient.lib;  
18 -  
19 -import java.util.logging.Logger;  
20 -  
21 -import eu.omp.irap.vespa.epntapclient.service.Queries;  
22 -import eu.omp.irap.vespa.epntapclient.votable.Consts;  
23 -import eu.omp.irap.vespa.epntapclient.votable.controller.VOTableController;  
24 -  
25 -/**  
26 - * @author N. Jourdane  
27 - */  
28 -public class ServicesManager {  
29 -  
30 - /** The logger for the class ServicesManager. */  
31 - private static final Logger logger = Logger.getLogger(ServicesManager.class.getName());  
32 -  
33 -  
34 - public enum ResourceType {  
35 - EPN_TAP, OBSCORE, OBSPM  
36 - };  
37 -  
38 -  
39 - ServicesManager(ResourceType resourceType) {  
40 - if (resourceType == ResourceType.EPN_TAP) {  
41 - VOTableController servicesCtrl = new VOTableController(Consts.DEFAULT_REGISTRY_URL,  
42 - "ADQL",  
43 - Queries.GET_EPN_TAP_SERVICES);  
44 - } else if (resourceType == ResourceType.OBSCORE) {  
45 - VOTableController servicesCtrl = new VOTableController(Consts.DEFAULT_REGISTRY_URL,  
46 - "ADQL",  
47 - Queries.GET_TAP_OBSCOR_SERVICES);  
48 - } else if (resourceType == ResourceType.OBSPM) {  
49 - VOTableController servicesCtrl = new VOTableController(Consts.DEFAULT_REGISTRY_URL,  
50 - "ADQL",  
51 - Queries.GET_VO_RESOURCES);  
52 - }  
53 - }  
54 -}  
src/main/java/eu/omp/irap/vespa/epntapclient/lib/resource/VOResourceCtrl.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/resource/VOResourceCtrl.java
  Diff comments   View file @5e72363
@@ -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.lib.resource; 17 +package eu.omp.irap.vespa.epntapclient.resource;
18 18
19 import java.io.File; 19 import java.io.File;
20 import java.io.FileNotFoundException; 20 import java.io.FileNotFoundException;
@@ -35,9 +35,9 @@ import com.google.gson.JsonObject; @@ -35,9 +35,9 @@ import com.google.gson.JsonObject;
35 import com.google.gson.JsonParser; 35 import com.google.gson.JsonParser;
36 import com.google.gson.stream.JsonReader; 36 import com.google.gson.stream.JsonReader;
37 37
38 -import eu.omp.irap.vespa.epntapclient.lib.resource.VOResourceException.CantGetVOResourceException;  
39 -import eu.omp.irap.vespa.epntapclient.lib.resource.VOResourceException.CantReadVOResourceException;  
40 -import eu.omp.irap.vespa.epntapclient.lib.resource.VOResourceException.VOResourceIsNotValidException; 38 +import eu.omp.irap.vespa.epntapclient.resource.VOResourceException.CantGetVOResourceException;
  39 +import eu.omp.irap.vespa.epntapclient.resource.VOResourceException.CantReadVOResourceException;
  40 +import eu.omp.irap.vespa.epntapclient.resource.VOResourceException.VOResourceIsNotValidException;
41 import eu.omp.irap.vespa.epntapclient.service.Service.ServiceType; 41 import eu.omp.irap.vespa.epntapclient.service.Service.ServiceType;
42 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource; 42 import eu.omp.irap.vespa.epntapclient.voresource.model.Resource;
43 import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantSendQueryException; 43 import eu.omp.irap.vespa.epntapclient.votable.VOTableException.CantSendQueryException;
src/main/java/eu/omp/irap/vespa/epntapclient/lib/resource/VOResourceException.java renamed to src/main/java/eu/omp/irap/vespa/epntapclient/resource/VOResourceException.java
  Diff comments   View file @5e72363
@@ -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.lib.resource; 17 +package eu.omp.irap.vespa.epntapclient.resource;
18 18
19 /** 19 /**
20 * @author N. Jourdane 20 * @author N. Jourdane