Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 651) +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 652) @@ -26,103 +26,114 @@ public class GettingStarted extends JPanel { - private JPanel panel; - static private String content = ""; + private JPanel panel; + static private String content = ""; - public class LinkGeneral extends JEditorPane implements HyperlinkListener { - private String action; - public LinkGeneral(String text) { - setContentType("text/html"); - setText(text); - setEditable(false); - setOpaque(false); - addHyperlinkListener(this); + public class LinkGeneral extends JEditorPane implements HyperlinkListener { + private String action; + public LinkGeneral(String text) { + setContentType("text/html"); + setText(text); + setEditable(false); + setOpaque(false); + addHyperlinkListener(this); } - public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { - OpenBrowser.displayUrl(e.getDescription()); - } + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + OpenBrowser.displayUrl(e.getDescription()); + } } } - private void assignContent() { - if (content.length() == 0) { - String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); - WikiReader wr = new WikiReader(baseurl); - String motdcontent = ""; - try { - motdcontent = wr.read(baseurl + "/wiki/MessageOfTheDay"); - } catch (IOException ioe) { - motdcontent = tr("\n

JOSM, the Java OpenStreetMap editor

\n

(Message of the day not available)

"); - } + private void assignContent() { + if (content.length() == 0) { + String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); + WikiReader wr = new WikiReader(baseurl); + String motdcontent = ""; + try { + motdcontent = wr.read(baseurl + "/wiki/MessageOfTheDay"); + } catch (IOException ioe) { + motdcontent = tr("\n

JOSM, the Java OpenStreetMap editor

\n

(Message of the day not available)

"); + } - int myVersion; - try { - myVersion = Integer.parseInt(AboutAction.getVersion()); - } catch (NumberFormatException e) { - myVersion = 0; - } + int myVersion; + try { + myVersion = Integer.parseInt(AboutAction.getVersion()); + } catch (NumberFormatException e) { + myVersion = 0; + } - Pattern commentPattern = Pattern.compile("\\\\s*\\/\\*[^\\*]*\\*\\/\\s*\\<\\/p\\>", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE); - Matcher matcherComment = commentPattern.matcher(motdcontent); - motdcontent = matcherComment.replaceAll(""); + Pattern commentPattern = Pattern.compile("\\\\s*\\/\\*[^\\*]*\\*\\/\\s*\\<\\/p\\>", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE); + Matcher matcherComment = commentPattern.matcher(motdcontent); + motdcontent = matcherComment.replaceAll(""); - /* look for hrefs of the form wiki/MessageOfTheDay>123 where > can also be <,<=,>= and the number is the revision number */ - int start = 0; - boolean nothingIncluded = true; - Pattern versionPattern = Pattern.compile("\\]*href\\=\\\"([^\\\"]*\\/wiki\\/MessageOfTheDay(\\%3E%3D|%3C%3D|\\%3E|\\%3C)([0-9]+))\\\"[^\\>]*\\>[^\\<]*\\<\\/a\\>", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE); - Matcher matcher = versionPattern.matcher(motdcontent); - matcher.reset(); - while (matcher.find()) { - int targetVersion = Integer.parseInt(matcher.group(3)); - String condition = matcher.group(2); - boolean included = false; - if (condition.equals("%3E")) { - if ((myVersion == 0 || myVersion > targetVersion) && ! Main.pref.getBoolean("motd.gt."+targetVersion)) { - Main.pref.put("motd.gt."+targetVersion, true); - included = true; - } - } else if (condition.equals("%3E%3D")) { - if ((myVersion == 0 || myVersion >= targetVersion) && ! Main.pref.getBoolean("motd.ge."+targetVersion)) { - Main.pref.put("motd.ge."+targetVersion, true); - included = true; - } - } else if (condition.equals("%3C")) { - included = myVersion < targetVersion; - } else { - included = myVersion <= targetVersion; - } - if (matcher.start() > start) { - content += motdcontent.substring(start, matcher.start() - 1); - } - start = matcher.end(); - if (included) { - try { - content += wr.read(matcher.group(1)).replace("", "").replace("", "").replace("
", "").replace("
", ""); - nothingIncluded = false; - } catch (IOException ioe) { - // do nothing - } - } - } - if (nothingIncluded) { - content += "
Watch this space for announcements
"; - content += "
(remove the \"motd\" entries in Advanced Preferences to see any available announcements next time)
"; - } - content += motdcontent.substring(start); - content = content.replace("", ""); - content = content.replace("123 where > can also be <,<=,>= and the number is the revision number */ + int start = 0; + boolean nothingIncluded = true; + Pattern versionPattern = Pattern.compile("\\]*href\\=\\\"([^\\\"]*\\/wiki\\/)(MessageOfTheDay(\\%3E%3D|%3C%3D|\\%3E|\\%3C)([0-9]+))\\\"[^\\>]*\\>[^\\<]*\\<\\/a\\>", Pattern.CASE_INSENSITIVE|Pattern.DOTALL|Pattern.MULTILINE); + Matcher matcher = versionPattern.matcher(motdcontent); + matcher.reset(); + while (matcher.find()) { + int targetVersion = Integer.parseInt(matcher.group(4)); + String condition = matcher.group(3); + boolean included = false; + if (condition.equals("%3E")) { + if ((myVersion == 0 || myVersion > targetVersion) + /* && ! Main.pref.getBoolean("motd.gt."+targetVersion) */) { + /* Main.pref.put("motd.gt."+targetVersion, true); */ + included = true; + } + } else if (condition.equals("%3E%3D")) { + if ((myVersion == 0 || myVersion >= targetVersion) + /* && ! Main.pref.getBoolean("motd.ge."+targetVersion) */) { + /* Main.pref.put("motd.ge."+targetVersion, true); */ + included = true; + } + } else if (condition.equals("%3C")) { + included = myVersion < targetVersion; + } else { + included = myVersion <= targetVersion; + } + if (matcher.start() > start) { + content += motdcontent.substring(start, matcher.start() - 1); + } + start = matcher.end(); + if (included) { + // translators: set this to a suitable language code to + // be able to provide translations in the Wiki. + String languageCode = tr("En:"); + String url = matcher.group(1) + languageCode + matcher.group(2); + try { + content += wr.read(url).replace("", "").replace("", "").replace("
", "").replace("
", ""); + nothingIncluded = false; + } catch (IOException ioe) { + url = matcher.group(1) + matcher.group(2); + try { + content += wr.read(url).replace("", "").replace("", "").replace("
", "").replace("
", ""); + nothingIncluded = false; + } catch (IOException ioe2) { + } + } + } + } + if (nothingIncluded) { + content += "
Watch this space for announcements
"; + content += "
(remove the \"motd\" entries in Advanced Preferences to see any available announcements next time)
"; + } + content += motdcontent.substring(start); + content = content.replace("", ""); + content = content.replace("