Index: /applications/editors/josm/plugins/DirectDownload/AUTHORS =================================================================== --- /applications/editors/josm/plugins/DirectDownload/AUTHORS (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/AUTHORS (revision 23585) @@ -0,0 +1,1 @@ +Hartmut Holzgraefe Index: /applications/editors/josm/plugins/DirectDownload/LICENSE =================================================================== --- /applications/editors/josm/plugins/DirectDownload/LICENSE (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/LICENSE (revision 23585) @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, 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 Lesser 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 Street, 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 Lesser General +Public License instead of this License. Index: /applications/editors/josm/plugins/DirectDownload/README =================================================================== --- /applications/editors/josm/plugins/DirectDownload/README (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/README (revision 23585) @@ -0,0 +1,27 @@ +DirectDownload plugin for JOSM +============================== + +The DirectDownload plugin enables you to directly download your GPX +tracks you previously uploaded on openstreetmap.org without having +to download them manually first and then having to open the downloaded +track using the "Open file ..." dialog. + +The plugin provides a new entry "Download track ..." in the file +menu (no keyboard shortcut yet). This opens a dialog that will +present a list of your uploaded tracks, showing the tracks timestamp +and filename, from which you can directly pick one track to be +downloaded into a new GPX layer. + +TODO +==== + +* keyboard shortcut? +* properly parse track timestamp, show it in local time instead of UTC +* progress bars +* sort tracks by time (what gets back from the /user/gpx_files API call + does not seem to be fully sorted) +* make the table in the dialog sortable (right now when enabling auto + sort on the JTable object an exception is thrown when clicking + column headers) +* show track tags +* code cleanup Index: /applications/editors/josm/plugins/DirectDownload/build.xml =================================================================== --- /applications/editors/josm/plugins/DirectDownload/build.xml (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/build.xml (revision 23585) @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/DirectDownload/images/README =================================================================== --- /applications/editors/josm/plugins/DirectDownload/images/README (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/images/README (revision 23585) @@ -0,0 +1,1 @@ +DownloadAction.png is a copy of UploadAction.png from the DirectDownload plugin Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java =================================================================== --- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (revision 23585) @@ -0,0 +1,95 @@ +package org.openstreetmap.josm.plugins.directdownload; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.InputStream; +import java.io.IOException; + +import java.net.URL; + +import java.util.List; + +import java.awt.event.ActionEvent; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; + +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; + +import org.openstreetmap.josm.gui.download.DownloadSelection; + +import org.openstreetmap.josm.gui.layer.GpxLayer; +import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; + +import org.openstreetmap.josm.io.GpxReader; + +import javax.swing.JOptionPane; + +import org.xml.sax.SAXException; + +public class DirectDownload extends Plugin { + DownloadAction openaction; + + /** + * Will be invoked by JOSM to bootstrap the plugin + * + * @param info information about the plugin and its local installation + */ + public DirectDownload(PluginInformation info) { + super(info); + + openaction = new DownloadAction(); + Main.main.menu.fileMenu.add(openaction); + } + + class DownloadAction extends JosmAction{ + public DownloadAction(){ + super(tr("Download Track ..."), "DownloadAction", tr("Download GPX track from openstreetmap.org"), + null, false); + } + public void actionPerformed(ActionEvent event) { + DownloadDataGui go = new DownloadDataGui(); + go.setVisible(true); + + UserTrack track = go.getSelectedUserTrack(); + + if ((go.getValue() == 1) && (track != null)) { + String apiBaseUrl = "http://api.openstreetmap.org/api/0.6/"; + String urlString = apiBaseUrl + "gpx/" + track.id + "/data"; + + try { + URL trackDataUrl = new URL(urlString); + InputStream is = trackDataUrl.openStream(); + + GpxReader r = new GpxReader(is); + boolean parsedProperly = r.parse(true); + GpxLayer gpxLayer = new GpxLayer(r.data, track.filename, true); + + if (r.data.hasRoutePoints() || r.data.hasTrackPoints()) { + Main.main.addLayer(gpxLayer); + } + + if (Main.pref.getBoolean("marker.makeautomarkers", true) && !r.data.waypoints.isEmpty()) { + MarkerLayer ml = new MarkerLayer(r.data, tr("Markers from {0}", track.filename), null, gpxLayer); + if (ml.data.size() > 0) { + Main.main.addLayer(ml); + } + } + if (!parsedProperly) { + JOptionPane.showMessageDialog(null, tr("Error occured while parsing gpx file {0}. Only part of the file will be available", urlString)); + } + + } catch (java.net.MalformedURLException e) { + JOptionPane.showMessageDialog(null, tr("Invalid URL {0}", urlString)); + } catch (java.io.IOException e) { + JOptionPane.showMessageDialog(null, tr("Error fetching URL {0}", urlString)); + } catch (SAXException e) { + JOptionPane.showMessageDialog(null, tr("Error parsing data from URL {0}", urlString)); + } + } + } + } + +} + Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java =================================================================== --- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java (revision 23585) @@ -0,0 +1,306 @@ +package org.openstreetmap.josm.plugins.directdownload; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.io.InputStream; +import java.io.IOException; + +import java.net.URL; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.StringTokenizer; + +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.ExtendedDialog; + +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; + +import javax.swing.BorderFactory; +import javax.swing.DefaultListModel; +import javax.swing.DefaultListSelectionModel; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; +import javax.swing.UIManager; + +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; + +import javax.swing.table.DefaultTableColumnModel; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.TableColumn; + +import org.xml.sax.*; +import org.xml.sax.helpers.*; + +import javax.xml.parsers.SAXParserFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.parsers.SAXParser; + + +public class DownloadDataGui extends ExtendedDialog { + private String apiBaseUrl = "http://api.openstreetmap.org/api/0.6/"; + + // User for log in when downloading trace + private String username = Main.pref.get("osm-server.username"); + private String password = Main.pref.get("osm-server.password"); + + private NamedResultTableModel model; + private NamedResultTableColumnModel columnmodel; + private JTable tblSearchResults; + + public DownloadDataGui() { + // Initalizes ExtendedDialog + super(Main.parent, + tr("Download Track"), + new String[] {tr("Download Track"), tr("Cancel")}, + true + ); + + JPanel panel = new JPanel(); + panel.setLayout(new BorderLayout()); + + DefaultListSelectionModel selectionModel = new DefaultListSelectionModel(); + model = new NamedResultTableModel(selectionModel); + columnmodel = new NamedResultTableColumnModel(); + tblSearchResults = new JTable(model, columnmodel); + tblSearchResults.setSelectionModel(selectionModel); + tblSearchResults.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + JScrollPane scrollPane = new JScrollPane(tblSearchResults); + scrollPane.setPreferredSize(new Dimension(800,300)); + panel.add(scrollPane, BorderLayout.CENTER); + + model.setData(getTrackList()); + + setContent(panel); + setupDialog(); + } + + private static class TrackListHandler extends DefaultHandler { + private LinkedList data = new LinkedList(); + private String cdata = new String(); + + @Override + public void startElement(String namespaceURI, String localName, String qName, Attributes atts) + throws SAXException { + if (qName.equals("gpx_file")) { + UserTrack track = new UserTrack(); + + track.id = atts.getValue("id"); + track.filename = atts.getValue("name"); + track.datetime = atts.getValue("timestamp").replaceAll("[TZ]", " "); // TODO: do real parsing and time zone conversion + + data.addFirst(track); + } + cdata = new String(); + } + + public void characters(char ch[], int start, int length) + throws SAXException { + cdata += new String(ch, start, length); + } + + public void endElement(String uri, String localName, + String qName) + throws SAXException { + if (qName.equals("description")) { + data.getFirst().description = cdata; + } + /* + else if (qName.equals("tag")) { + data.getFirst().tags = cdata; + cdata = new String(); + } + */ + } + + + public List getResult() { + return data; + } + } + + private List getTrackList() { + String urlString = apiBaseUrl + "user/gpx_files"; + + try { + URL userTracksUrl = new URL(urlString); + + SAXParserFactory spf = SAXParserFactory.newInstance(); + TrackListHandler handler = new TrackListHandler(); + + //get a new instance of parser + SAXParser sp = spf.newSAXParser(); + + //parse the file and also register this class for call backs + sp.parse(userTracksUrl.openStream(), handler); + + return handler.getResult(); + } catch (java.net.MalformedURLException e) { + JOptionPane.showMessageDialog(null, tr("Invalid URL {0}", urlString)); + } catch (java.io.IOException e) { + JOptionPane.showMessageDialog(null, tr("Error fetching URL {0}", urlString)); + } catch (SAXException e) { + JOptionPane.showMessageDialog(null, tr("Error parsing data from URL {0}", urlString)); + } catch(ParserConfigurationException pce) { + JOptionPane.showMessageDialog(null, tr("Error parsing data from URL {0}", urlString)); + } + + return new LinkedList(); + } + + static class NamedResultTableModel extends DefaultTableModel { + private ArrayList data; + private ListSelectionModel selectionModel; + + public NamedResultTableModel(ListSelectionModel selectionModel) { + data = new ArrayList(); + this.selectionModel = selectionModel; + } + @Override + public int getRowCount() { + if (data == null) return 0; + return data.size(); + } + + @Override + public Object getValueAt(int row, int column) { + if (data == null) return null; + return data.get(row); + } + + public void setData(List data) { + if (data == null) { + this.data.clear(); + } else { + this.data =new ArrayList(data); + } + fireTableDataChanged(); + } + @Override + public boolean isCellEditable(int row, int column) { + return false; + } + + public UserTrack getSelectedUserTrack() { + if (selectionModel.getMinSelectionIndex() < 0) + return null; + return data.get(selectionModel.getMinSelectionIndex()); + } + } + + public UserTrack getSelectedUserTrack() { + return model.getSelectedUserTrack(); + } + + + static class NamedResultTableColumnModel extends DefaultTableColumnModel { + protected void createColumns() { + TableColumn col = null; + NamedResultCellRenderer renderer = new NamedResultCellRenderer(); + + // column 0 - DateTime + col = new TableColumn(0); + col.setHeaderValue(tr("Date")); + col.setResizable(true); + col.setPreferredWidth(150); + col.setCellRenderer(renderer); + addColumn(col); + + // column 1 - Filename + col = new TableColumn(1); + col.setHeaderValue(tr("Filename")); + col.setResizable(true); + col.setPreferredWidth(200); + col.setCellRenderer(renderer); + addColumn(col); + + // column 2 - Description + col = new TableColumn(2); + col.setHeaderValue(tr("Description")); + col.setResizable(true); + col.setPreferredWidth(450); + col.setCellRenderer(renderer); + addColumn(col); + + // column 3 - tags + /* + col = new TableColumn(3); + col.setHeaderValue(tr("Tags")); + col.setResizable(true); + col.setPreferredWidth(100); + col.setCellRenderer(renderer); + addColumn(col); + */ + } + + public NamedResultTableColumnModel() { + createColumns(); + } + } + + class ListSelectionHandler implements ListSelectionListener { + public void valueChanged(ListSelectionEvent lse) { + } + } + + static class NamedResultCellRenderer extends JLabel implements TableCellRenderer { + + public NamedResultCellRenderer() { + setOpaque(true); + setBorder(BorderFactory.createEmptyBorder(2,2,2,2)); + } + + protected void reset() { + setText(""); + setIcon(null); + } + + protected void renderColor(boolean selected) { + if (selected) { + setForeground(UIManager.getColor("Table.selectionForeground")); + setBackground(UIManager.getColor("Table.selectionBackground")); + } else { + setForeground(UIManager.getColor("Table.foreground")); + setBackground(UIManager.getColor("Table.background")); + } + } + + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + + reset(); + renderColor(isSelected); + + if (value == null) return this; + UserTrack sr = (UserTrack) value; + switch(column) { + case 0: + setText(sr.datetime); + break; + case 1: + setText(sr.filename); + break; + case 2: + setText(sr.description); + break; + /* + case 3: + setText(sr.tags); + break; + */ + } + return this; + } + } + +} Index: /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrack.java =================================================================== --- /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrack.java (revision 23585) +++ /applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/UserTrack.java (revision 23585) @@ -0,0 +1,9 @@ +package org.openstreetmap.josm.plugins.directdownload; + +class UserTrack { + public String id; + public String filename; + public String description; + public String tags; + public String datetime; +}