Index: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6835) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (revision 6836) @@ -29,4 +29,6 @@ import org.openstreetmap.josm.gui.widgets.UrlLabel; import org.openstreetmap.josm.tools.CheckParameterUtil; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Utils; /** @@ -41,4 +43,8 @@ private UrlLabel lblUser; private UrlLabel lblChangeset; + private JPanel pnlChangesetComment; + private JPanel pnlChangesetSource; + private JLabel lblComment; + private JLabel lblSource; private JTextArea lblChangesetComment; private JTextArea lblChangesetSource; @@ -54,12 +60,26 @@ } + protected static JLabel buildLabel(String text, String tooltip, JTextArea textArea) { + // We need text field to be a JTextArea for line wrapping but cannot put HTML code in here, + // so create a separate JLabel with same characteristics (margin, font) + JLabel lbl = new JLabel("

"+text+""); + lbl.setFont(textArea.getFont()); + lbl.setToolTipText(tooltip); + return lbl; + } + + protected static JPanel buildTextPanel(JLabel label, JTextArea textArea) { + JPanel pnl = new JPanel(new GridBagLayout()); + pnl.add(label, GBC.std().anchor(GBC.NORTHWEST)); + pnl.add(textArea, GBC.eol().fill()); + return pnl; + } + protected void build() { - JPanel pnl1 = new JPanel(); - pnl1.setLayout(new BorderLayout()); + JPanel pnl1 = new JPanel(new BorderLayout()); lblInfo = new JMultilineLabel(""); pnl1.add(lblInfo, BorderLayout.CENTER); - JPanel pnlUserAndChangeset = new JPanel(); - pnlUserAndChangeset.setLayout(new GridLayout(2,2)); + JPanel pnlUserAndChangeset = new JPanel(new GridLayout(2,2)); lblUser = new UrlLabel("", 2); pnlUserAndChangeset.add(new JLabel(tr("User:"))); @@ -71,4 +91,10 @@ lblChangesetComment = buildTextArea(tr("Changeset comment")); lblChangesetSource = buildTextArea(tr("Changeset source")); + + lblComment = buildLabel(/*I18n: comment*/tr("c:"), tr("comment"), lblChangesetComment); + lblSource = buildLabel(/*I18n: source*/tr("s:"), tr("source"), lblChangesetSource); + + pnlChangesetComment = buildTextPanel(lblComment, lblChangesetComment); + pnlChangesetSource = buildTextPanel(lblSource, lblChangesetSource); setLayout(new GridBagLayout()); @@ -83,7 +109,7 @@ add(pnlUserAndChangeset, gc); gc.gridy = 2; - add(lblChangesetComment, gc); + add(pnlChangesetComment, gc); gc.gridy = 3; - add(lblChangesetSource, gc); + add(pnlChangesetSource, gc); } @@ -195,13 +221,16 @@ } - final String comment = cs != null ? cs.get("comment") : null; - final String source = cs != null ? cs.get("source") : null; - lblChangesetComment.setText(comment); - lblChangesetSource.setText(source); - - // Hide comment / source if both values are empty final Changeset oppCs = model.getPointInTime(pointInTimeType.opposite()).getChangeset(); - lblChangesetComment.setVisible(comment != null || (oppCs != null && oppCs.get("comment") != null)); - lblChangesetSource.setVisible(source != null || (oppCs != null && oppCs.get("source") != null)); + updateText(cs, "comment", lblChangesetComment, lblComment, oppCs, pnlChangesetComment); + updateText(cs, "source", lblChangesetSource, lblSource, oppCs, pnlChangesetSource); + } + + protected static void updateText(Changeset cs, String attr, JTextArea textArea, JLabel label, Changeset oppCs, JPanel panel) { + final String text = cs != null ? cs.get(attr) : null; + // Update text, hide prefixing label if empty + label.setVisible(text != null && !Utils.strip(text).isEmpty()); + textArea.setText(text); + // Hide panel if values of both versions are empty + panel.setVisible(text != null || (oppCs != null && oppCs.get(attr) != null)); } }