Changeset 29771 in osm for applications/editors/josm/plugins
- Timestamp:
- 2013-07-24T21:45:09+02:00 (11 years ago)
- Location:
- applications/editors/josm/plugins
- Files:
-
- 18 added
- 1 deleted
- 31 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java
r29769 r29771 190 190 191 191 if ( Main.main.menu != null ) { 192 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; 193 commandMenu = Main.main.menu.addMenu(marktr("Commands") , oldMenu?KeyEvent.VK_M : KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine")); 192 commandMenu = Main.main.menu.addMenu(marktr("Commands") , KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine")); 194 193 MainMenu.add(commandMenu, new CommandLineAction(this)); 195 194 } -
applications/editors/josm/plugins/Create_grid_of_ways/build.xml
r29435 r29771 32 32 <property name="commit.message" value="Changed constructor signature, updated build.xml"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value=" 4980"/>34 <property name="plugin.main.version" value="6082"/> 35 35 <property name="josm" location="../../core/dist/josm-custom.jar"/> 36 36 <property name="plugin.dist.dir" value="../../dist"/> -
applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java
r27852 r29771 44 44 * existing ones (--this is from a translation machine--) 45 45 */ 46 @Override 46 47 public void actionPerformed(ActionEvent e) { 47 48 Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected(); -
applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysPlugin.java
r23192 r29771 9 9 public CreateGridOfWaysPlugin(PluginInformation info) { 10 10 super(info); 11 MainMenu.add(Main.main.menu. toolsMenu, new CreateGridOfWaysAction());11 MainMenu.add(Main.main.menu.moreToolsMenu, new CreateGridOfWaysAction()); 12 12 } 13 13 } -
applications/editors/josm/plugins/OpeningHoursEditor/build.xml
r29435 r29771 32 32 <property name="commit.message" value="fixed main version"/> 33 33 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 34 <property name="plugin.main.version" value=" 4980"/>34 <property name="plugin.main.version" value="6082"/> 35 35 <!-- 36 36 ************************************************ -
applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java
r28477 r29771 73 73 public OhePlugin(PluginInformation info) { 74 74 super(info); 75 MainMenu.add(Main.main.menu. toolsMenu, new OheMenuAction());75 MainMenu.add(Main.main.menu.dataMenu, new OheMenuAction()); 76 76 } 77 77 … … 108 108 } 109 109 110 @Override 110 111 public void actionPerformed(ActionEvent evt) { 111 112 // fetch active Layer -
applications/editors/josm/plugins/alignways/build.xml
r29435 r29771 35 35 with 36 36 --> 37 <property name="plugin.main.version" value=" 5464"/>37 <property name="plugin.main.version" value="6082"/> 38 38 <!-- 39 39 ************************************************ ** should not be -
applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java
r28624 r29771 31 31 32 32 // Add the action entries to the Tools Menu 33 Main.main.menu. toolsMenu.addSeparator();33 Main.main.menu.moreToolsMenu.addSeparator(); 34 34 awAction = new AlignWaysAction(); 35 MainMenu.add(Main.main.menu. toolsMenu, awAction);35 MainMenu.add(Main.main.menu.moreToolsMenu, awAction); 36 36 } 37 37 -
applications/editors/josm/plugins/buildings_tools/build.xml
r29596 r29771 4 4 <property name="commit.message" value="BuildingTools: update to current JOSM"/> 5 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 6 <property name="plugin.main.version" value=" 5960"/>6 <property name="plugin.main.version" value="6082"/> 7 7 8 8 <!-- Configure these properties (replace "..." accordingly). -
applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java
r27852 r29771 19 19 } 20 20 21 @Override 21 22 public void actionPerformed(ActionEvent arg0) { 22 23 BuildingSizeDialog dlg = new BuildingSizeDialog(); -
applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java
r28891 r29771 26 26 super(info); 27 27 Main.main.menu.editMenu.addSeparator(); 28 MainMenu.add(Main.main.menu. editMenu, new BuildingSizeAction());28 MainMenu.add(Main.main.menu.dataMenu, new BuildingSizeAction()); 29 29 } 30 30 -
applications/editors/josm/plugins/lakewalker/build.xml
r29723 r29771 5 5 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 6 6 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 7 <property name="plugin.main.version" value=" 4980"/>7 <property name="plugin.main.version" value="6082"/> 8 8 9 9 <!-- Configure these properties (replace "..." accordingly). -
applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java
r23190 r29771 17 17 public LakewalkerPlugin(PluginInformation info) { 18 18 super(info); 19 MainMenu.add(Main.main.menu. toolsMenu, new LakewalkerAction(tr("Lake Walker")));19 MainMenu.add(Main.main.menu.moreToolsMenu, new LakewalkerAction(tr("Lake Walker"))); 20 20 } 21 21 -
applications/editors/josm/plugins/livegps/build.xml
r29435 r29771 27 27 <project name="livegps" default="dist" basedir="."> 28 28 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 29 <property name="plugin.main.version" value=" 5681"/>29 <property name="plugin.main.version" value="6082"/> 30 30 <!-- 31 31 ************************************************ -
applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
r29769 r29771 116 116 super(info); 117 117 MainMenu menu = Main.main.menu; 118 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; 119 lgpsmenu = oldMenu ? 120 menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS")) 121 : menu.gpsMenu; 118 lgpsmenu = menu.gpsMenu; 122 119 if (lgpsmenu.getItemCount()>0) { 123 120 lgpsmenu.addSeparator(); -
applications/editors/josm/plugins/opendata/build.xml
r29706 r29771 1 1 <?xml version="1.0" encoding="utf-8"?> 2 2 <project name="opendata" default="dist" basedir="."> 3 <property name="plugin.main.version" value="60 31"/>3 <property name="plugin.main.version" value="6082"/> 4 4 <property name="plugin.author" value="Don-vip"/> 5 5 <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/> -
applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java
r29769 r29771 96 96 loadModules(); 97 97 // Add menu 98 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;99 98 100 menu = oldMenu? 101 Main.main.menu.addMenu(marktr("Open Data"), KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/OpenData")) 102 : Main.main.menu.dataMenu; 99 menu = Main.main.menu.dataMenu; 103 100 buildMenu(); 104 101 // Add download task -
applications/editors/josm/plugins/reverter/build.xml
r29663 r29771 4 4 <property name="commit.message" value="Reverter: Update MultiOsmReader to support null data after redaction"/> 5 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 6 <property name="plugin.main.version" value=" 5956"/>6 <property name="plugin.main.version" value="6082"/> 7 7 8 8 <!-- Configure these properties (replace "..." accordingly). -
applications/editors/josm/plugins/reverter/nbproject
-
Property svn:ignore
set to
private
-
Property svn:ignore
set to
-
applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java
r29769 r29771 19 19 public ReverterPlugin(PluginInformation info) { 20 20 super(info); 21 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; 22 JMenu historyMenu = oldMenu? 23 Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_Y, Main.main.menu.defaultMenuPos, ht("/Plugin/Reverter")) 24 : Main.main.menu.dataMenu; 21 JMenu historyMenu = Main.main.menu.dataMenu; 25 22 //MainMenu.add(historyMenu, new ObjectsHistoryAction()); 26 23 MainMenu.add(historyMenu, new RevertChangesetAction()); -
applications/editors/josm/plugins/terracer/build.xml
r29435 r29771 2 2 <project name="terracer" default="dist" basedir="."> 3 3 <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/> 4 <property name="plugin.main.version" value="5613"/> 5 6 <property name="plugin.author" value="Matt Amos"/> 4 <property name="plugin.main.version" value="6082"/> 5 <property name="plugin.author" value="Matt Amos"/> 7 6 <property name="plugin.class" value="terracer.TerracerPlugin"/> 8 7 <property name="plugin.description" value="Make terraced houses out of single blocks."/> -
applications/editors/josm/plugins/terracer/src/terracer/TerracerPlugin.java
r23191 r29771 22 22 super(info); 23 23 24 MainMenu.add(Main.main.menu. toolsMenu, new TerracerAction());25 MainMenu.add(Main.main.menu. toolsMenu, new ReverseTerraceAction());24 MainMenu.add(Main.main.menu.moreToolsMenu, new TerracerAction()); 25 MainMenu.add(Main.main.menu.moreToolsMenu, new ReverseTerraceAction()); 26 26 } 27 27 } -
applications/editors/josm/plugins/tracer/build.xml
r29596 r29771 4 4 <property name="commit.message" value="adapt to latest josm (getNodePairs changed)"/> 5 5 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 6 <property name="plugin.main.version" value=" 5960"/>6 <property name="plugin.main.version" value="6082"/> 7 7 8 8 <property name="plugin.author" value="Jan Bilak, Petr Dlouhý"/> -
applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerPlugin.java
r20251 r29771 16 16 public TracerPlugin(PluginInformation info) { 17 17 super(info); 18 MainMenu.add(Main.main.menu. toolsMenu, new TracerAction(Main.map));18 MainMenu.add(Main.main.menu.moreToolsMenu, new TracerAction(Main.map)); 19 19 } 20 20 -
applications/editors/josm/plugins/utilsplugin2/build.xml
r29742 r29771 5 5 <property name="commit.message" value="[josm_utilsplugin2]: pasting tags is in core long ago. Please update you ancient JOSM :)"/> 6 6 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 7 <property name="plugin.main.version" value=" 4980"/>7 <property name="plugin.main.version" value="6082"/> 8 8 9 <property name="plugin.author" value="Kalle Lampila, Upliner, and others"/>9 <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/> 10 10 <property name="plugin.class" value="org.openstreetmap.josm.plugins.utilsplugin2.UtilsPlugin2"/> 11 11 <property name="plugin.description" value="Several utilities that make your life easier."/> -
applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java
r29769 r29771 71 71 public UtilsPlugin2(PluginInformation info) { 72 72 super(info); 73 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; 74 JMenu toolsMenu = oldMenu 75 ? Main.main.menu.addMenu(marktr("More tools"), KeyEvent.VK_Q, 4, "help") 76 : Main.main.menu.moreToolsMenu; 77 78 JMenu dataMenu = oldMenu ? toolsMenu: Main.main.menu.dataMenu; 73 JMenu toolsMenu = Main.main.menu.moreToolsMenu; 74 JMenu dataMenu = Main.main.menu.dataMenu; 75 JMenu selectionMenu = Main.main.menu.selectionMenu; 79 76 80 77 addIntersections = MainMenu.add(toolsMenu, new AddIntersectionsAction()); … … 94 91 drawArc = MainMenu.add(toolsMenu, new CurveAction()); 95 92 96 JMenu selectionMenu; 97 if (oldMenu) { 98 selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, 4, "help"); 99 } else { 100 selectionMenu = Main.main.menu.selectionMenu; 101 selectionMenu.addSeparator(); 102 } 103 93 selectionMenu.addSeparator(); 94 104 95 selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction()); 105 96 adjNodes = MainMenu.add(selectionMenu, new AdjacentNodesAction()); -
applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java
r29769 r29771 78 78 79 79 private void createMenusAndShortCuts() { 80 boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082; 81 VMenu = Main.main.menu.addMenu(marktr("Video"), oldMenu?KeyEvent.VK_D: KeyEvent.VK_Q, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping")); 80 VMenu = Main.main.menu.addMenu(marktr("Video"), KeyEvent.VK_Q, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping")); 82 81 VMenu.setEnabled(false); 83 82 VAdd= new JosmAction(tr("Import Video"),"videomapping",tr("Sync a video against this GPS track"),null,false) { -
applications/editors/josm/plugins/waydownloader/build.xml
r29435 r29771 17 17 <property name="commit.message" value="Changed the constructor signature of the plugin main class"/> 18 18 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 19 <property name="plugin.main.version" value=" 4980"/>19 <property name="plugin.main.version" value="6082"/> 20 20 21 21 <property name="plugin.author" value="Harry Wood"/> -
applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java
r27852 r29771 47 47 super(info); 48 48 //add WayDownloadAction to tools menu 49 MainMenu.add(Main.main.menu. toolsMenu, new WayDownloadAction());49 MainMenu.add(Main.main.menu.moreToolsMenu, new WayDownloadAction()); 50 50 } 51 51 … … 92 92 93 93 /** Called when the WayDownloadAction action is triggered (e.g. user clicked the menu option) */ 94 @Override 94 95 public void actionPerformed(ActionEvent e) { 95 96 selectedNode = null; 96 97 Collection<Node> selection = Main.main.getCurrentDataSet().getSelectedNodes(); 97 if (selection. size()==0) {98 if (selection.isEmpty()) { 98 99 Collection<Way> selWays = Main.main.getCurrentDataSet().getSelectedWays(); 99 100 if (!workFromWaySelection(selWays)) { … … 104 105 } 105 106 106 if ( selection. size()==0|| selection.size()>1 || ! (selection.iterator().next() instanceof Node)) {107 if ( selection.isEmpty() || selection.size()>1 || ! (selection.iterator().next() instanceof Node)) { 107 108 showWarningMessage(tr("<html>Could not find a unique node to start downloading from.</html>")); 108 109 return; … … 115 116 //Find connected way 116 117 List<Way> connectedWays = findConnectedWays(selectedNode); 117 if (connectedWays. size()==0) {118 if (connectedWays.isEmpty()) { 118 119 showWarningMessage( 119 120 tr("<html>There are no ways connected to node ''{0}''. Aborting.</html>", … … 143 144 Main.worker.submit( 144 145 new Runnable() { 146 @Override 145 147 public void run() { 146 148 try { … … 162 164 * Logic to excute after the download has happened 163 165 */ 166 @Override 164 167 public void run() { 165 168 //Find ways connected to the node after the download 166 169 List<Way> connectedWays = findConnectedWays(selectedNode); 167 170 168 if (connectedWays. size()==0) {171 if (connectedWays.isEmpty()) { 169 172 String msg = tr("Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t discovered after download", 170 173 priorConnectedWay.getDisplayName(DefaultNameFormatter.getInstance()) -
applications/editors/josm/plugins/wayselector/build.xml
r29435 r29771 17 17 <property name="commit.message" value="recompile due to core change"/> 18 18 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 19 <property name="plugin.main.version" value=" 4980"/>19 <property name="plugin.main.version" value="6082"/> 20 20 21 21 <property name="plugin.author" value="Marko Mäkelä"/> -
applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java
r27932 r29771 28 28 super(info); 29 29 30 MainMenu.add(Main.main.menu. toolsMenu, new WaySelectAction());30 MainMenu.add(Main.main.menu.selectionMenu, new WaySelectAction()); 31 31 } 32 32
Note:
See TracChangeset
for help on using the changeset viewer.