Index: trunk/src/org/openstreetmap/josm/actions/PurgeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (revision 17733) @@ -135,5 +135,5 @@ "They will be removed from the layer, but not deleted
" + "on the server when uploading.")+"", - ImageProvider.get("purge"), JLabel.LEFT), GBC.eol().fill(GBC.HORIZONTAL)); + ImageProvider.get("purge"), JLabel.LEADING), GBC.eol().fill(GBC.HORIZONTAL)); if (!toPurgeAdditionally.isEmpty()) { @@ -142,5 +142,5 @@ tr("The following dependent objects will be purged
" + "in addition to the selected objects:")+"", - ImageProvider.get("warning-small"), JLabel.LEFT), GBC.eol().fill(GBC.HORIZONTAL)); + ImageProvider.get("warning-small"), JLabel.LEADING), GBC.eol().fill(GBC.HORIZONTAL)); toPurgeAdditionally.sort((o1, o2) -> { @@ -177,5 +177,5 @@ pnl.add(new JLabel(""+tr("Some of the objects are modified.
" + "Proceed, if these changes should be discarded."+""), - ImageProvider.get("warning-small"), JLabel.LEFT), + ImageProvider.get("warning-small"), JLabel.LEADING), GBC.eol().fill(GBC.HORIZONTAL)); } Index: trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java (revision 17733) @@ -271,5 +271,5 @@ JCheckBox include = new JCheckBox(); include.setEnabled(false); - JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEFT); + JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEADING); lbl.setToolTipText(tr("No exporter for this layer")); lbl.setLabelFor(include); Index: trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/actions/corrector/TagCorrector.java (revision 17733) @@ -108,5 +108,5 @@ primitive.getDisplayName(DefaultNameFormatter.getInstance()) + ':', ImageProvider.get(primitive.getDisplayType()), - JLabel.LEFT + JLabel.LEADING ); p.add(primitiveLabel, GBC.eol()); @@ -134,5 +134,5 @@ primitive.getDisplayName(DefaultNameFormatter.getInstance()), ImageProvider.get(primitive.getDisplayType()), - JLabel.LEFT + JLabel.LEADING ); p.add(primitiveLabel, GBC.eol()); Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 17733) @@ -363,5 +363,5 @@ JLabel.HORIZONTAL ); - lbl.setHorizontalAlignment(JLabel.LEFT); + lbl.setHorizontalAlignment(JLabel.LEADING); c.add(lbl, GBC.eol().insets(2, 0, 2, 0)); @@ -662,5 +662,5 @@ l.setFont(l.getFont().deriveFont(Font.PLAIN)); l.setVerticalTextPosition(JLabel.TOP); - l.setHorizontalAlignment(JLabel.LEFT); + l.setHorizontalAlignment(JLabel.LEADING); l.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); l.addMouseListener(new MouseAdapter() { Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java (revision 17733) @@ -57,5 +57,5 @@ } setText(text); - setHorizontalAlignment(LEFT); + setHorizontalAlignment(LEADING); } Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java (revision 17733) @@ -49,5 +49,5 @@ setText(text); setToolTipText(text); - setHorizontalAlignment(LEFT); + setHorizontalAlignment(LEADING); renderIcon(null); } @@ -66,5 +66,5 @@ setText(text); setToolTipText(text); - setHorizontalAlignment(LEFT); + setHorizontalAlignment(LEADING); renderIcon((RelationMemberData) diffItem.value); } Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java (revision 17733) @@ -339,5 +339,5 @@ AlignedRenderer() { - this(SwingConstants.LEFT); + this(SwingConstants.LEADING); } Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (revision 17733) @@ -263,5 +263,5 @@ gc.weighty = 0.0; add(lblMessage, gc); - lblMessage.setHorizontalAlignment(JLabel.LEFT); + lblMessage.setHorizontalAlignment(JLabel.LEADING); lstLayers.setCellRenderer(new LayerCellRenderer()); gc.gridx = 0; Index: trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java (revision 17733) @@ -328,5 +328,5 @@ + "

" + trn("The image file will be permanently lost!", "The images files will be permanently lost!", size) + "", - ImageProvider.get("dialogs/geoimage/deletefromdisk"), SwingConstants.LEFT)) + ImageProvider.get("dialogs/geoimage/deletefromdisk"), SwingConstants.LEADING)) .toggleEnable("geoimage.deleteimagefromdisk") .setCancelButton(1) Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java (revision 17733) @@ -463,5 +463,5 @@ */ public PreferenceTabbedPane() { - super(SwingConstants.LEFT, JTabbedPane.SCROLL_TAB_LAYOUT); + super(SwingConstants.LEADING, JTabbedPane.SCROLL_TAB_LAYOUT); super.addMouseWheelListener(new WheelListener(this)); ExpertToggleAction.addExpertModeChangeListener(this); Index: trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java (revision 17733) @@ -134,5 +134,5 @@ pluginText, pi.getScaledIcon(), - SwingConstants.LEFT); + SwingConstants.LEADING); lblPlugin.addMouseListener(new PluginCheckBoxMouseAdapter(cbPlugin)); Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 17733) @@ -236,5 +236,5 @@ shortcutEditPane.add(cbDisable); shortcutEditPane.add(cbCtrl); - shortcutEditPane.add(new JLabel(tr("Key:"), SwingConstants.LEFT)); + shortcutEditPane.add(new JLabel(tr("Key:"), SwingConstants.LEADING)); shortcutEditPane.add(cbAlt); shortcutEditPane.add(tfKey); Index: trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/io/session/GenericSessionExporter.java (revision 17733) @@ -96,5 +96,5 @@ JPanel topRow = new JPanel(new GridBagLayout()); export.setSelected(true); - final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEFT); + final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEADING); lbl.setToolTipText(layer.getToolTipText()); lbl.setLabelFor(export); Index: trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/io/session/GeoImageSessionExporter.java (revision 17733) @@ -45,5 +45,5 @@ final JPanel p = new JPanel(new GridBagLayout()); export.setSelected(true); - final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEFT); + final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEADING); lbl.setToolTipText(layer.getToolTipText()); lbl.setLabelFor(export); Index: trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java (revision 17733) @@ -69,5 +69,5 @@ final JPanel p = new JPanel(new GridBagLayout()); export.setSelected(true); - final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEFT); + final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEADING); lbl.setToolTipText(layer.getToolTipText()); lbl.setLabelFor(export); Index: trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java (revision 17732) +++ trunk/src/org/openstreetmap/josm/io/session/MarkerSessionExporter.java (revision 17733) @@ -53,5 +53,5 @@ final JPanel p = new JPanel(new GridBagLayout()); export.setSelected(true); - final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEFT); + final JLabel lbl = new JLabel(layer.getName(), layer.getIcon(), SwingConstants.LEADING); lbl.setToolTipText(layer.getToolTipText()); lbl.setLabelFor(export);