primitivesToDelete-
+ * @param backreferences backreference data structure
* @param layer the layer in whose context primitives are deleted
* @param primitivesToDelete the primitives to delete
@@ -238,18 +294,15 @@
* can be deleted too
*/
- protected static Collection
- /Help if the current locale is a locale with language "en" + *
- /De:Help if the current locale is a locale with language "de" + *
- /Help if the locale is a locale with language "en" + *
- /De:Help if the locale is a locale with language "de" + *
true if nodes should be deleted as well
- * @param simulate Set to true if the user should not be bugged with additional questions
* @return command a command to perform the deletions, or null if there is nothing to delete.
*/
public static Command delete(OsmDataLayer layer, Collection selection,
boolean alsoDeleteNodesInWay) {
- return delete(layer, selection, alsoDeleteNodesInWay, false);
- }
-
+ return delete(layer, selection, alsoDeleteNodesInWay, false /* not silent */);
+ }
+
+ /**
+ * Try to delete all given primitives.
+ *
+ * If a node is used by a way, it's removed from that way. If a node or a way is used by a
+ * relation, inform the user and do not delete.
+ *
+ * If this would cause ways with less than 2 nodes to be created, delete these ways instead. If
+ * they are part of a relation, inform the user and do not delete.
+ *
+ * @param layer the {@see OsmDataLayer} in whose context the primitives are deleted
+ * @param selection the objects to delete.
+ * @param alsoDeleteNodesInWay true if nodes should be deleted as well
+ * @param silent set to true if the user should not be bugged with additional questions
+ * @return command a command to perform the deletions, or null if there is nothing to delete.
+ */
public static Command delete(OsmDataLayer layer, Collection selection,
- boolean alsoDeleteNodesInWay, boolean simulate) {
- if (selection.isEmpty())
+ boolean alsoDeleteNodesInWay, boolean silent) {
+ if (selection == null || selection.isEmpty())
return null;
- CollectionHelp content for help topic missing
" + + "Help content for the help topic {0} is "
+ + "not available yet. It is missing both in your local language ({1}) and in english.
"
+ + "Please help to improve the JOSM help system and fill in the missing information."
+ + "You can both edit the help topic in your local language ({1}) and "
+ + "the help topic in english."
+ + "
Error when retrieving help information
" + + "The content for the help topic {0} could "
+ + "not be loaded. The error message is (untranslated):
"
+ + "{1}"
+ + "
" + + "This is most likely due to a network problem, please check your
" + + "your internet connection", + url.toString() + ), + tr("Failed to open URL"), + JOptionPane.ERROR_MESSAGE, + null, /* no icon */ + null, /* standard options, just OK button */ + null, /* default is standard */ + null /* no help context */ + ); + } + history.setCurrentUrl(url); + } else { + loadAbsoluteHelpTopic(helpTopic); + } + } + + /** + * Loads and displays the help information for a help topic given + * by a relative help topic name, i.e. "/Action/New" + * + * @param relativeHelpTopic the relative help topic + */ + public void openHelpTopic(String relativeHelpTopic) { + if (!isVisible()) { + setVisible(true); + toFront(); + } else { + toFront(); + } + loadRelativeHelpTopic(relativeHelpTopic); } @@ -256,8 +364,15 @@ public void actionPerformed(ActionEvent e) { - if (!getUrl().startsWith(baseurl)) { + if (!getUrl().startsWith(HelpUtil.getWikiBaseHelpUrl())) { + String message = tr( + "The current URL {0}
" + + "is an external URL. Editing is only possible for help topics
" + + "on the help server {1}.", + getUrl(), + HelpUtil.getWikiBaseUrl() + ); JOptionPane.showMessageDialog( Main.parent, - tr("Can only edit help pages from JOSM Online Help"), + message, tr("Warning"), JOptionPane.WARNING_MESSAGE @@ -265,4 +380,6 @@ return; } + String url = getUrl(); + url = url.replaceAll("#[^#]*$", ""); OpenBrowser.displayUrl(url+"?action=edit"); } @@ -277,5 +394,5 @@ public void actionPerformed(ActionEvent e) { - setUrl(url); + openUrl(getUrl()); } } @@ -328,5 +445,95 @@ public void actionPerformed(ActionEvent e) { - setUrlForHelpTopic("Help"); + openHelpTopic("/"); + } + } + + class HyperlinkHandler implements HyperlinkListener { + + /** + * Scrolls the help browser to the element with id
id
+ *
+ * @param id the id
+ * @return true, if an element with this id was found and scrolling was successful; false, otherwise
+ */
+ protected boolean scrollToElementWithId(String id) {
+ Document d = help.getDocument();
+ if (d instanceof HTMLDocument) {
+ HTMLDocument doc = (HTMLDocument) d;
+ Element element = doc.getElement(id);
+ try {
+ Rectangle r = help.modelToView(element.getStartOffset());
+ if (r != null) {
+ Rectangle vis = help.getVisibleRect();
+ r.height = vis.height;
+ help.scrollRectToVisible(r);
+ return true;
+ }
+ } catch(BadLocationException e) {
+ System.err.println(tr("Warning: bad location in HTML document. Exception was: " + e.toString()));
+ e.printStackTrace();
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Checks whether the hyperlink event originated on a element with
+ * a relative href consisting of a URL fragment only, i.e.
+ * . If so, replies the fragment, i.e.
+ * "thisIsALocalFragment".
+ *
+ * Otherwise, replies null
+ *
+ * @param e the hyperlink event
+ * @return the local fragment
+ */
+ protected String getUrlFragment(HyperlinkEvent e) {
+ AttributeSet set = e.getSourceElement().getAttributes();
+ Object value = set.getAttribute(Tag.A);
+ if (value == null || ! (value instanceof SimpleAttributeSet)) return null;
+ SimpleAttributeSet atts = (SimpleAttributeSet)value;
+ value = atts.getAttribute(javax.swing.text.html.HTML.Attribute.HREF);
+ if (value == null) return null;
+ String s = (String)value;
+ if (s.matches("#.*"))
+ return s.substring(1);
+ return null;
+ }
+
+ public void hyperlinkUpdate(HyperlinkEvent e) {
+ if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED)
+ return;
+ if (e.getURL() == null) {
+ // Probably hyperlink event on a an A-element with a href consisting of
+ // a fragment only, i.e. "#ALocalFragment".
+ //
+ String fragment = getUrlFragment(e);
+ if (fragment != null) {
+ // first try to scroll to an element with id==fragment. This is the way
+ // table of contents are built in the JOSM wiki. If this fails, try to
+ // scroll to a element.
+ //
+ if (!scrollToElementWithId(fragment)) {
+ help.scrollToReference(fragment);
+ }
+ } else {
+ HelpAwareOptionPane.showOptionDialog(
+ Main.parent,
+ tr("Failed to open help page. The target URL is empty."),
+ tr("Failed to open help page"),
+ JOptionPane.ERROR_MESSAGE,
+ null, /* no icon */
+ null, /* standard options, just OK button */
+ null, /* default is standard */
+ null /* no help context */
+ );
+ }
+ } else if (e.getURL().toString().endsWith("action=edit")) {
+ OpenBrowser.displayUrl(e.getURL().toString());
+ } else {
+ url = e.getURL().toString();
+ openUrl(e.getURL().toString());
+ }
}
}
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java (revision 2308)
@@ -5,4 +5,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.swing.SwingUtilities;
@@ -16,4 +18,5 @@
*/
public class HelpBrowserCommandProcessor implements Runnable {
+ private static final Logger logger = Logger.getLogger(HelpBrowserCommandProcessor.class.getName());
/** the controlled help browser*/
@@ -31,10 +34,10 @@
* Show the help page for help topic helpTopic.
*
- * @param helpTopics the help topic
+ * @param helpTopic the help topic
*/
- protected void setUrlForHelpTopics(final String helpTopics) {
+ protected void setUrlForHelpTopic(final String helpTopic) {
Runnable r = new Runnable() {
public void run() {
- browser.setUrlForHelpTopic(helpTopics);
+ browser.openHelpTopic(helpTopic);
browser.setVisible(true);
browser.toFront();
@@ -65,7 +68,10 @@
while(true) {
String cmd = null;
+
try {
cmd = reader.readLine();
+ logger.info("got command: " + cmd);
} catch(IOException e) {
+ logger.log(Level.SEVERE,e.toString());
System.out.println(tr("Failed to read command. Exiting help browser. Exception was:" + e.toString()));
System.exit(1);
@@ -73,7 +79,7 @@
if (cmd.startsWith("exit")) {
exit();
- } else if (cmd.startsWith("setUrlForHelpTopics ")) {
- String helpTopics = cmd.substring("setUrlForHelpTopics ".length());
- setUrlForHelpTopics(helpTopics);
+ } else if (cmd.startsWith("setUrlForHelpTopic ")) {
+ String helpTopic = cmd.substring("setUrlForHelpTopic ".length());
+ setUrlForHelpTopic(helpTopic);
}
}
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (revision 2308)
@@ -35,5 +35,5 @@
if (historyPos < 0) return;
String url = history.get(historyPos);
- browser.loadUrl(url);
+ browser.openUrl(url);
setChanged();
notifyObservers();
@@ -44,5 +44,5 @@
if (historyPos >= history.size()) return;
String url = history.get(historyPos);
- browser.loadUrl(url);
+ browser.openUrl(url);
setChanged();
notifyObservers();
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java (revision 2308)
@@ -77,9 +77,9 @@
/**
* Direct the help browser to the help page for help topic
- * helpTopic
+ * relativeHelpTopic
*
- * @param helpTopic the help topic
+ * @param relativeHelpTopic the help topic
*/
- public void setUrlForHelpTopic(String helpTopic) {
+ public void setUrlForHelpTopic(String relativeHelpTopic) {
if (helpBrowserProcess == null) {
launch();
@@ -95,5 +95,5 @@
return;
}
- pw.println("setUrlForHelpTopics " + helpTopic);
+ pw.println("setUrlForHelpTopic " + relativeHelpTopic);
pw.flush();
}
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java (revision 2308)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java (revision 2308)
@@ -0,0 +1,138 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.help;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.openstreetmap.josm.tools.WikiReader;
+
+/**
+ * Reads help content from the JOSM Wiki and prepares it for rendering in the internal
+ * help browser.
+ *
+ * The help content has to be filtered because only the main content <div>
+ * of a Wiki help page is displayed in the internal help browser.
+ *
+ * It also has to be transformed because the internal help browser required slightly
+ * different HTML than what is provided by the Wiki.
+ *
+ * @see WikiReader
+ */
+public class HelpContentReader {
+
+ /** the base url */
+ private String baseUrl;
+
+ /**
+ * constructor
+ *
+ * @param baseUrl the base url of the JOSM help wiki, i.e. http://josm.openstreetmap.org
+ */
+ public HelpContentReader(String baseUrl) {
+ this.baseUrl = baseUrl;
+ }
+
+ /**
+ * Fetches the content of a help topic from the JOSM wiki.
+ *
+ * @param helpTopicUrl the absolute help topic URL
+ * @return the content, filtered and transformed for being displayed in the internal help browser
+ * @throws HelpContentReaderException thrown if problem occurs
+ * @throws MissingHelpContentException thrown if this helpTopicUrl doesn't point to an existing Wiki help page
+ */
+ public String fetchHelpTopicContent(String helpTopicUrl) throws HelpContentReaderException {
+ URL url = null;
+ HttpURLConnection con = null;
+ BufferedReader in = null;
+ try {
+ url = new URL(helpTopicUrl);
+ con = (HttpURLConnection)url.openConnection();
+ con.connect();
+ in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ return prepareHelpContent(in);
+ } catch(MalformedURLException e) {
+ throw new HelpContentReaderException(e);
+ } catch(IOException e) {
+ HelpContentReaderException ex = new HelpContentReaderException(e);
+ if (con != null) {
+ try {
+ ex.setResponseCode(con.getResponseCode());
+ } catch(IOException e1) {
+ // ignore
+ }
+ }
+ throw ex;
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch(IOException e) {
+ // ignore
+ }
+ }
+ }
+ }
+
+ /**
+ * Reads help content from the input stream and prepares it to be rendered later
+ * in the internal help browser.
+ *
+ * Throws a {@see MissingHelpContentException} if the content read from the stream
+ * most likely represents a stub help page.
+ *
+ * @param in the input stream
+ * @return the content
+ * @throws HelpContentReaderException thrown if an exception occurs
+ * @throws MissingHelpContentException thrown, if the content read isn't a help page
+ */
+ protected String prepareHelpContent(BufferedReader in) throws HelpContentReaderException {
+ boolean isInContent = false;
+ boolean isInTranslationsSideBar = false;
+ boolean isExistingHelpPage = false;
+ StringBuffer sb = new StringBuffer();
+ try {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ if (line.contains("")) {
+ isInContent = true;
+ } else if (line.contains("
")) {
+ isInContent = true;
+ } else if (line.contains("
")) {
+ isInContent = false;
+ } else if (line.contains("![](\"/",)
", ">");
+ sb.append(line);
+ sb.append("\n");
+ } else if (isInTranslationsSideBar && line.contains("
")) {
+ isInTranslationsSideBar = false;
+ }
+ }
+ } catch(IOException e) {
+ throw new HelpContentReaderException(e);
+ }
+ sb.insert(0, "");
+ sb.append("");
+ if (! isExistingHelpPage)
+ throw new MissingHelpContentException();
+ return sb.toString();
+ }
+}
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java (revision 2308)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java (revision 2308)
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.help;
+
+public class HelpContentReaderException extends Exception {
+ private int responseCode;
+
+ public HelpContentReaderException() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public HelpContentReaderException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public HelpContentReaderException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public HelpContentReaderException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * Replies the HTTP response code related to the wiki access exception.
+ * If no HTTP response code is available, 0 is replied.
+ *
+ * @return the http response code
+ */
+ public int getResponseCode() {
+ return responseCode;
+ }
+
+ /**
+ * Sets the HTTP response code
+ *
+ * @param responseCode the response code
+ */
+ public void setResponseCode(int responseCode) {
+ this.responseCode = responseCode;
+ }
+
+
+}
Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 2308)
@@ -2,24 +2,244 @@
package org.openstreetmap.josm.gui.help;
+import java.awt.Component;
import java.awt.event.KeyEvent;
-
+import java.util.Locale;
+
+import javax.swing.AbstractButton;
+import javax.swing.Action;
import javax.swing.JComponent;
+import javax.swing.JMenu;
import javax.swing.KeyStroke;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.LanguageInfo;
public class HelpUtil {
/**
+ * Replies the base wiki URL.
+ *
+ * @return the base wiki URL
+ */
+ static public String getWikiBaseUrl() {
+ return Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
+ }
+
+ /**
+ * Replies the base wiki URL for help pages
+ *
+ * @return the base wiki URL for help pages
+ */
+ static public String getWikiBaseHelpUrl() {
+ return getWikiBaseUrl() + "/wiki";
+ }
+
+ /**
+ * Replies the URL on the wiki for an absolute help topic. The URL is encoded in UTF-8.
+ *
+ * @param absoluteHelpTopic the absolute help topic
+ * @return the url
+ * @see #buildAbsoluteHelpTopic(String)
+ * @see #buildAbsoluteHelpTopic(String, Locale)
+ */
+ static public String getHelpTopicUrl(String absoluteHelpTopic) {
+ String ret = getWikiBaseHelpUrl();
+ ret = ret.replaceAll("\\/+$", "");
+ absoluteHelpTopic =absoluteHelpTopic.replace(" ", "%20");
+ absoluteHelpTopic = absoluteHelpTopic.replaceAll("^\\/+", "/");
+ return ret + absoluteHelpTopic;
+ }
+
+ /**
+ * Replies the URL to the edit page for the absolute help topic.
+ *
+ * @param absoluteHelpTopic the absolute help topic
+ * @return the URL to the edit page
+ */
+ static public String getHelpTopicEditUrl(String absoluteHelpTopic) {
+ String topicUrl = getHelpTopicUrl(absoluteHelpTopic);
+ topicUrl = topicUrl.replaceAll("#[^#]*$", ""); // remove optional fragment
+ return topicUrl + "?action=edit";
+ }
+
+ /**
+ * Extracts the relative help topic from an URL. Replies null, if
+ * no relative help topic is found.
+ *
+ * @param url the url
+ * @return the relative help topic in the URL, i.e. "/Action/New"
+ */
+ static public String extractRelativeHelpTopic(String url) {
+ String topic = extractAbsoluteHelpTopic(url);
+ if (topic == null) return null;
+ String pattern = "/[A-Z][a-z]:" + getHelpTopicPrefix(Locale.ENGLISH).replaceAll("^\\/+", "");
+ if (url.matches(pattern))
+ return topic.substring(pattern.length());
+ return null;
+ }
+
+ /**
+ * Extracts the absolute help topic from an URL. Replies null, if
+ * no absolute help topic is found.
+ *
+ * @param url the url
+ * @return the absolute help topic in the URL, i.e. "/De:Help/Action/New"
+ */
+ static public String extractAbsoluteHelpTopic(String url) {
+ if (!url.startsWith(getWikiBaseHelpUrl())) return null;
+ url = url.substring(getWikiBaseHelpUrl().length());
+ String prefix = getHelpTopicPrefix(Locale.ENGLISH);
+ if (url.startsWith(prefix))
+ return url;
+
+ String pattern = "/[A-Z][a-z]:" + prefix.replaceAll("^\\/+", "");
+ if (url.matches(pattern))
+ return url;
+
+ return null;
+ }
+
+ /**
+ * Replies the help topic prefix for the current locale. Examples:
+ * Attachments
")) { + isInContent = false; + } else if (line.contains(" element + // + // Also make sure image URLs are absolute + // + line = line.replaceAll("-
+ *
-
+ *
context.
+ *
+ * @return the help topic. null, if no context specific help topic is found
+ */
+ static public String getContextSpecificHelpTopic(Object context) {
+ if (context == null)
+ return null;
+ if (context instanceof Helpful)
+ return ((Helpful)context).helpTopic();
+ if (context instanceof JMenu) {
+ JMenu b = (JMenu)context;
+ if (b.getClientProperty("help") != null)
+ return (String)b.getClientProperty("help");
+ return null;
+ }
+ if (context instanceof AbstractButton) {
+ AbstractButton b = (AbstractButton)context;
+ if (b.getClientProperty("help") != null)
+ return (String)b.getClientProperty("help");
+ return getContextSpecificHelpTopic(b.getAction());
+ }
+ if (context instanceof Action)
+ return (String)((Action)context).getValue("help");
+ if (context instanceof JComponent && ((JComponent)context).getClientProperty("help") != null)
+ return (String)((JComponent)context).getClientProperty("help");
+ if (context instanceof Component)
+ return getContextSpecificHelpTopic(((Component)context).getParent());
+ return null;
+ }
+
+ /**
* 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) {
+ * A relative help topic doesn't start with /Help and doesn't include a locale
+ * code. Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor
+ * is not.
+ *
+ *
+ * @param component the component the component
+ * @param topic the help topic. Set to the default help topic if null.
+ */
+ static public void setHelpContext(JComponent component, String relativeHelpTopic) {
+ if (relativeHelpTopic == null) {
+ relativeHelpTopic = "";
+ }
component.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F1,0), "help");
component.getActionMap().put("help", Main.main.menu.help);
- component.putClientProperty("help", topic);
- }
-
+ component.putClientProperty("help", relativeHelpTopic);
+ }
+
+ /**
+ * This is a simple marker method for help topic literals. If you declare a help
+ * topic literal in the source you should enclose it in ht(...).
+ *
+ * Example
+ *
+ * String helpTopic = ht("/Dialog/RelationEditor");
+ * or
+ * putValue("help", ht("/Dialog/RelationEditor"));
+ *
+ *
+ *
+ * @param helpTopic
+ */
+ static public String ht(String helpTopic) {
+ // this is just a marker method
+ return helpTopic;
+ }
}
Index: /trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java (revision 2308)
+++ /trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java (revision 2308)
@@ -0,0 +1,25 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.help;
+
+public class MissingHelpContentException extends HelpContentReaderException {
+
+ public MissingHelpContentException() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ public MissingHelpContentException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public MissingHelpContentException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public MissingHelpContentException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+}
Index: /trunk/src/org/openstreetmap/josm/gui/help/help-browser.css
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/help/help-browser.css (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/help/help-browser.css (revision 2308)
@@ -19,2 +19,27 @@
tt {font-family: Courier New}
pre {font-family: Courier New}
+.warning-header {
+ font-family: Arial, sans-serif;
+ font-size:24pt;
+ font-weight:bold
+}
+.warning-body {
+ background-color:rgb(253,255,221);
+ padding: 10pt;
+ border-color:rgb(128,128,128);
+ border-style: solid;
+ border-width: 1px;
+}
+
+.error-header {
+ font-family: Arial, sans-serif;
+ font-size:24pt;
+ font-weight:bold
+}
+.error-body {
+ background-color:rgb(254,195,190);
+ padding: 10pt;
+ border-color:rgb(128,128,128);
+ border-style: solid;
+ border-width: 1px;
+}
Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java (revision 2308)
@@ -192,7 +192,6 @@
JComponent.WHEN_IN_FOCUSED_WINDOW
);
-
- pnl.add(new SideButton(new ContextSensitiveHelpAction("/Help/Dialogs/UploadDialog")));
- HelpUtil.setHelpContext(getRootPane(),"/Help/Dialogs/UploadDialog");
+ pnl.add(new SideButton(new ContextSensitiveHelpAction("/Dialogs/UploadDialog")));
+ HelpUtil.setHelpContext(getRootPane(),"/Dialogs/UploadDialog");
return pnl;
}
Index: /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (revision 2308)
@@ -376,5 +376,5 @@
public void actionPerformed(ActionEvent e) {
HelpBrowser b = new HelpBrowser();
- b.setUrlForHelpTopic("Help/Concepts/Conflict");
+ b.openHelpTopic("Help/Concepts/Conflict");
b.setVisible(true);
}
@@ -383,5 +383,5 @@
dialog.setContentPane(pane);
dialog.pack();
- HelpUtil.setHelpContext(dialog.getRootPane(), "Concepts/Conflict");
+ HelpUtil.setHelpContext(dialog.getRootPane(), "/Concepts/Conflict");
WindowGeometry.centerOnScreen(dialog.getSize()).applySafe(dialog);
dialog.setVisible(true);
Index: /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java (revision 2308)
@@ -3,18 +3,63 @@
import java.util.Locale;
+import static org.openstreetmap.josm.tools.I18n.tr;
public class LanguageInfo {
- static public String getLanguageCodeWiki()
- {
- String languageCode = getLanguageCode();
- if(languageCode.equals("en"))
+
+ /**
+ * Replies the wiki language prefix for the given locale. The wiki language
+ * prefix has the form 'Xy:' where 'Xy' is a ISO 639 language code in title
+ * case.
+ *
+ * @param locale the locale
+ * @return the wiki language prefix
+ */
+ static public String getWikiLanguagePrefix(Locale locale) {
+ String code = getJOSMLocaleCode(locale);
+ if (code.length() == 2) {
+ if (code.equals("en")) return "";
+ } else if (code.matches("[^_]+_[^_]+")) {
+ code = code.substring(0,2);
+ } else {
+ System.err.println(tr("Warning: failed to derive wiki language prefix from JOSM locale code ''{0}''. Using default code ''en''.", code));
return "";
- else if(languageCode.equals("pt_BR"))
- return "Pt:";
- return languageCode.substring(0,1).toUpperCase() + languageCode.substring(1) + ":";
+ }
+ return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
}
- static public String getLanguageCode()
- {
- String full = Locale.getDefault().toString();
+
+ /**
+ * Replies the wiki language prefix for the current locale.
+ *
+ * @return the wiki language prefix
+ * @see Locale#getDefault()
+ * @see #getWikiLanguagePrefix(Locale)
+ */
+ static public String getWikiLanguagePrefix() {
+ return getWikiLanguagePrefix(Locale.getDefault());
+ }
+
+ /**
+ * Replies the JOSM locale code for the default locale.
+ *
+ * @return the JOSM locale code for the default locale
+ * @see #getJOSMLocaleCode(Locale)
+ */
+ static public String getJOSMLocaleCode() {
+ return getJOSMLocaleCode(Locale.getDefault());
+ }
+
+ /**
+ * Replies the local code used by JOSM for a given locale.
+ *
+ * In most cases JOSM uses the 2-character ISO 639 language code ({@see Locale#getLanguage()}
+ * to identify the locale of a localized resource, but in some cases it may use the
+ * programmatic name for locales, as replied by {@see Locale#toString()}.
+ *
+ * @param locale the locale. Replies "en" if null.
+ * @return the JOSM code for the given locale
+ */
+ static public String getJOSMLocaleCode(Locale locale) {
+ if (locale == null) return "en";
+ String full = locale.toString();
if (full.equals("iw_IL"))
return "he";
@@ -22,13 +67,16 @@
else if (full.equals("en_GB"))
return full;
- return Locale.getDefault().getLanguage();
+
+ return locale.getLanguage();
}
+
+
static public String getLanguageCodeXML()
{
- return getLanguageCode()+".";
+ return getJOSMLocaleCode()+".";
}
static public String getLanguageCodeManifest()
{
- return getLanguageCode()+"_";
+ return getJOSMLocaleCode()+"_";
}
}
Index: /trunk/src/org/openstreetmap/josm/tools/WikiReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 2307)
+++ /trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 2308)
@@ -35,5 +35,5 @@
* pathes etc..
*
- * @return Either the string of the content of the wiki page.
+ * @return
* @throws IOException Throws, if the page could not be loaded.
*/
@@ -46,5 +46,5 @@
public String readLang(String text) {
- String languageCode = LanguageInfo.getLanguageCodeWiki();
+ String languageCode = LanguageInfo.getWikiLanguagePrefix();
String url = baseurl + "/wiki/" + languageCode + text;
String res = "";