Changeset 1329 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-01-24T13:49:02+01:00 (16 years ago)

Author:

stoecker

Message:

moved namefinder into main josm

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/download/DownloadDialog.java (modified) (3 diffs)
• gui/download/PlaceSelection.java (added)
• plugins/PluginHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

@@ -5 +5 @@
 
 import java.awt.Color;
-import java.awt.datatransfer.DataFlavor; 
-import java.awt.datatransfer.Transferable; 
-import java.awt.event.ActionEvent; 
-import java.awt.event.InputEvent; 
-import java.awt.event.KeyEvent; 
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.ActionEvent;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
 import java.awt.Font;
 import java.awt.GridBagLayout;
@@ -104 +104 @@
         downloadSelections.add(new TileSelection());
         downloadSelections.add(new BookmarkSelection());
+        downloadSelections.add(new PlaceSelection());
         downloadSelections.add(new WorldChooser());
 
@@ -154 +155 @@
         sizeCheck.setFont(labelFont.deriveFont(Font.PLAIN, labelFont.getSize()));
         add(sizeCheck, GBC.eop().insets(0,5,5,10));
-        
-        getInputMap(WHEN_IN_FOCUSED_WINDOW).put( 
-        KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents"); 
-       
-        getActionMap().put("checkClipboardContents", new AbstractAction() { 
-            public void actionPerformed(ActionEvent e) { 
-                checkClipboardContents(); 
-            } 
-        }); 
-    }
-    
-    private void checkClipboardContents() { 
-        String result = ""; 
-        Transferable contents = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null); 
- 
-        if(contents == null || !contents.isDataFlavorSupported(DataFlavor.stringFlavor)) 
-            return; 
-         
-        try { 
-            result = (String)contents.getTransferData(DataFlavor.stringFlavor); 
-        } 
-        catch(Exception ex) { 
-            return; 
-        } 
-         
-        Bounds b = OsmUrlToBounds.parse(result); 
-        if (b != null) { 
-            minlon = b.min.lon(); 
-            minlat = b.min.lat(); 
-            maxlon = b.max.lon(); 
-            maxlat = b.max.lat(); 
-            boundingBoxChanged(null); 
-        } 
-    } 
+
+        getInputMap(WHEN_IN_FOCUSED_WINDOW).put(
+        KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
+
+        getActionMap().put("checkClipboardContents", new AbstractAction() {
+            public void actionPerformed(ActionEvent e) {
+                checkClipboardContents();
+            }
+        });
+    }
+
+    private void checkClipboardContents() {
+        String result = "";
+        Transferable contents = Toolkit.getDefaultToolkit().getSystemClipboard().getContents(null);
+
+        if(contents == null || !contents.isDataFlavorSupported(DataFlavor.stringFlavor))
+            return;
+
+        try {
+            result = (String)contents.getTransferData(DataFlavor.stringFlavor);
+        }
+        catch(Exception ex) {
+            return;
+        }
+
+        Bounds b = OsmUrlToBounds.parse(result);
+        if (b != null) {
+            minlon = b.min.lon();
+            minlat = b.min.lat();
+            maxlon = b.max.lon();
+            maxlat = b.max.lat();
+            boundingBoxChanged(null);
+        }
+    }
 
     private void updateSizeCheck() {

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -57 +57 @@
         String [] oldplugins = new String[] {"mappaint", "unglueplugin",
         "lang-de", "lang-en_GB", "lang-fr", "lang-it", "lang-pl", "lang-ro",
-        "lang-ru", "ewmsplugin", "ywms", "tways-0.2", "geotagged", "landsat"};
+        "lang-ru", "ewmsplugin", "ywms", "tways-0.2", "geotagged", "landsat",
+        "namefinder", "waypoints"};
         for (String p : oldplugins) {
             if (plugins.contains(p)) {