Index: /applications/editors/josm/plugins/ext_tools/LICENSE =================================================================== --- /applications/editors/josm/plugins/ext_tools/LICENSE (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/LICENSE (revision 21930) @@ -0,0 +1,345 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Index: /applications/editors/josm/plugins/ext_tools/README =================================================================== --- /applications/editors/josm/plugins/ext_tools/README (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/README (revision 21930) @@ -0,0 +1,6 @@ +README +====== + +ExtTools is generalization of Fuzzer plugin which uses external python script +for tracing satellite imagery. With ExtTools you can create your own tools +that uses external scripts. Index: /applications/editors/josm/plugins/ext_tools/build.xml =================================================================== --- /applications/editors/josm/plugins/ext_tools/build.xml (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/build.xml (revision 21930) @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building against core revision ${coreversion.info.entry.revision}. + Plugin-Mainversion is set to ${plugin.main.version}. + + + + + + Commiting the plugin source with message '${commit.message}' ... + + + + + + + + + + + Updating plugin source ... + + + + + + Updating ${plugin.jar} ... + + + + + + + + + + + ***** Properties of published ${plugin.jar} ***** + Commit message : '${commit.message}' + Plugin-Mainversion: ${plugin.main.version} + JOSM build version: ${coreversion.info.entry.revision} + Plugin-Version : ${version.entry.commit.revision} + ***** / Properties of published ${plugin.jar} ***** + + Now commiting ${plugin.jar} ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java (revision 21930) @@ -0,0 +1,184 @@ +package ext_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import org.openstreetmap.josm.command.AddCommand; +import org.openstreetmap.josm.command.ChangeCommand; +import org.openstreetmap.josm.command.ChangeNodesCommand; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.data.osm.*; + +final class DataSetToCmd { + + /** the source dataset where primitives are merged from */ + private final DataSet sourceDataSet; + + /** + * A map of all primitives that got replaced with other primitives. Key is + * the PrimitiveId in their dataset, the value is the PrimitiveId in my + * dataset + */ + private final Map mergedMap = new HashMap(); + + private final LinkedList cmds = new LinkedList(); + + /** + * constructor + */ + public DataSetToCmd(DataSet sourceDataSet) { + this.sourceDataSet = sourceDataSet; + merge(); + } + + /** + * Merges a primitive other of type + *

+ * onto my primitives. + * + * @param

+ * the type of the other primitive + * @param source + * the other primitive + */ + private void mergePrimitive(OsmPrimitive source) { + + OsmPrimitive target = null; + switch (source.getType()) { + case NODE: + target = new Node(); + break; + case WAY: + target = new Way(); + break; + case RELATION: + target = new Relation(); + break; + default: + throw new AssertionError(); + } + target.mergeFrom(source); + mergedMap.put(source.getPrimitiveId(), target); + cmds.add(new AddCommand(target)); + } + + private OsmPrimitive getMergeTarget(OsmPrimitive mergeSource) + throws IllegalStateException { + OsmPrimitive target = mergedMap.get(mergeSource.getPrimitiveId()); + if (target == null) + return null; + return target; + } + + /** + * Postprocess the dataset and fix all merged references to point to the + * actual data. + */ + public void fixReferences() { + for (Way w : sourceDataSet.getWays()) { + mergeNodeList(w); + } + for (Relation r : sourceDataSet.getRelations()) { + mergeRelationMembers(r); + } + } + + /** + * Merges the node list of a source way onto its target way. + * + * @param source + * the source way + * @throws IllegalStateException + * thrown if no target way can be found for the source way + * @throws IllegalStateException + * thrown if there isn't a target node for one of the nodes in + * the source way + * + */ + private void mergeNodeList(Way source) throws IllegalStateException { + Way target = (Way) getMergeTarget(source); + if (target == null) + throw new IllegalStateException(tr( + "Missing merge target for way with id {0}", source.getUniqueId())); + if (target.getDataSet() != null) + throw new IllegalStateException(tr( + "Missing merge target for way with id {0}", source.getUniqueId())); + + List newNodes = new ArrayList(source.getNodesCount()); + for (Node sourceNode : source.getNodes()) { + Node targetNode = (Node) getMergeTarget(sourceNode); + if (targetNode == null) + throw new IllegalStateException(tr( + "Missing merge target for node with id {0}", sourceNode + .getUniqueId())); + if (targetNode.getDataSet() != null) + throw new IllegalStateException(tr( + "Missing merge target for way with id {0}", source.getUniqueId())); + + newNodes.add(targetNode); + } + cmds.add(new ChangeNodesCommand(target, newNodes)); + } + + /** + * Merges the relation members of a source relation onto the corresponding + * target relation. + * + * @param source + * the source relation + * @throws IllegalStateException + * thrown if there is no corresponding target relation + * @throws IllegalStateException + * thrown if there isn't a corresponding target object for one + * of the relation members in source + */ + private void mergeRelationMembers(Relation source) throws IllegalStateException { + Relation target = (Relation) getMergeTarget(source); + if (target == null) + throw new IllegalStateException( + tr("Missing merge target for relation with id {0}", source + .getUniqueId())); + if (target.getDataSet() != null) + throw new IllegalStateException( + tr("Missing merge target for relation with id {0}", source + .getUniqueId())); + LinkedList newMembers = new LinkedList(); + for (RelationMember sourceMember : source.getMembers()) { + OsmPrimitive targetMember = getMergeTarget(sourceMember.getMember()); + if (targetMember == null) + throw new IllegalStateException(tr( + "Missing merge target of type {0} with id {1}", sourceMember + .getType(), sourceMember.getUniqueId())); + if (targetMember.getDataSet() != null) + throw new IllegalStateException(tr( + "Missing merge target of type {0} with id {1}", sourceMember + .getType(), sourceMember.getUniqueId())); + newMembers.add(new RelationMember(sourceMember.getRole(), targetMember)); + } + Relation newRelation = new Relation(target); + newRelation.setMembers(newMembers); + cmds.add(new ChangeCommand(target, newRelation)); + } + + private void merge() { + for (Node node : sourceDataSet.getNodes()) { + mergePrimitive(node); + } + for (Way way : sourceDataSet.getWays()) { + mergePrimitive(way); + } + for (Relation relation : sourceDataSet.getRelations()) { + mergePrimitive(relation); + } + fixReferences(); + } + + public LinkedList getCommandList() { + return cmds; + } +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java (revision 21930) @@ -0,0 +1,238 @@ +package ext_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Cursor; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.StringTokenizer; + +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.command.Command; +import org.openstreetmap.josm.command.SequenceCommand; +import org.openstreetmap.josm.data.ProjectionBounds; +import org.openstreetmap.josm.data.coor.LatLon; +import org.openstreetmap.josm.data.osm.DataSet; +import org.openstreetmap.josm.gui.MainMenu; +import org.openstreetmap.josm.gui.PleaseWaitRunnable; +import org.openstreetmap.josm.gui.progress.NullProgressMonitor; +import org.openstreetmap.josm.io.IllegalDataException; +import org.openstreetmap.josm.io.OsmReader; + +public class ExtTool { + + protected boolean enabled; + public String name; + public String cmdline; + public String description; + public String url; + protected ExtToolAction action; + protected JMenuItem menuItem; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + if (!this.enabled ^ enabled) + return; + this.enabled = enabled; + if (enabled) { + if (action == null) + action = new ExtToolAction(this); + menuItem = MainMenu.add(Main.main.menu.toolsMenu, action); + } else { + Main.main.menu.toolsMenu.remove(menuItem); + } + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public ExtTool() { + this.enabled = false; + } + + public ExtTool(String name) { + this(); + this.name = name; + } + + public String serialize() { + StringBuilder sb = new StringBuilder(); + sb.append("name=").append(name).append('\n'); + sb.append("cmdline=").append(cmdline).append('\n'); + sb.append("description=").append(description).append('\n'); + sb.append("url=").append(url).append('\n'); + sb.append('\n'); + return sb.toString(); + } + + public static ExtTool unserialize(String str) { + ExtTool t = new ExtTool(); + String[] lines = str.split("\n"); + for (String line : lines) { + String[] parts = line.split("=", 2); + if (parts[0].equals("name")) + t.name = parts[1]; + else if (parts[0].equals("cmdline")) + t.cmdline = parts[1]; + else if (parts[0].equals("description")) + t.description = parts[1]; + else if (parts[0].equals("url")) + t.url = parts[1]; + } + return t; + } + + private class ToolProcess { + public Process process; + public volatile boolean running; + } + + static double getPPD() { + ProjectionBounds bounds = Main.map.mapView.getProjectionBounds(); + return Main.map.mapView.getWidth() / + (bounds.max.east() - bounds.min.east()); + } + + public void runTool(LatLon pos) { + Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + // parse cmdline and build cmdParams array + HashMap replace = new HashMap(); + + replace.put("{lat}", "" + pos.lat()); + replace.put("{lon}", "" + pos.lon()); + replace.put("{PPD}", "" + getPPD()); + + ArrayList cmdParams = new ArrayList(); + StringTokenizer st = new StringTokenizer(cmdline); + + while (st.hasMoreTokens()) { + String token = st.nextToken(); + if (replace.containsKey(token)) { + cmdParams.add(replace.get(token)); + } else { + cmdParams.add(token); + } + } + + // create the process + final Object syncObj = new Object(); + + ProcessBuilder builder; + builder = new ProcessBuilder(cmdParams); + builder.directory(new File(ExtToolsPlugin.plugin.getPluginDir())); + + // debug: print resulting cmdline + for (String s : builder.command()) + System.out.print(s + " "); + System.out.print("\n"); + + final ToolProcess tp = new ToolProcess(); + try { + tp.process = builder.start(); + } catch (IOException e1) { + return; + } + tp.running = true; + + // redirect child process's stderr to JOSM stderr + new Thread(new Runnable() { + public void run() { + try { + byte[] buffer = new byte[1024]; + InputStream errStream = tp.process.getErrorStream(); + int len; + while ((len = errStream.read(buffer)) > 0) { + System.err.write(buffer, 0, len); + } + } catch (IOException e) { + } + } + }).start(); + + // read stdout stream + Thread osmParseThread = new Thread(new Runnable() { + public void run() { + try { + final InputStream inputStream = tp.process.getInputStream(); + final DataSet ds = OsmReader.parseDataSet(inputStream, + NullProgressMonitor.INSTANCE); + final List cmdlist = new DataSetToCmd(ds).getCommandList(); + if (!cmdlist.isEmpty()) { + SequenceCommand cmd = + new SequenceCommand(getName(), cmdlist); + Main.main.undoRedo.add(cmd); + } + } catch (IllegalDataException e) { + e.printStackTrace(); + if (tp.running) { + tp.process.destroy(); + SwingUtilities.invokeLater(new Runnable() { + public void run() { + JOptionPane.showMessageDialog(Main.parent, + tr("Child script have returned invalid data.")); + } + }); + } + } finally { + synchronized (syncObj) { + tp.running = false; + syncObj.notifyAll(); + } + } + } + + }); + osmParseThread.start(); + + synchronized (syncObj) { + try { + syncObj.wait(10000); + } catch (InterruptedException e) { + } + } + if (tp.running) { + new Thread(new PleaseWaitRunnable(name) { + @Override + protected void realRun() { + try { + progressMonitor.indeterminateSubTask(null); + synchronized (syncObj) { + if (tp.running) + syncObj.wait(); + } + } catch (InterruptedException e) { + } + } + + @Override + protected void cancel() { + synchronized (syncObj) { + tp.running = false; + tp.process.destroy(); + syncObj.notifyAll(); + } + } + + @Override + protected void finish() { + } + }).start(); + } + } +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolAction.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolAction.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolAction.java (revision 21930) @@ -0,0 +1,62 @@ +package ext_tools; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.event.ActionEvent; +import java.awt.event.MouseEvent; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.mapmode.MapMode; +import org.openstreetmap.josm.gui.layer.Layer; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.tools.ImageProvider; + +// TODO: Merge with ExtTool class? +class ExtToolAction extends MapMode { + + protected MapMode oldMapMode; + protected ExtTool tool; + + public ExtToolAction(ExtTool tool) { + super(tr(tool.name), "empty", tool.description, + null, + ImageProvider.getCursor("crosshair", null)); + this.tool = tool; + setEnabled(true); + } + + @Override + public void actionPerformed(ActionEvent e) { + if (Main.map == null || Main.map.mapView == null) + return; + oldMapMode = Main.map.mapMode; + super.actionPerformed(e); + } + + @Override + public void enterMode() { + super.enterMode(); + Main.map.mapView.addMouseListener(this); + } + + @Override + public void exitMode() { + super.exitMode(); + Main.map.mapView.removeMouseListener(this); + } + + @Override + public void mouseClicked(MouseEvent e) { + if (Main.map == null || Main.map.mapView == null) { + return; + } + + tool.runTool(Main.map.mapView.getLatLon(e.getX(), e.getY())); + Main.map.selectMapMode(oldMapMode); + } + + @Override + public boolean layerIsSupported(Layer l) { + return l instanceof OsmDataLayer; + } +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolsPlugin.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolsPlugin.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtToolsPlugin.java (revision 21930) @@ -0,0 +1,39 @@ +package ext_tools; + +import java.io.File; + +import org.openstreetmap.josm.gui.preferences.PreferenceSetting; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; + +import ext_tools.preferences.ExtToolsPreference; + +public class ExtToolsPlugin extends Plugin { + + public static ExtToolsPlugin plugin; + + public final ToolsInformation myTools; + public final ToolsInformation repoTools; + + public ExtToolsPlugin(PluginInformation info) { + super(info); + + plugin = this; + + File plugindir = new File(this.getPluginDir()); + if (!plugindir.exists()) + plugindir.mkdirs(); + + myTools = new ToolsInformation(new File(plugindir, "tools.cfg").getAbsolutePath()); + repoTools = new ToolsInformation(new File(plugindir, "repo.cfg").getAbsolutePath()); + + for (ExtTool tool : myTools.getToolsList()) { + tool.setEnabled(true); + } + } + + @Override + public PreferenceSetting getPreferenceSetting() { + return new ExtToolsPreference(this); + } +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/ToolsInformation.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/ToolsInformation.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/ToolsInformation.java (revision 21930) @@ -0,0 +1,64 @@ +package ext_tools; + +import java.io.BufferedReader; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.util.ArrayList; +import java.util.List; + +public class ToolsInformation { + String filename; + + ArrayList tools = new ArrayList(); + + public ToolsInformation(String filename) { + this.filename = filename; + load(); + } + + public void load() { + try { + BufferedReader rdr = new BufferedReader(new InputStreamReader( + new FileInputStream(filename), "UTF-8")); + StringBuilder sb = new StringBuilder(); + String line; + while ((line = rdr.readLine()) != null) { + sb.append(line).append('\n'); + if (line.equals("")) { + tools.add(ExtTool.unserialize(sb.toString())); + sb = new StringBuilder(); + } + } + rdr.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void save() { + try { + OutputStreamWriter w = new OutputStreamWriter(new FileOutputStream(filename), + "UTF-8"); + for (ExtTool tool : tools) + w.write(tool.serialize()); + w.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + + public List getToolsList() { + return tools; + } + + public void addTool(ExtTool tool) { + tools.add(tool); + } + + public void removeTool(ExtTool tool) { + tool.setEnabled(false); + tools.remove(tool); + } +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java (revision 21930) @@ -0,0 +1,69 @@ +package ext_tools.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; + +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JTextField; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; +import org.openstreetmap.josm.tools.GBC; + +import ext_tools.ExtTool; + +public class EditToolDialog extends ExtendedDialog { + private ExtTool tool; + + private JPanel panel = new JPanel(new GridBagLayout()); + private JTextField name = new JTextField(); + private JTextField cmdline = new JTextField(); + + private void addLabelled(String str, Component c) { + JLabel label = new JLabel(str); + panel.add(label, GBC.std()); + label.setLabelFor(c); + panel.add(c, GBC.eol().fill(GridBagConstraints.HORIZONTAL)); + } + + private void load() { + name.setText(tool.name); + cmdline.setText(tool.cmdline); + } + + private void save() { + tool.name = name.getText(); + tool.cmdline = cmdline.getText(); + } + + public EditToolDialog(ExtTool tool) { + super(Main.parent, tr("Edit tool"), + new String[] { tr("OK"), tr("Cancel") }, + true); + contentConstraints = GBC.eol().fill().insets(15, 15, 15, 5); + setButtonIcons(new String[] { "ok.png", "cancel.png" }); + + this.tool = tool; + + addLabelled(tr("Name:"), name); + addLabelled(tr("CmdLine:"), cmdline); + + load(); + + setContent(panel); + setupDialog(); + } + + @Override + protected void buttonAction(ActionEvent evt) { + if (evt.getActionCommand().equals(tr("OK"))) { + save(); + } + super.buttonAction(evt); + } +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/ExtToolsPreference.java (revision 21930) @@ -0,0 +1,41 @@ +package ext_tools.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagConstraints; + +import javax.swing.JPanel; +import javax.swing.JScrollPane; + +import org.openstreetmap.josm.gui.preferences.PreferenceSetting; +import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane; +import org.openstreetmap.josm.tools.GBC; + +import ext_tools.ExtToolsPlugin; + +public class ExtToolsPreference implements PreferenceSetting { + + ExtToolsPlugin plugin; + + public ExtToolsPreference(ExtToolsPlugin plugin) { + this.plugin = plugin; + } + + @Override + public void addGui(PreferenceTabbedPane gui) { + JPanel p = gui.createPreferenceTab("ext", tr("External tools"), + tr("Use external scripts in JOSM")); + MyToolsPanel tp = new MyToolsPanel(plugin.myTools); + tp.refresh(); + JScrollPane sp = new JScrollPane(tp); + p.add(sp, GBC.eol().fill(GridBagConstraints.BOTH)); + } + + @Override + public boolean ok() { + plugin.myTools.save(); + plugin.repoTools.save(); + return false; + } + +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java (revision 21930) @@ -0,0 +1,117 @@ +package ext_tools.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JOptionPane; +import javax.swing.JPanel; + +import org.openstreetmap.josm.Main; + +import ext_tools.ExtTool; +import ext_tools.ToolsInformation; + +public class MyToolsPanel extends JPanel { + ToolsInformation tools; + + public MyToolsPanel(ToolsInformation tools) { + super(new GridBagLayout()); + this.tools = tools; + } + + public void refresh() { + removeAll(); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.insets = new Insets(2, 5, 2, 5); + + for (final ExtTool tool : tools.getToolsList()) { + gbc.gridx = 0; + gbc.weightx = 1.0; + gbc.anchor = GridBagConstraints.WEST; + + final JCheckBox cbTool = new JCheckBox(tool.getName()); + cbTool.setSelected(tool.isEnabled()); + cbTool.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + tool.setEnabled(cbTool.isSelected()); + } + }); + add(cbTool, gbc); + + gbc.gridx = 1; + gbc.weightx = 0; + gbc.anchor = GridBagConstraints.EAST; + + final JButton bEdit = new JButton(tr("Edit")); + bEdit.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + JDialog dlg = new EditToolDialog(tool); + dlg.setVisible(true); + dlg.dispose(); + refresh(); + } + }); + add(bEdit, gbc); + + gbc.gridx = 2; + final JButton bDel = new JButton("X"); + bDel.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + if (JOptionPane.showConfirmDialog(Main.parent, + tr("Delete tool \"{0}\"?", tool.name), + tr("Are you sure?"), + JOptionPane.YES_NO_OPTION, + JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) + { + tools.removeTool(tool); + refresh(); + } + } + }); + add(bDel, gbc); + + gbc.gridy++; + } + gbc.gridx = 0; + gbc.fill = GridBagConstraints.NONE; + gbc.anchor = GridBagConstraints.WEST; + + final JButton bNew = new JButton(tr("New tool...")); + bNew.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + ExtTool tool = new ExtTool(); + JDialog dlg = new EditToolDialog(tool); + dlg.setVisible(true); + dlg.dispose(); + if (tool.name != null && (!"".equals(tool.name))) { + tools.addTool(tool); + tool.setEnabled(true); + } + refresh(); + } + }); + add(bNew, gbc); + gbc.gridy++; + + gbc.weightx = 1.0; + gbc.weighty = 1.0; + gbc.fill = GridBagConstraints.BOTH; + add(new JPanel(), gbc); + revalidate(); + repaint(); + } + +} Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java =================================================================== --- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java (revision 21930) +++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/ToolsRepositoryPanel.java (revision 21930) @@ -0,0 +1,86 @@ +package ext_tools.preferences; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; + +import ext_tools.ExtTool; +import ext_tools.ToolsInformation; + +public class ToolsRepositoryPanel extends JPanel { + + ToolsInformation tools; + + public ToolsRepositoryPanel(ToolsInformation tools) { + super(new GridBagLayout()); + this.tools = tools; + } + + public void refresh() { + removeAll(); + GridBagConstraints gbc = new GridBagConstraints(); + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + gbc.insets = new Insets(2, 5, 2, 5); + + for (final ExtTool tool : tools.getToolsList()) { + gbc.gridx = 0; + gbc.weightx = 1.0; + gbc.anchor = GridBagConstraints.WEST; + + final JCheckBox cbTool = new JCheckBox(tool.getName()); + cbTool.setSelected(tool.isEnabled()); + cbTool.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + tool.setEnabled(cbTool.isSelected()); + } + }); + add(cbTool, gbc); + + gbc.gridx = 1; + gbc.weightx = 0; + gbc.anchor = GridBagConstraints.EAST; + + final JButton bEdit = new JButton(tr("Install")); + bEdit.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent arg0) { + JDialog dlg = new EditToolDialog(tool); + dlg.setVisible(true); + dlg.dispose(); + refresh(); + } + }); + add(bEdit, gbc); + + gbc.gridy++; + gbc.gridx = 0; + gbc.weightx = 1.0; + gbc.anchor = GridBagConstraints.WEST; + + JLabel lbl = new JLabel(tool.cmdline); + add(lbl, gbc); + + gbc.gridy++; + } + gbc.gridy++; + + gbc.weightx = 1.0; + gbc.weighty = 1.0; + gbc.fill = GridBagConstraints.BOTH; + add(new JPanel(), gbc); + revalidate(); + repaint(); + } + +}