Changeset 8909 in osm

Timestamp:

2008-07-10T13:21:02+02:00 (16 years ago)

Author:

stoecker

Message:

fixed name finder, closes josm bug #776

Location:

applications/editors/josm/plugins/namefinder

Files:

• build.xml (modified) (1 diff)
• namefinder/PlaceSelection.java (modified) (2 diffs)

applications/editors/josm/plugins/namefinder/build.xml

@@ -39 +39 @@
   <!-- dist target - create jar file -->
   <target name="dist" depends="compile">
+    <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
+      <env key="LANG" value="C"/>
+      <arg value="info"/>
+      <arg value="--xml"/>
+      <arg value="."/>
+    </exec>
+    <xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+    <delete file="REVISION"/>
     <jar destfile="${plugin.jar}" basedir="${plugin.build.dir}">
       <manifest>
         <attribute name="Plugin-Class" value="namefinder.NameFinderPlugin" />
         <attribute name="Plugin-Description" value="Allows selection of download areas by name, using an external service" />
-        <attribute name="Plugin-Version" value="1.0" />
+        <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
       </manifest>
     </jar>

applications/editors/josm/plugins/namefinder/namefinder/PlaceSelection.java

@@ -165 +165 @@
                                         component.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                                         component.repaint();
-                                        URL url = new URL("http://gazetteer.openstreetmap.org/namefinder/?find="+java.net.URLEncoder.encode(searchTerm.getText(), "UTF-8"));
+                                        URL url = new URL("http://gazetteer.openstreetmap.org/namefinder/search.xml?find="
+                                        +java.net.URLEncoder.encode(searchTerm.getText(), "UTF-8"));
                                         HttpURLConnection activeConnection = (HttpURLConnection)url.openConnection();
-                                        System.out.println("got return: "+activeConnection.getResponseCode());
+                                        //System.out.println("got return: "+activeConnection.getResponseCode());
                                         activeConnection.setConnectTimeout(15000);
                                         InputStream inputStream = activeConnection.getInputStream();
                                         InputSource inputSource = new InputSource(new InputStreamReader(inputStream, "UTF-8"));
-                                SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new Parser());
+                                        SAXParserFactory.newInstance().newSAXParser().parse(inputSource, new Parser());
                                 }
                                 catch (Exception x) 
@@ -224 +225 @@
                 });
         
-                searchResults.addColumn("name");
-                searchResults.addColumn("type");
-                searchResults.addColumn("near");
-                searchResults.addColumn("zoom");
+                searchResults.addColumn(tr("name"));
+                searchResults.addColumn(tr("type"));
+                searchResults.addColumn(tr("near"));
+                searchResults.addColumn(tr("zoom"));
                 
                 // TODO - this is probably not the coolest way to set relative sizes?
-                searchResultDisplay.getColumn("name").setPreferredWidth(200);
-                searchResultDisplay.getColumn("type").setPreferredWidth(100);
-                searchResultDisplay.getColumn("near").setPreferredWidth(100);
-                searchResultDisplay.getColumn("zoom").setPreferredWidth(50);
+                searchResultDisplay.getColumn(tr("name")).setPreferredWidth(200);
+                searchResultDisplay.getColumn(tr("type")).setPreferredWidth(100);
+                searchResultDisplay.getColumn(tr("near")).setPreferredWidth(100);
+                searchResultDisplay.getColumn(tr("zoom")).setPreferredWidth(50);
                 searchResultDisplay.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);