# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: C:\nam\main\websvc\rest # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: src/org/netbeans/modules/websvc/rest/codegen/resources/GoogleMapResource.template *** C:\nam\main\websvc\rest\src\org\netbeans\modules\websvc\rest\codegen\resources\GoogleMapResource.template Base (1.6) --- C:\nam\main\websvc\rest\src\org\netbeans\modules\websvc\rest\codegen\resources\GoogleMapResource.template Locally Modified (Based On 1.6) *************** *** 27,34 **** */ public class GoogleMapResource { ! static String key = "abcdefg"; //change this with the Google Map Key from http://www.google.com/apis/maps/ ! static String proxy = "myproxy.mydomain.com:8080"; private String address; /** Creates a new instance of GoogleMapResource */ --- 27,34 ---- */ public class GoogleMapResource { ! private String key; ! private String proxy; private String address; /** Creates a new instance of GoogleMapResource */ *************** *** 51,57 **** * Returns HTML text to access GoogleMap API. * @param address address string to generate map for. */ ! public static String getMapHtml(String address) throws IOException { String encoded = URLEncoder.encode(address, "UTF-8"); GeoCoder coder = new GeoCoder(encoded, key); if(proxy != null && !proxy.trim().equals("")) { --- 51,57 ---- * Returns HTML text to access GoogleMap API. * @param address address string to generate map for. */ ! public String getMapHtml(String address) throws IOException { String encoded = URLEncoder.encode(address, "UTF-8"); GeoCoder coder = new GeoCoder(encoded, key); if(proxy != null && !proxy.trim().equals("")) { Index: src/org/netbeans/modules/websvc/rest/actions/UseGeoCodeAction.java *** C:\nam\main\websvc\rest\src\org\netbeans\modules\websvc\rest\actions\UseGeoCodeAction.java Base (1.6) --- C:\nam\main\websvc\rest\src\org\netbeans\modules\websvc\rest\actions\UseGeoCodeAction.java Locally Modified (Based On 1.6) *************** *** 92,101 **** Object res = DialogDisplayer.getDefault().notify(desc); if (res.equals(NotifyDescriptor.YES_OPTION)) { String q = panel.getQuery(); - try { - q = URLEncoder.encode(q, "UTF-8"); - } catch(UnsupportedEncodingException e) {//ignore - } final String key = panel.getKey(); final String proxy = panel.getProxy(); final String[][] replaceArr = { --- 92,97 ----