Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 9996)
@@ -137,4 +137,5 @@
     public SelectionListDialog selectionListDialog;
     public PropertiesDialog propertiesDialog;
+    public MapPaintDialog mapPaintDialog;
     public NotesDialog noteDialog;
 
@@ -246,5 +247,5 @@
         addToggleDialog(filterDialog = new FilterDialog());
         addToggleDialog(new ChangesetDialog(), true);
-        addToggleDialog(new MapPaintDialog());
+        addToggleDialog(mapPaintDialog = new MapPaintDialog());
         addToggleDialog(noteDialog = new NotesDialog());
         toolBarToggle.setFloatable(false);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 9996)
@@ -84,4 +84,5 @@
         JLabel lblMyVersion = new JLabel(tr("My version"));
         lblMyVersion.setToolTipText(tr("Properties in my dataset, i.e. the local dataset"));
+        lblMyVersion.setLabelFor(mineVersionInfo);
         add(lblMyVersion, gc);
 
@@ -95,4 +96,5 @@
         JLabel lblTheirVersion = new JLabel(tr("Their version"));
         lblTheirVersion.setToolTipText(tr("Properties in their dataset, i.e. the server dataset"));
+        lblMyVersion.setLabelFor(theirVersionInfo);
         add(lblTheirVersion, gc);
 
@@ -106,5 +108,4 @@
         gc.gridx = 5;
         add(theirVersionInfo, gc);
-
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 9996)
@@ -572,6 +572,6 @@
             final JTabbedPane tabs = new JTabbedPane();
 
-            tabs.add("Info", buildInfoPanel(s));
             JLabel lblInfo = new JLabel(tr("Info"));
+            lblInfo.setLabelFor(tabs.add("Info", buildInfoPanel(s)));
             lblInfo.setFont(lblInfo.getFont().deriveFont(Font.PLAIN));
             tabs.setTabComponentAt(0, lblInfo);
@@ -583,6 +583,6 @@
 
             final JPanel pSource = new JPanel(new GridBagLayout());
-            tabs.addTab("Source", pSource);
             JLabel lblSource = new JLabel(tr("Source"));
+            lblSource.setLabelFor(tabs.add("Source", pSource));
             lblSource.setFont(lblSource.getFont().deriveFont(Font.PLAIN));
             tabs.setTabComponentAt(3, lblSource);
@@ -615,4 +615,5 @@
             if (items.isEmpty()) {
                 JLabel lblErrors = new JLabel(tr(title));
+                lblErrors.setLabelFor(pErrors);
                 lblErrors.setFont(lblInfo.getFont().deriveFont(Font.PLAIN));
                 lblErrors.setEnabled(false);
@@ -621,4 +622,5 @@
             } else {
                 JLabel lblErrors = new JLabel(tr(title), icon, JLabel.HORIZONTAL);
+                lblErrors.setLabelFor(pErrors);
                 tabs.setTabComponentAt(pos, lblErrors);
             }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java	(revision 9996)
@@ -17,7 +17,7 @@
 class UploadAndSaveProgressRenderer extends JPanel implements ProgressRenderer, PropertyChangeListener {
 
-    private JLabel lblTaskTitle;
-    private JLabel lblCustomText;
-    private JProgressBar progressBar;
+    private final JLabel lblTaskTitle = new JLabel("");
+    private final JLabel lblCustomText = new JLabel("");
+    private final JProgressBar progressBar = new JProgressBar(JProgressBar.HORIZONTAL);
 
     /**
@@ -39,21 +39,13 @@
         gc.weighty = 0.0;
         gc.insets = new Insets(5, 0, 0, 5);
-        add(lblTaskTitle = new JLabel(""), gc);
+        add(lblTaskTitle, gc);
+        lblTaskTitle.setLabelFor(lblCustomText);
 
-        gc.gridx = 0;
         gc.gridy = 1;
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(5, 0, 0, 5);
-        add(lblCustomText = new JLabel(""), gc);
+        add(lblCustomText, gc);
+        lblCustomText.setLabelFor(progressBar);
 
-        gc.gridx = 0;
         gc.gridy = 2;
-        gc.fill = GridBagConstraints.HORIZONTAL;
-        gc.weightx = 1.0;
-        gc.weighty = 0.0;
-        gc.insets = new Insets(5, 0, 0, 5);
-        add(progressBar = new JProgressBar(JProgressBar.HORIZONTAL), gc);
+        add(progressBar, gc);
     }
 
@@ -91,9 +83,5 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(SaveLayersModel.MODE_PROP)) {
-            Mode mode = (Mode) evt.getNewValue();
-            switch(mode) {
-                case EDITING_DATA: setVisible(false); break;
-                case UPLOADING_AND_SAVING: setVisible(true); break;
-            }
+            setVisible(Mode.UPLOADING_AND_SAVING.equals(evt.getNewValue()));
         }
         getParent().validate();
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java	(revision 9996)
@@ -118,4 +118,5 @@
         lblWarning = new JLabel("");
         lblWarning.setVisible(false);
+        lblWarning.setLabelFor(jepMessage);
         lblWarning.setIcon(ImageProvider.get("warning-small"));
         lblWarning.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java	(revision 9996)
@@ -388,8 +388,8 @@
         p.add(label, GBC.std().insets(0, 0, 10, 0));
         addToPanelAnchor(p, default_, presetInitiallyMatches);
+        label.setLabelFor(component);
         component.setToolTipText(getKeyTooltipText());
 
         return true;
-
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java	(revision 9995)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Text.java	(revision 9996)
@@ -180,4 +180,5 @@
         final JLabel label = new JLabel(locale_text + ':');
         label.setToolTipText(getKeyTooltipText());
+        label.setLabelFor(value);
         p.add(label, GBC.std().insets(0, 0, 10, 0));
         p.add(value, GBC.eol().fill(GBC.HORIZONTAL));