Changeset 6865 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-02-17T22:59:07+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9659 - better display of changeset source in history dialog

File:

• trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -3 +3 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.BorderLayout;
@@ -15 +14 @@
 import java.util.Observer;
 
+import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -44 +44 @@
     private UrlLabel lblUser;
     private UrlLabel lblChangeset;
-    private JPanel pnlChangesetComment;
     private JPanel pnlChangesetSource;
-    private JLabel lblComment;
     private JLabel lblSource;
     private JTextArea lblChangesetComment;
@@ -93 +91 @@
         lblChangesetSource = buildTextArea(tr("Changeset source"));
 
-        lblComment = buildLabel(trc("comment", "<b>c</b>:"), tr("Changeset comment"), lblChangesetComment);
-        lblSource = buildLabel(trc("source", "<b>s</b>:"), tr("Changeset source"), lblChangesetSource);
-
-        pnlChangesetComment = buildTextPanel(lblComment, lblChangesetComment);
+        lblSource = buildLabel(tr("<b>Source</b>:"), tr("Changeset source"), lblChangesetSource);
         pnlChangesetSource = buildTextPanel(lblSource, lblChangesetSource);
 
@@ -110 +105 @@
         add(pnlUserAndChangeset, gc);
         gc.gridy = 2;
-        add(pnlChangesetComment, gc);
+        add(lblChangesetComment, gc);
         gc.gridy = 3;
         add(pnlChangesetSource, gc);
@@ -223 +218 @@
 
         final Changeset oppCs = model.getPointInTime(pointInTimeType.opposite()).getChangeset();
-        updateText(cs, "comment", lblChangesetComment, lblComment, oppCs, pnlChangesetComment);
+        updateText(cs, "comment", lblChangesetComment, null, oppCs, lblChangesetComment);
         updateText(cs, "source", lblChangesetSource, lblSource, oppCs, pnlChangesetSource);
     }
     
-    protected static void updateText(Changeset cs, String attr, JTextArea textArea, JLabel label, Changeset oppCs, JPanel panel) {
+    protected static void updateText(Changeset cs, String attr, JTextArea textArea, JLabel label, Changeset oppCs, JComponent container) {
         final String text = cs != null ? cs.get(attr) : null;
         // Update text, hide prefixing label if empty
-        label.setVisible(text != null && !Utils.strip(text).isEmpty());
+        if (label != null) {
+            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));
+        // Hide container if values of both versions are empty
+        container.setVisible(text != null || (oppCs != null && oppCs.get(attr) != null));
     }
 }