Changeset 8426 in josm for trunk/src/org/openstreetmap/josm/gui/history

Timestamp:

2015-05-26T01:37:50+02:00 (9 years ago)

Author:

Don-vip

Message:

Accessibility - global use of JLabel.setLabelFor() + various fixes (javadoc, code style)

File:

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

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

@@ -56 +56 @@
     private JLabel lblSource;
     private JLabel lblImageryUsed;
-    private JTextArea lblChangesetComment;
-    private JTextArea lblChangesetSource;
-    private JTextArea lblChangesetImageryUsed;
+    private JTextArea texChangesetComment;
+    private JTextArea texChangesetSource;
+    private JTextArea texChangesetImageryUsed;
 
     protected static JTextArea buildTextArea(String tooltip) {
@@ -76 +76 @@
         lbl.setFont(textArea.getFont());
         lbl.setToolTipText(tooltip);
+        lbl.setLabelFor(textArea);
         return lbl;
     }
@@ -100 +101 @@
         pnlUserAndChangeset.add(lblChangeset);
 
-        lblChangesetComment = buildTextArea(tr("Changeset comment"));
-        lblChangesetSource = buildTextArea(tr("Changeset source"));
-        lblChangesetImageryUsed = buildTextArea(tr("Imagery used"));
-
-        lblSource = buildLabel(tr("<b>Source</b>:"), tr("Changeset source"), lblChangesetSource);
-        lblImageryUsed = buildLabel(tr("<b>Imagery</b>:"), tr("Imagery used"), lblChangesetImageryUsed);
-        pnlChangesetSource = buildTextPanel(lblSource, lblChangesetSource);
-        pnlChangesetImageryUsed = buildTextPanel(lblImageryUsed, lblChangesetImageryUsed);
+        texChangesetComment = buildTextArea(tr("Changeset comment"));
+        texChangesetSource = buildTextArea(tr("Changeset source"));
+        texChangesetImageryUsed = buildTextArea(tr("Imagery used"));
+
+        lblSource = buildLabel(tr("<b>Source</b>:"), tr("Changeset source"), texChangesetSource);
+        lblImageryUsed = buildLabel(tr("<b>Imagery</b>:"), tr("Imagery used"), texChangesetImageryUsed);
+        pnlChangesetSource = buildTextPanel(lblSource, texChangesetSource);
+        pnlChangesetImageryUsed = buildTextPanel(lblImageryUsed, texChangesetImageryUsed);
 
         setLayout(new GridBagLayout());
@@ -120 +121 @@
         add(pnlUserAndChangeset, gc);
         gc.gridy = 2;
-        add(lblChangesetComment, gc);
+        add(texChangesetComment, gc);
         gc.gridy = 3;
         add(pnlChangesetSource, gc);
@@ -228 +229 @@
 
         final Changeset oppCs = model.getPointInTime(pointInTimeType.opposite()).getChangeset();
-        updateText(cs, "comment", lblChangesetComment, null, oppCs, lblChangesetComment);
-        updateText(cs, "source", lblChangesetSource, lblSource, oppCs, pnlChangesetSource);
-        updateText(cs, "imagery_used", lblChangesetImageryUsed, lblImageryUsed, oppCs, pnlChangesetImageryUsed);
+        updateText(cs, "comment", texChangesetComment, null, oppCs, texChangesetComment);
+        updateText(cs, "source", texChangesetSource, lblSource, oppCs, pnlChangesetSource);
+        updateText(cs, "imagery_used", texChangesetImageryUsed, lblImageryUsed, oppCs, pnlChangesetImageryUsed);
     }