Delete EpnTapGet, use RequestCtrl instead.

Nathanael Jourdane
1 parent 58a466aa
Showing 2 changed files with 2 additions and 61 deletions Show diff stats
src/main/java/eu/omp/irap/vespa/epntapclient/EpnTapGet.java
src/main/java/eu/omp/irap/vespa/epntapclient/gui/requestpanel/paramfield/TargetNameField.java
@@ -1,59 +0,0 @@
-/*
- * This file is a part of EpnTAPClient.
- * This program aims to provide EPN-TAP support for software clients, like CASSIS spectrum analyzer.
- * See draft specifications: https://voparis-confluence.obspm.fr/pages/viewpage.action?pageId=559861
- * Copyright (C) 2016 Institut de Recherche en Astrophysique et Planétologie.
- *
- * This program is free software: you can
- * redistribute it and/or modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or (at your option) any later
- * version. This program is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details. You should have received a copy of
- * the GNU General Public License along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-package eu.omp.irap.vespa.epntapclient;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
-import eu.omp.irap.vespa.votable.utils.CantSendQueryException;
-import eu.omp.irap.vespa.votable.utils.Network;
-
-/**
- * @author N. Jourdane
- */
-public class EpnTapGet {
-
-	/** The URL of the resolver used for the `target name` field. */
-	private static final String RESOLVER_URL = "http://voparis-registry.obspm.fr/ssodnet/1/autocomplete";
-
-
-	/**
-	 * The method used to get target names propositions by asking to the resolver.
-	 *
-	 * @param begining The beginning of the target_name.
-	 * @return An array of Strings corresponding to the target names got.
-	 * @throws CantSendQueryException Can not send the query to get the target names.
-	 */
-	public static String[] getTargetNames(String begining) throws CantSendQueryException {
-		Map<String, String> params = new HashMap<>();
-		params.put("q", "\"" + begining + "\"");
-
-		String query = Network.buildQuery(RESOLVER_URL, params);
-		JsonObject root = Network.readJson(query);
-		int count = Integer.parseInt(root.get("count").toString());
-		String[] targetNames = new String[count];
-		JsonArray hits = root.getAsJsonArray("hits");
-		for (int i = 0; i < count; i++) {
-			JsonObject elmt = hits.get(i).getAsJsonObject();
-			targetNames[i] = elmt.get("name").toString().replace("\"", "");
-		}
-		return targetNames;
-	}
-}
@@ -24,7 +24,7 @@ import javax.swing.JComboBox;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
-import eu.omp.irap.vespa.epntapclient.EpnTapGet;
+import eu.omp.irap.vespa.epntapclient.RequestCtrl;
 import eu.omp.irap.vespa.epntapclient.gui.requestpanel.RequestPanelListener;
 import eu.omp.irap.vespa.votable.utils.CantSendQueryException;
@@ -119,7 +119,7 @@ public class TargetNameField extends ParamField implements TextFieldListener {
 					lastContent = content;
 					comboBox.removeAllItems();
 					try {
-						for (String s : EpnTapGet.getTargetNames(content)) {
+						for (String s : RequestCtrl.getTargetNames(content)) {
 							comboBox.addItem(s);
 						}
 					} catch (CantSendQueryException e) {