Changeset 27417 in osm
- Timestamp:
- 2012-01-08T17:20:43+01:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/utilsplugin2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/utilsplugin2/build.xml
r27410 r27417 30 30 <project name="utilsplugin2" default="dist" basedir="."> 31 31 <!-- enter the SVN commit message --> 32 <property name="commit.message" value="Utilsplugin2: customzing shortcut problem solved"/>32 <property name="commit.message" value="Utilsplugin2: shortcut confilct removed, fix NPE in OpenCustomURL config, added osm.mapki.com"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 34 <property name="plugin.main.version" value="4549"/> -
applications/editors/josm/plugins/utilsplugin2/nbproject/project.xml
r26603 r27417 12 12 <folders> 13 13 <source-folder> 14 <label>utilsplugin2</label> 15 <location>.</location> 16 <encoding>UTF-8</encoding> 17 </source-folder> 18 <source-folder> 14 19 <label>src</label> 15 20 <type>java</type> … … 17 22 <encoding>UTF-8</encoding> 18 23 </source-folder> 19 <source-folder> 20 <label>utilsplugin2</label> 21 <location>.</location> 22 <encoding>UTF-8</encoding> 23 </source-folder> 24 <build-file> 25 <location>../../dist/utilsplugin2.jar</location> 26 </build-file> 24 27 </folders> 25 28 <ide-actions> … … 65 68 </context-menu> 66 69 </view> 70 <subprojects/> 67 71 </general-data> 68 72 <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3"> -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UtilsPluginPreferences.java
r26696 r27417 58 58 // FIXME: get rid of hardcoded URLS 59 59 List<String> items = (List<String>) Main.pref.getCollection("utilsplugin2.urlHistory"); 60 if (items==null) { 60 String addr = Main.pref.get("utilsplugin2.customurl", defaultURL); 61 table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"})); 62 if (addr==null || items==null || items.isEmpty()) { 61 63 items = resetURLList(); 62 fillRows(items); 63 } 64 String addr = Main.pref.get("utilsplugin2.customurl", defaultURL); 64 } 65 65 //System.out.println("pref:"+addr); 66 66 … … 86 86 }); 87 87 88 table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));89 88 fillRows(items); 90 89 … … 169 168 items.add("AMDMi3 Russian streets"); 170 169 items.add("http://addresses.amdmi3.ru/?zoom=11&lat={#lat}&lon={#lon}&layers=B00"); 170 items.add("Mapki - More History with CT"); 171 items.add("http://osm.mapki.com/history/{#type}.php?id={#id}"); 171 172 items.add("Element history [demo, =Ctrl-Shift-H]"); 172 173 items.add("http://www.openstreetmap.org/browse/{#type}/{#id}/history"); … … 174 175 items.add("http://www.openstreetmap.org/browse/{#type}/{#id}"); 175 176 Main.pref.putCollection("utilsplugin2.urlHistory",items); 177 Main.pref.put("utilsplugin2.customurl",items.get(4)); 176 178 return items; 177 179 } -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java
r26295 r27417 27 27 super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"), 28 28 Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", TITLE), KeyEvent.VK_P, 29 Shortcut.GROUP_ EDIT, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK), true);29 Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK| KeyEvent.SHIFT_DOWN_MASK), true); 30 30 } 31 31 -
applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java
r27410 r27417 24 24 tr("Removes all nodes from selection"), 25 25 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"), 26 KeyEvent.VK_U, Shortcut.GROUP_EDIT, KeyEvent.ALT_DOWN_MASK), true);26 KeyEvent.VK_U, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true); 27 27 putValue("help", ht("/Action/UnselectNodes")); 28 28 }
Note:
See TracChangeset
for help on using the changeset viewer.