Index: /applications/editors/josm/plugins/waypoint_search/build.xml
===================================================================
--- /applications/editors/josm/plugins/waypoint_search/build.xml	(revision 23159)
+++ /applications/editors/josm/plugins/waypoint_search/build.xml	(revision 23160)
@@ -31,5 +31,5 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="correct plugin main version" />
+    <property name="commit.message" value="better integration wih JOSM gui" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="3514" />
Index: /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java
===================================================================
--- /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java	(revision 23159)
+++ /applications/editors/josm/plugins/waypoint_search/src/org/openstreetmap/josm/plugins/waypointSearch/SelectWaypointDialog.java	(revision 23160)
@@ -36,9 +36,12 @@
 
     protected void build() {
+    	//add panel - all the gui of the plugin goes in here
+    	JPanel panel = new JPanel(new BorderLayout());
+    	
     	//search field
-    	searchPattern.setText("Enter search expression here..");
+    	searchPattern.setText(tr("Enter search expression here.."));
     	searchPattern.addKeyListener(this);
     	searchPattern.addMouseListener(this);
-    	add(searchPattern,BorderLayout.NORTH);
+    	panel.add(searchPattern,BorderLayout.NORTH);
     	
     	//add result table
@@ -48,9 +51,12 @@
     	JScrollPane scrollPane = new JScrollPane(searchResult);
     	scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-    	add(scrollPane,BorderLayout.CENTER);
+    	panel.add(scrollPane,BorderLayout.CENTER);
     	
     	//add label
     	JLabel label = new JLabel(tr("Select waypoint to move map"));
-    	add(label,BorderLayout.SOUTH);
+    	panel.add(label,BorderLayout.SOUTH);
+    	
+    	//add panel to JOSM gui
+    	add(panel,BorderLayout.CENTER);
     }