Changeset 27417 in osm for applications/editors/josm/plugins/utilsplugin2/src

Timestamp:

2012-01-08T17:20:43+01:00 (13 years ago)

Author:

akks

Message:

'Utilsplugin2: shortcut confilct removed, fix NPE in OpenCustomURL config, added osm.mapki.com'

Location:

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2

Files:

• UtilsPluginPreferences.java (modified) (4 diffs)
• dumbutils/SplitOnIntersectionsAction.java (modified) (1 diff)
• selection/UnselectNodesAction.java (modified) (1 diff)

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java

@@ -58 +58 @@
         // FIXME: get rid of hardcoded URLS
         List<String> items = (List<String>) Main.pref.getCollection("utilsplugin2.urlHistory");
-        if (items==null) {
+        String addr = Main.pref.get("utilsplugin2.customurl", defaultURL);
+        table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
+        if (addr==null || items==null || items.isEmpty()) {
             items = resetURLList();
-            fillRows(items);
-        }
-        String addr = Main.pref.get("utilsplugin2.customurl", defaultURL);
+        }
         //System.out.println("pref:"+addr);
         
@@ -86 +86 @@
         });
         
-        table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
         fillRows(items);
         
@@ -169 +168 @@
             items.add("AMDMi3 Russian streets");
             items.add("http://addresses.amdmi3.ru/?zoom=11&lat={#lat}&lon={#lon}&layers=B00");
+            items.add("Mapki - More  History with CT");
+            items.add("http://osm.mapki.com/history/{#type}.php?id={#id}");
             items.add("Element history [demo, =Ctrl-Shift-H]");
             items.add("http://www.openstreetmap.org/browse/{#type}/{#id}/history");
@@ -174 +175 @@
             items.add("http://www.openstreetmap.org/browse/{#type}/{#id}");
         Main.pref.putCollection("utilsplugin2.urlHistory",items);
+        Main.pref.put("utilsplugin2.customurl",items.get(4));
         return items;
     }

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java

@@ -27 +27 @@
         super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"),
                 Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", TITLE), KeyEvent.VK_P,
-                Shortcut.GROUP_EDIT, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK), true);
+                Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK| KeyEvent.SHIFT_DOWN_MASK), true);
     }
 

applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java

@@ -24 +24 @@
                 tr("Removes all nodes from selection"),
                 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"),
-                KeyEvent.VK_U, Shortcut.GROUP_EDIT, KeyEvent.ALT_DOWN_MASK), true);
+                KeyEvent.VK_U, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
         putValue("help", ht("/Action/UnselectNodes"));
     }