Index: /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java =================================================================== --- /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java (revision 32876) +++ /applications/editors/josm/plugins/rasterfilters/src/org/openstreetmap/josm/plugins/rasterfilters/preferences/FiltersDownloader.java (revision 32877) @@ -43,83 +43,87 @@ public static List downloadFiltersInfoList() { - JsonObject jsonRequest = Json - .createObjectBuilder() - .add("id", new Random().nextInt()) - .add("method", "wiki.getPageHTML") - .add("params", - Json.createArrayBuilder().add("ImageFilters").build()) - .build(); - - String jsonRequestString = jsonRequest.toString(); - - URL wikiApi; - HttpURLConnection wikiConnection; +// JsonObject jsonRequest = Json +// .createObjectBuilder() +// .add("id", new Random().nextInt()) +// .add("method", "wiki.getPageHTML") +// .add("params", +// Json.createArrayBuilder().add("ImageFilters").build()) +// .build(); + +// String jsonRequestString = jsonRequest.toString(); + +// URL wikiApi; +// HttpURLConnection wikiConnection; try { - wikiApi = new URL("https://josm.openstreetmap.de/jsonrpc"); - wikiConnection = (HttpURLConnection) wikiApi.openConnection(); - wikiConnection.setDoOutput(true); - wikiConnection.setDoInput(true); - - wikiConnection.setRequestProperty("Content-Type", - "application/json"); - wikiConnection.setRequestProperty("Method", "POST"); - wikiConnection.connect(); - - OutputStream os = wikiConnection.getOutputStream(); - os.write(jsonRequestString.getBytes("UTF-8")); - os.close(); - - int HttpResult = wikiConnection.getResponseCode(); - if (HttpResult == HttpURLConnection.HTTP_OK) { - - JsonReader jsonStream = Json - .createReader(new InputStreamReader(wikiConnection - .getInputStream(), "utf-8")); - - JsonObject jsonResponse = jsonStream.readObject(); - jsonStream.close(); - - Elements trTagElems = Jsoup.parse( - jsonResponse.getString("result")) - .getElementsByTag("tr"); - for (Element element : trTagElems) { - - Elements elems = element.getElementsByTag("td"); - if (!elems.isEmpty()) { - String name = elems.get(0).text(); - String owner = elems.get(1).text(); - String description = elems.get(2).text(); - - String link = elems.get(0).getElementsByTag("a") - .attr("href"); - - JsonObject meta = loadMeta(link); - - String paramName = "rasterfilters." - + meta.getString("name"); - - boolean needToLoad = Main.pref.getBoolean(paramName); - - if (needToLoad) { - JsonArray binaries = meta.getJsonArray("binaries"); - filterTitles.add(meta.getString("title")); - for (int i = 0; i < binaries.size(); i++) { - filtersMetaToLoad.add(meta); - loadBinaryToFile(binaries.getString(i)); - } - } - FilterInfo newFilterInfo = new FilterInfo(name, - description, meta, needToLoad); - newFilterInfo.setOwner(owner); - - if (!filtersInfoList.contains(newFilterInfo)) { - filtersInfoList.add(newFilterInfo); +// wikiApi = new URL("https://josm.openstreetmap.de/wiki/ImageFilters"); +// wikiConnection = (HttpURLConnection) wikiApi.openConnection(); +// wikiConnection.setDoOutput(true); +// wikiConnection.setDoInput(true); +// +// wikiConnection.setRequestProperty("Content-Type", +// "application/json"); +// wikiConnection.setRequestProperty("Method", "POST"); +// wikiConnection.connect(); + +// OutputStream os = wikiConnection.getOutputStream(); +// os.write(jsonRequestString.getBytes("UTF-8")); +// os.close(); + +// int HttpResult = wikiConnection.getResponseCode(); +// if (HttpResult == HttpURLConnection.HTTP_OK) { + +// JsonReader jsonStream = Json +// .createReader(new InputStreamReader(wikiConnection +// .getInputStream(), "utf-8")); + +// BufferedReader inReader = new BufferedReader(new InputStreamReader(wikiConnection.getInputStream())); + +// JsonObject jsonResponse = jsonStream.readObject(); +// jsonStream.close(); + Document doc = Jsoup.connect("https://josm.openstreetmap.de/wiki/ImageFilters").get(); + Elements trTagElems = doc.getElementsByTag("tr"); + +// Elements trTagElems = Jsoup.parse( +// jsonResponse.getString("result")) +// .getElementsByTag("tr"); + for (Element element : trTagElems) { + + Elements elems = element.getElementsByTag("td"); + if (!elems.isEmpty()) { + String name = elems.get(0).text(); + String owner = elems.get(1).text(); + String description = elems.get(2).text(); + + String link = elems.get(0).getElementsByTag("a") + .attr("href"); + + JsonObject meta = loadMeta(link); + + String paramName = "rasterfilters." + + meta.getString("name"); + + boolean needToLoad = Main.pref.getBoolean(paramName); + + if (needToLoad) { + JsonArray binaries = meta.getJsonArray("binaries"); + filterTitles.add(meta.getString("title")); + for (int i = 0; i < binaries.size(); i++) { + filtersMetaToLoad.add(meta); + loadBinaryToFile(binaries.getString(i)); } } - } - - } else { - Main.debug("Error happenned while requesting for the list of filters"); - } + FilterInfo newFilterInfo = new FilterInfo(name, + description, meta, needToLoad); + newFilterInfo.setOwner(owner); + + if (!filtersInfoList.contains(newFilterInfo)) { + filtersInfoList.add(newFilterInfo); + } + } + } + +// } else { +// Main.debug("Error happenned while requesting for the list of filters"); +// } } catch (IOException e1) { // TODO Auto-generated catch block @@ -141,11 +145,11 @@ } - JsonObject jsonRequest = Json.createObjectBuilder() - .add("id", new Random().nextInt()) - .add("method", "wiki.getPageHTML") - .add("params", Json.createArrayBuilder().add(link).build()) - .build(); - - String jsonStringRequest = jsonRequest.toString(); +// JsonObject jsonRequest = Json.createObjectBuilder() +// .add("id", new Random().nextInt()) +// .add("method", "wiki.getPageHTML") +// .add("params", Json.createArrayBuilder().add(link).build()) +// .build(); + +// String jsonStringRequest = jsonRequest.toString(); URL wikiApi; @@ -154,40 +158,40 @@ try { - wikiApi = new URL("https://josm.openstreetmap.de/jsonrpc"); - wikiConnection = (HttpURLConnection) wikiApi.openConnection(); - wikiConnection.setDoOutput(true); - wikiConnection.setDoInput(true); - - wikiConnection.setRequestProperty("Content-Type", - "application/json"); - wikiConnection.setRequestProperty("Method", "POST"); - wikiConnection.connect(); - - OutputStream os = wikiConnection.getOutputStream(); - os.write(jsonStringRequest.getBytes("UTF-8")); - os.close(); - - int HttpResult = wikiConnection.getResponseCode(); - if (HttpResult == HttpURLConnection.HTTP_OK) { - - JsonReader jsonStream = Json - .createReader(new InputStreamReader(wikiConnection - .getInputStream(), "UTF-8")); - - JsonObject jsonResponse = jsonStream.readObject(); - jsonStream.close(); - - String jsonPage = jsonResponse.getString("result"); - - Document doc = Jsoup.parse(jsonPage, "UTF-8"); - String json = doc.getElementsByTag("pre").first().text(); - - JsonReader reader = Json.createReader(new StringReader(json)); - meta = reader.readObject(); - reader.close(); - - } else { - Main.debug(wikiConnection.getResponseMessage()); - } +// wikiApi = new URL("https://josm.openstreetmap.de/jsonrpc"); +// wikiConnection = (HttpURLConnection) wikiApi.openConnection(); +// wikiConnection.setDoOutput(true); +// wikiConnection.setDoInput(true); +// +// wikiConnection.setRequestProperty("Content-Type", +// "application/json"); +// wikiConnection.setRequestProperty("Method", "POST"); +// wikiConnection.connect(); +// +// OutputStream os = wikiConnection.getOutputStream(); +// os.write(jsonStringRequest.getBytes("UTF-8")); +// os.close(); +// +// int HttpResult = wikiConnection.getResponseCode(); +// if (HttpResult == HttpURLConnection.HTTP_OK) { + +// JsonReader jsonStream = Json +// .createReader(new InputStreamReader(wikiConnection +// .getInputStream(), "UTF-8")); + +// JsonObject jsonResponse = jsonStream.readObject(); +// jsonStream.close(); + +// String jsonPage = jsonResponse.getString("result"); + + Document doc = Jsoup.connect("https://josm.openstreetmap.de/wiki/" + link).get(); + String json = doc.getElementsByTag("pre").first().text(); + + JsonReader reader = Json.createReader(new StringReader(json)); + meta = reader.readObject(); + reader.close(); + +// } else { +// Main.debug(wikiConnection.getResponseMessage()); +// } } catch (IOException e1) { e1.printStackTrace();