Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (revision 32132) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoAction.java (revision 32844) @@ -1,23 +1,7 @@ -/** - * PointInfo - plugin for JOSM - * Marian Kyral - * - * 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. - */ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pointinfo; import static org.openstreetmap.josm.tools.I18n.tr; + import java.awt.Cursor; import java.awt.Point; @@ -27,13 +11,9 @@ import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -// import java.awt.event.KeyListener; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedList; -import javax.swing.SwingConstants; + +import javax.swing.ImageIcon; import javax.swing.JEditorPane; import javax.swing.JOptionPane; import javax.swing.JScrollPane; -import javax.swing.ImageIcon; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; @@ -41,16 +21,11 @@ import org.openstreetmap.josm.Main; import org.openstreetmap.josm.actions.mapmode.MapMode; -import org.openstreetmap.josm.command.AddCommand; -import org.openstreetmap.josm.command.Command; -import org.openstreetmap.josm.command.SequenceCommand; import org.openstreetmap.josm.data.coor.LatLon; -import org.openstreetmap.josm.data.osm.Node; -import org.openstreetmap.josm.data.osm.Way; +import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.gui.PleaseWaitRunnable; import org.openstreetmap.josm.gui.progress.ProgressMonitor; -import org.openstreetmap.josm.gui.MapFrame; import org.openstreetmap.josm.tools.ImageProvider; +import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.Shortcut; -import org.openstreetmap.josm.tools.OpenBrowser; import org.xml.sax.SAXException; @@ -58,5 +33,4 @@ private static final long serialVersionUID = 1L; - protected boolean cancel; @@ -66,6 +40,8 @@ private String coordinatesText = ""; - public PointInfoAction(MapFrame mapFrame) { - super(tr("Point info"), "info-sml", tr("Point info."), Shortcut.registerShortcut("tools:pointInfo", tr("Tool: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), mapFrame, getCursor()); + PointInfoAction(MapFrame mapFrame) { + super(tr("Point info"), "info-sml", tr("Point info."), + Shortcut.registerShortcut("tools:pointInfo", tr("Tool: {0}", tr("Point info")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), + mapFrame, getCursor()); } @@ -78,5 +54,4 @@ Main.map.mapView.setCursor(getCursor()); Main.map.mapView.addMouseListener(this); - } @@ -100,5 +75,4 @@ try { PleaseWaitRunnable infoTask = new PleaseWaitRunnable(tr("Connecting server")) { - @Override protected void realRun() throws SAXException { @@ -108,39 +82,38 @@ @Override protected void finish() { - } @Override protected void afterFinish() { - if (htmlText.length() > 0) { - - // Show result - JEditorPane msgLabel = new JEditorPane("text/html", htmlText); - msgLabel.setEditable(false); - msgLabel.setOpaque(false); - msgLabel.addHyperlinkListener(new HyperlinkListener() { - public void hyperlinkUpdate(HyperlinkEvent hle) { - if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) { - if (hle.getURL() == null || hle.getURL().toString().isEmpty()) { - return; + if (htmlText.length() > 0) { + // Show result + JEditorPane msgLabel = new JEditorPane("text/html", htmlText); + msgLabel.setEditable(false); + msgLabel.setOpaque(false); + msgLabel.addHyperlinkListener(new HyperlinkListener() { + @Override + public void hyperlinkUpdate(HyperlinkEvent hle) { + if (HyperlinkEvent.EventType.ACTIVATED.equals(hle.getEventType())) { + if (hle.getURL() == null || hle.getURL().toString().isEmpty()) { + return; + } + System.out.println("URL: "+ hle.getURL()); + if (!hle.getURL().toString().startsWith("http")) { + mRuian.performAction(hle.getURL().toString()); + } else { + String ret = OpenBrowser.displayUrl(hle.getURL().toString()); + if (ret != null) { + PointInfoUtils.showNotification(ret, "error"); + } + } + } } - System.out.println("URL: "+ hle.getURL()); - if (! hle.getURL().toString().startsWith("http")) { - mRuian.performAction(hle.getURL().toString()); - } else { - String ret = OpenBrowser.displayUrl(hle.getURL().toString()); - if (ret != null) { - PointInfoUtils.showNotification(ret, "error"); - } - } - } - } - }); - JScrollPane scrollPane = new JScrollPane(msgLabel); - Object[] objects = {scrollPane}; - final ImageIcon icon = new ImageIcon(getClass().getResource("/images/dialogs/info-sml.png")); - JOptionPane.showMessageDialog( - null, objects, tr("PointInfo") + " " + coordinatesText, JOptionPane.PLAIN_MESSAGE,icon); - } + }); + JScrollPane scrollPane = new JScrollPane(msgLabel); + Object[] objects = {scrollPane}; + final ImageIcon icon = new ImageIcon(getClass().getResource("/images/dialogs/info-sml.png")); + JOptionPane.showMessageDialog( + null, objects, tr("PointInfo") + " " + coordinatesText, JOptionPane.PLAIN_MESSAGE, icon); + } } @@ -150,6 +123,5 @@ } }; - Thread executeInfoThread = new Thread(infoTask); - executeInfoThread.start(); + new Thread(infoTask).start(); } catch (Exception e) { e.printStackTrace(); @@ -161,7 +133,7 @@ progressMonitor.beginTask(null, 3); try { - mRuian.prepareData(pos); - htmlText = mRuian.getHtml(); - coordinatesText = PointInfoUtils.formatCoordinates(pos.lat(), pos.lon()); + mRuian.prepareData(pos); + htmlText = mRuian.getHtml(); + coordinatesText = PointInfoUtils.formatCoordinates(pos.lat(), pos.lon()); } finally { @@ -170,6 +142,6 @@ progressMonitor.invalidate(); if (htmlText.length() == 0) { - PointInfoUtils.showNotification(tr("Data not available.")+ "\n(" + pos.toDisplayString() + ")", "warning"); - return; + PointInfoUtils.showNotification(tr("Data not available.")+ "\n(" + pos.toDisplayString() + ")", "warning"); + return; } } @@ -199,5 +171,5 @@ updateKeyModifiers(e); if (e.getButton() == MouseEvent.BUTTON1) { - infoAsync(e.getPoint()); + infoAsync(e.getPoint()); } } Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java (revision 32132) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoPlugin.java (revision 32844) @@ -1,46 +1,18 @@ -/** - * PointInfo - plugin for JOSM - * Marián Kyral - * - * 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. - */ - +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pointinfo; - -import java.util.ArrayList; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.gui.MainMenu; -// import org.openstreetmap.josm.gui.preferences.PreferenceSetting; import org.openstreetmap.josm.plugins.Plugin; import org.openstreetmap.josm.plugins.PluginInformation; - - /** * This is the main class for the PointInfo plugin. - * */ -public class PointInfoPlugin extends Plugin{ +public class PointInfoPlugin extends Plugin { - public PointInfoPlugin(PluginInformation info) { - super(info); - MainMenu.add(Main.main.menu.moreToolsMenu, new PointInfoAction(Main.map)); - -// @Override -// public PreferenceSetting getPreferenceSetting() { -// return new PreferenceEditor(); + public PointInfoPlugin(PluginInformation info) { + super(info); + MainMenu.add(Main.main.menu.moreToolsMenu, new PointInfoAction(Main.map)); } } Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoServer.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoServer.java (revision 32132) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoServer.java (revision 32844) @@ -1,21 +1,3 @@ -/** - * PointInfo - plugin for JOSM - * Marian Kyral - * - * 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. - */ - +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pointinfo; @@ -23,6 +5,4 @@ import java.io.InputStreamReader; import java.net.URL; -import java.util.ArrayList; -import org.openstreetmap.josm.data.coor.LatLon; public class PointInfoServer { @@ -46,7 +26,7 @@ while ((line = reader.readLine()) != null) { if (sb.length() == 0) - sb.append(line); + sb.append(line); else - sb.append(" "+line); + sb.append(" "+line); } return sb.toString(); Index: applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoUtils.java =================================================================== --- applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoUtils.java (revision 32132) +++ applications/editors/josm/plugins/pointInfo/src/org/openstreetmap/josm/plugins/pointinfo/PointInfoUtils.java (revision 32844) @@ -1,29 +1,11 @@ -/** - * PointInfo - plugin for JOSM - * Marian Kyral - * - * 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. - */ - +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.pointinfo; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; + import javax.swing.JOptionPane; import org.openstreetmap.josm.gui.Notification; - public abstract class PointInfoUtils { @@ -34,18 +16,18 @@ * @param type Type if message (info, warning, error, plain). */ - public static void showNotification (String message, String type) { - Notification note = new Notification(message); + public static void showNotification(String message, String type) { + Notification note = new Notification(message); - if (type.equals("info")) - note.setIcon(JOptionPane.INFORMATION_MESSAGE); - else if (type.equals("warning")) - note.setIcon(JOptionPane.WARNING_MESSAGE); - else if (type.equals("error")) - note.setIcon(JOptionPane.ERROR_MESSAGE); - else - note.setIcon(JOptionPane.PLAIN_MESSAGE); + if (type.equals("info")) + note.setIcon(JOptionPane.INFORMATION_MESSAGE); + else if (type.equals("warning")) + note.setIcon(JOptionPane.WARNING_MESSAGE); + else if (type.equals("error")) + note.setIcon(JOptionPane.ERROR_MESSAGE); + else + note.setIcon(JOptionPane.PLAIN_MESSAGE); - note.setDuration(Notification.TIME_SHORT); - note.show(); + note.setDuration(Notification.TIME_SHORT); + note.show(); } @@ -56,16 +38,15 @@ * @return String coordinatesText */ - public static String formatCoordinates (double lat, double lon) { + public static String formatCoordinates(double lat, double lon) { - String r = ""; - DecimalFormatSymbols symbols = new DecimalFormatSymbols(); - symbols.setDecimalSeparator('.'); - symbols.setGroupingSeparator(' '); - DecimalFormat df = new DecimalFormat("#.00000", symbols); + String r = ""; + DecimalFormatSymbols symbols = new DecimalFormatSymbols(); + symbols.setDecimalSeparator('.'); + symbols.setGroupingSeparator(' '); + DecimalFormat df = new DecimalFormat("#.00000", symbols); - r = "(" + df.format(lat) + ", " + + r = "(" + df.format(lat) + ", " + df.format(lon) + ")"; - return r; + return r; } - }