Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 622) +++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 623) @@ -62,4 +62,8 @@ } + static public String getVersion() { + return version; + } + public AboutAction() { super(tr("About"), "about",tr("Display the about screen."), KeyEvent.VK_F1, KeyEvent.SHIFT_DOWN_MASK, true); Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 622) +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 623) @@ -5,33 +5,33 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import java.awt.GridBagLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import javax.swing.JButton; +import java.awt.BorderLayout; + +import javax.swing.JScrollPane; import javax.swing.JEditorPane; -import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; +import javax.swing.border.EmptyBorder; import org.openstreetmap.josm.Main; -import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; import org.openstreetmap.josm.tools.OpenBrowser; +import org.openstreetmap.josm.tools.WikiReader; +import org.openstreetmap.josm.actions.AboutAction; -public class GettingStarted extends JPanel implements ActionListener { +public class GettingStarted extends JPanel { private JPanel panel; + static private String content = ""; - public class LinkLabel extends JEditorPane implements HyperlinkListener { + public class LinkGeneral extends JEditorPane implements HyperlinkListener { private String action; - public LinkLabel(String text, String action) { - this.action = action; - String normalized = text.replaceAll("\\[([^\\]]*)\\]", "$1"); - String link = "

"+text.replaceAll("\\[([^\\]]*)\\]", "$1")+"

"; + public LinkGeneral(String text) { setContentType("text/html"); - setText(link); - setToolTipText(normalized); + setText(text); setEditable(false); setOpaque(false); @@ -39,87 +39,90 @@ } public void hyperlinkUpdate(HyperlinkEvent e) { - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) - actionPerformed(new ActionEvent(e.getSource(), 0, action)); + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + OpenBrowser.displayUrl(e.getDescription()); + } } } - public GettingStarted() { - super(new GridBagLayout()); - - panel = new JPanel(new GridBagLayout()); - - panel.add(new JLabel(tr("

You are running the latest JOSM version with some geometry extensions.

" + - "

New elements in the status bar will inform you about the orientation and size of the object
" + - "being drawn. There is a new \"extrude\" mode that you can use to create rectangular shapes.

" + - "

There is also a new option in the tools menu that will make existing shapes into proper
" + - "rectangles. Note that all this is dependent on the projection you're using; you must use
"+ - "a projection in which rectangles look rectangular and not skewed. Try it out.

"+ - "

If you dislike the helper line dangling from the mouse cursor, set the \"draw.helper-line\"
"+ - "preference to \"false\"."+ - "

")), GBC.eol()); + 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("

(Message of the day not available)

"); + } - /* - boolean changePrefs = ! ( - "0.5".equals(Main.pref.get("osm-server.version", "0.5")) && - "0.5".equals(Main.pref.get("osm-server.additionalVersions", "0.5")) - ); - - if (changePrefs) { - Main.pref.put("osm-server.version", null); - Main.pref.put("osm-server.additional-versions", null); - panel.add(new JLabel(tr("

Your preferences have been changed by removing osm-server.version and/or osm-server.additional-versions which were still referring to 0.4.

")), GBC.eol()); + 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(""); + + /* 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("

"+category+"

"), GBC.eol().fill(GBC.HORIZONTAL).insets(0,20,0,0)); - } - - public void addLine(String action, String text) { - JButton button = new JButton(ImageProvider.get("getting_started")); - button.setBorder(null); - button.addActionListener(this); - button.setActionCommand(action); - panel.add(button, GBC.std().insets(20,0,5,0)); - panel.add(new LinkLabel(text,action),GBC.eol()); - } - - - public void actionPerformed(ActionEvent e) { - if (e.getActionCommand().equals("download")) - Main.main.menu.download.actionPerformed(e); - else if (e.getActionCommand().equals("help")) - Main.main.menu.help.actionPerformed(e); - else if (e.getActionCommand().equals("audio")) - OpenBrowser.displayUrl("http://josm.openstreetmap.de/wiki/Help/HowTo/AudioMapping"); - else if (e.getActionCommand().equals("tutorial")) - OpenBrowser.displayUrl("http://josm.openstreetmap.de/wiki/TutorialVideos"); - else if (e.getActionCommand().equals("mailinglist")) - OpenBrowser.displayUrl("mailto:newbies-subscribe@openstreetmap.org?subject=subscribe"); - else if (e.getActionCommand().equals("extrudevideo")) - OpenBrowser.displayUrl("http://josm.openstreetmap.de/download/tutorials/josm-extrude-feature.mpeg"); + public GettingStarted() { + super(new BorderLayout()); + assignContent(); + + // panel.add(GBC.glue(0,1), GBC.eol()); + //panel.setMinimumSize(new Dimension(400, 600)); + JScrollPane scroller = new JScrollPane(new LinkGeneral(content)); + scroller.setViewportBorder(new EmptyBorder(100,100,10,100)); + add(scroller, BorderLayout.CENTER); } }