Index: /trunk/src/org/openstreetmap/josm/actions/HelpAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 2251) +++ /trunk/src/org/openstreetmap/josm/actions/HelpAction.java (revision 2252) @@ -4,34 +4,19 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.BorderLayout; import java.awt.Component; import java.awt.Point; import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.io.IOException; import javax.swing.AbstractAction; import javax.swing.AbstractButton; import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JEditorPane; -import javax.swing.JFrame; import javax.swing.JMenu; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.KeyStroke; import javax.swing.SwingUtilities; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.help.HelpBrowser; +import org.openstreetmap.josm.gui.help.Helpful; import org.openstreetmap.josm.tools.ImageProvider; -import org.openstreetmap.josm.tools.LanguageInfo; -import org.openstreetmap.josm.tools.OpenBrowser; -import org.openstreetmap.josm.tools.WikiReader; /** @@ -42,84 +27,16 @@ public class HelpAction extends AbstractAction { - public interface Helpful { - String helpTopic(); - } + private HelpBrowser helpBrowser; - private String languageCode = LanguageInfo.getLanguageCodeWiki(); - private JFrame helpBrowser = new JFrame(tr("JOSM Online Help")); - private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); - private String pathbase = Main.pref.get("help.pathbase", "/wiki/"); private String pathhelp = Main.pref.get("help.pathhelp", "Help/"); private String pathmenu = Main.pref.get("help.pathmenu", "Menu/"); - private JEditorPane help = new JEditorPane(); - private WikiReader reader = new WikiReader(baseurl); - private String url; public HelpAction() { super(tr("Help"), ImageProvider.get("help")); - help.setEditable(false); - help.addHyperlinkListener(new HyperlinkListener(){ - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED) - return; - if (e.getURL() == null) { - help.setText("404 not found"); - } else if (e.getURL().toString().endsWith("action=edit")) { - OpenBrowser.displayUrl(e.getURL().toString()); - } else { - setHelpUrl(e.getURL().toString()); - } - } - }); - help.setContentType("text/html"); - - JPanel p = new JPanel(new BorderLayout()); - helpBrowser.setContentPane(p); - - p.add(new JScrollPane(help), BorderLayout.CENTER); - String[] bounds = Main.pref.get("help.window.bounds", "0,0,800,600").split(","); - helpBrowser.setBounds( - Integer.parseInt(bounds[0]), - Integer.parseInt(bounds[1]), - Integer.parseInt(bounds[2]), - Integer.parseInt(bounds[3])); - - JPanel buttons = new JPanel(); - p.add(buttons, BorderLayout.SOUTH); - createButton(buttons, tr("Open in Browser")); - createButton(buttons, tr("Edit")); - createButton(buttons, tr("Reload")); - - helpBrowser.addWindowListener(new WindowAdapter(){ - @Override public void windowClosing(WindowEvent e) { - closeHelp(); - } - }); - - help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close"); - help.getActionMap().put("Close", new AbstractAction(){ - public void actionPerformed(ActionEvent e) { - closeHelp(); - } - }); + this.helpBrowser = new HelpBrowser(); } public void actionPerformed(ActionEvent e) { - if (tr("Open in Browser").equals(e.getActionCommand())) { - OpenBrowser.displayUrl(url); - } else if (tr("Edit").equals(e.getActionCommand())) { - if (!url.startsWith(baseurl)) { - JOptionPane.showMessageDialog( - Main.parent, - tr("Can only edit help pages from JOSM Online Help"), - tr("Warning"), - JOptionPane.WARNING_MESSAGE - ); - return; - } - OpenBrowser.displayUrl(url+"?action=edit"); - } else if (tr("Reload").equals(e.getActionCommand())) { - setHelpUrl(url); - } else if (e.getActionCommand() == null) { + if (e.getActionCommand() == null) { String topic = null; if (e.getSource() instanceof Component) { @@ -134,5 +51,5 @@ if (topic == null) { helpBrowser.setVisible(false); - setHelpUrl(baseurl+pathbase+"Help"); + helpBrowser.setUrlForHelpTopic("Help"); } else { help(topic); @@ -140,5 +57,5 @@ } else { helpBrowser.setVisible(false); - setHelpUrl(baseurl+pathbase+"Help"); + helpBrowser.setUrlForHelpTopic("Help"); } } @@ -179,82 +96,5 @@ public void help(String topic) { helpBrowser.setVisible(false); - setHelpUrl(baseurl+pathbase+pathhelp+topic); - } - - /** - * Set the content of the help window to a specific text (in html format) - * @param url The url this content is the representation of - */ - public void setHelpUrl(String url) { - String langurl = url; - if(url.startsWith(baseurl+pathbase)) - { - int i = pathbase.length()+baseurl.length(); - String title = url.substring(i); - if(languageCode.length() != 0 && !title.startsWith(languageCode)) { - title = languageCode + title; - } - langurl = url.substring(0, i) + title; - } - boolean loaded = false; - if(!langurl.equals(this.url) && !langurl.equals(url)) - { - loaded = loadHelpUrl(url, langurl, true); - } - if(!loaded) { - loaded = loadHelpUrl(url, langurl, false); - } - if(!loaded) { - help.setText(tr("Error while loading page {0}",url)); - } - helpBrowser.setVisible(true); - } - - private boolean loadHelpUrl(String url, String langurl, boolean lang) - { - this.url = lang ? langurl : url; - boolean loaded = false; - try { - String txt = reader.read(this.url); - if(txt.length() == 0) - { - if(lang) - throw new IOException(); - else - { - if(url.equals(langurl)) - { - txt = (""+tr("Help page missing. Create it in English.", - url+"?action=edit")+""); - } - else - { - txt = (""+tr("Help page missing. Create it in English or your language.", - url+"?action=edit", langurl+"?action=edit")+""); - } - } - } - help.setText(txt); - help.setCaretPosition(0); - loaded = true; - } catch (IOException ex) { - } - return loaded; - } - - /** - * Closes the help window - */ - public void closeHelp() { - String bounds = helpBrowser.getX()+","+helpBrowser.getY()+","+helpBrowser.getWidth()+","+helpBrowser.getHeight(); - Main.pref.put("help.window.bounds", bounds); - helpBrowser.setVisible(false); - } - - private void createButton(JPanel buttons, String name) { - JButton b = new JButton(tr(name)); - b.setActionCommand(name); - b.addActionListener(this); - buttons.add(b); + helpBrowser.setUrlForHelpTopic(pathhelp + topic); } } Index: /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 2251) +++ /trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (revision 2252) @@ -634,4 +634,5 @@ incomplete = osm.incomplete; flags = osm.flags; + user= osm.user; clearCached(); clearErrors(); Index: /trunk/src/org/openstreetmap/josm/data/osm/Way.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 2251) +++ /trunk/src/org/openstreetmap/josm/data/osm/Way.java (revision 2252) @@ -88,7 +88,6 @@ if (node == null) return false; for (int i=0; i404 not found"); + } else if (e.getURL().toString().endsWith("action=edit")) { + OpenBrowser.displayUrl(e.getURL().toString()); + } else { + setUrl(e.getURL().toString()); + } + } + }); + help.setContentType("text/html"); + + JPanel p = new JPanel(new BorderLayout()); + setContentPane(p); + + p.add(new JScrollPane(help), BorderLayout.CENTER); + + JPanel buttons = new JPanel(); + p.add(buttons, BorderLayout.SOUTH); + + buttons.add(new SideButton(new OpenInBrowserAction())); + buttons.add(new SideButton(new EditAction())); + buttons.add(new SideButton(new ReloadAction())); + + addWindowListener(new WindowAdapter(){ + @Override public void windowClosing(WindowEvent e) { + setVisible(false); + } + }); + + help.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "Close"); + help.getActionMap().put("Close", new AbstractAction(){ + public void actionPerformed(ActionEvent e) { + setVisible(false); + } + }); + + setTitle(tr("JOSM Help Browser")); + } + + public HelpBrowser() { + build(); + } + + @Override + public void setVisible(boolean visible) { + if (visible) { + new WindowGeometry( + getClass().getName() + ".geometry", + WindowGeometry.centerInWindow( + Main.parent, + new Dimension(800,600) + ) + ).applySafe(this); + } else if (!visible && isShowing()){ + new WindowGeometry(this).remember(getClass().getName() + ".geometry"); + } + super.setVisible(visible); + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + String langurl = url; + if(url.startsWith(baseurl+pathbase)){ + int i = pathbase.length()+baseurl.length(); + String title = url.substring(i); + if(languageCode.length() != 0 && !title.startsWith(languageCode)) { + title = languageCode + title; + } + langurl = url.substring(0, i) + title; + } + boolean loaded = false; + if(!langurl.equals(this.url) && !langurl.equals(url)){ + loaded = loadHelpUrl(url, langurl, true); + } + if(!loaded) { + loaded = loadHelpUrl(url, langurl, false); + } + if(!loaded) { + help.setText(tr("Error while loading page {0}",url)); + } + if (!isVisible()) { + setVisible(true); + toFront(); + } else { + toFront(); + } + } + + public void setUrlForHelpTopic(String topic) { + setUrl(baseurl+pathbase+ topic); + } + + protected boolean loadHelpUrl(String url, String localizedUrl, boolean useLocalizedUrl){ + this.url = useLocalizedUrl ? localizedUrl : url; + boolean loaded = false; + try { + String txt = reader.read(this.url); + if(txt.length() == 0){ + if(useLocalizedUrl) + throw new IOException(); + if(url.equals(localizedUrl)){ + txt = (""+tr("Help page missing. Create it in English.", + url+"?action=edit")+""); + } else{ + txt = (""+tr("Help page missing. Create it in English or your language.", + url+"?action=edit", localizedUrl+"?action=edit")+""); + } + } + help.setText(txt); + help.setCaretPosition(0); + loaded = true; + } catch (IOException ex) { + } + return loaded; + } + + class OpenInBrowserAction extends AbstractAction { + public OpenInBrowserAction() { + putValue(NAME, tr("Open in Browser")); + putValue(SHORT_DESCRIPTION, tr("Open the current help page in an external browser")); + // provide icon + } + + public void actionPerformed(ActionEvent e) { + OpenBrowser.displayUrl(getUrl()); + } + } + + class EditAction extends AbstractAction { + public EditAction() { + putValue(NAME, tr("Edit")); + putValue(SHORT_DESCRIPTION, tr("Edit the current help page")); + putValue(SMALL_ICON,ImageProvider.get("dialogs", "edit")); + } + + public void actionPerformed(ActionEvent e) { + if (!getUrl().startsWith(baseurl)) { + JOptionPane.showMessageDialog( + Main.parent, + tr("Can only edit help pages from JOSM Online Help"), + tr("Warning"), + JOptionPane.WARNING_MESSAGE + ); + return; + } + OpenBrowser.displayUrl(url+"?action=edit"); + } + } + + class ReloadAction extends AbstractAction { + public ReloadAction() { + putValue(NAME, tr("Reload")); + putValue(SHORT_DESCRIPTION, tr("Reload the current help page")); + putValue(SMALL_ICON, ImageProvider.get("dialogs", "refresh")); + } + + public void actionPerformed(ActionEvent e) { + setUrl(url); + } + } +} Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBuilder.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpBuilder.java (revision 2252) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBuilder.java (revision 2252) @@ -0,0 +1,24 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.help; + +import java.awt.event.KeyEvent; + +import javax.swing.JComponent; +import javax.swing.KeyStroke; + +import org.openstreetmap.josm.Main; + +public class HelpBuilder { + + /** + * Makes a component aware of context sensitive help + * + * @param component the component + * @param topic the help topic + */ + static public void setHelpContext(JComponent component, String topic) { + component.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F1,0), "help"); + component.getActionMap().put("help", Main.main.menu.help); + component.putClientProperty("help", topic); + } +} Index: /trunk/src/org/openstreetmap/josm/gui/help/Helpful.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/Helpful.java (revision 2252) +++ /trunk/src/org/openstreetmap/josm/gui/help/Helpful.java (revision 2252) @@ -0,0 +1,6 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.help; + +public interface Helpful { + String helpTopic(); +} Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 2251) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/history/HistoryNodeTest.java (revision 2252) @@ -6,4 +6,5 @@ import org.junit.Test; +import org.openstreetmap.josm.data.coor.LatLon; import org.openstreetmap.josm.data.osm.OsmPrimitiveType; @@ -22,5 +23,6 @@ 3, 4, - d + d, + new LatLon(0,0) ); @@ -44,5 +46,6 @@ 3, 4, - d + d, + new LatLon(0,0) ); Index: /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (revision 2251) +++ /trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java (revision 2252) @@ -1024,10 +1024,3 @@ assertTrue(!w.getNode(1).incomplete); } - - - @Test - public void test1() throws Exception { - System.out.println(URLEncoder.encode("Ævar Arnfjörð Bjarmason", "UTF-8").replaceAll("\\+", "%20")); - - } }