From dc8352bfac29acc0359b523051bc3de8b5246214 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 19 Sep 2010 10:42:45 +0000 Subject: [PATCH] redesign swing UI to support new index creator mechanism git-svn-id: https://osmand.googlecode.com/svn/trunk@510 e29c36b1-1cfa-d876-8d93-3434fc2bb7b8 --- .../index/DownloaderIndexFromGoogleCode.java | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java index b16079342d..13501e9852 100644 --- a/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java +++ b/DataExtractionOSM/src/net/osmand/data/index/DownloaderIndexFromGoogleCode.java @@ -36,11 +36,6 @@ public class DownloaderIndexFromGoogleCode { // IndexConstants.ADDRESS_TABLE_VERSION + "", IndexConstants.POI_TABLE_VERSION + "", //$NON-NLS-1$//$NON-NLS-2$ // IndexConstants.TRANSPORT_TABLE_VERSION + "" }); //$NON-NLS-1$ // System.out.println(indexFiles); - -// deleteFileFromGoogleDownloads("Bahrain_0.trans.odb", "vics001", "kfvth85"); - deleteFileFromGoogleDownloads("Bahrain_0.trans.odb", "vics001", "cH5mK8aA5kd3"); - - } @@ -109,17 +104,16 @@ public class DownloaderIndexFromGoogleCode { // that method doesn't work !!! - public static String deleteFileFromGoogleDownloads(String fileName, String userName, String password) throws IOException { + public static String deleteFileFromGoogleDownloads(String fileName, String token, String pagegen, String cookie) throws IOException { // prepare data - String urlText = "http://code.google.com/p/osmand/downloads/delete.do?name="+fileName; + String urlText = "http://code.google.com/p/osmand/downloads/delete.do?name="+fileName; //$NON-NLS-1$ System.out.println(urlText); StringBuilder requestBody = new StringBuilder(); requestBody. - append("token=cc4e4cffba19a6107d2161f85c71631f"). -// append("token=").append(Base64.encode(token.getBytes("UTF-8"))). - append("&pagegen=1283283182175778"). - append("&filename=").append(fileName). - append("&delete=Delete+download"); + append("token=").append(token). //$NON-NLS-1$ + append("&pagegen=").append(pagegen). //$NON-NLS-1$ + append("&filename=").append(fileName). //$NON-NLS-1$ + append("&delete=Delete+download"); //$NON-NLS-1$ System.out.println(requestBody); // getting url @@ -127,11 +121,11 @@ public class DownloaderIndexFromGoogleCode { HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setConnectTimeout(15000); - connection.setRequestMethod("POST"); + connection.setRequestMethod("POST"); //$NON-NLS-1$ // String token = userName + ":" + password; //$NON-NLS-1$ // connection.addRequestProperty("Authorization", "Basic " + Base64.encode(token.getBytes("UTF-8"))); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - connection.setRequestProperty("Content-Length", requestBody.length()+""); + connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); //$NON-NLS-1$//$NON-NLS-2$ + connection.setRequestProperty("Content-Length", requestBody.length()+""); //$NON-NLS-1$ //$NON-NLS-2$ connection.setDoInput(true); connection.setDoOutput(true);