Index: trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java (revision 11348) @@ -61,10 +61,5 @@ Shortcut.SHIFT ); - Main.registerActionShortcut(new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - EditRelationAction.launchEditor(getLastRelation()); - } - }, shortcut); + Main.registerActionShortcut(new LaunchEditorAction(), shortcut); } @@ -148,4 +143,11 @@ } + protected static class LaunchEditorAction extends AbstractAction { + @Override + public void actionPerformed(ActionEvent e) { + EditRelationAction.launchEditor(getLastRelation()); + } + } + protected static class RecentRelationsPopupMenu extends JPopupMenu { /** Index: trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java (revision 11348) @@ -6,5 +6,4 @@ import static org.openstreetmap.josm.tools.I18n.trn; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -15,4 +14,5 @@ import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import javax.swing.Icon; @@ -33,4 +33,28 @@ */ public class ChangePropertyCommand extends Command { + + static final class OsmPseudoCommand implements PseudoCommand { + private final OsmPrimitive osm; + + OsmPseudoCommand(OsmPrimitive osm) { + this.osm = osm; + } + + @Override + public String getDescriptionText() { + return osm.getDisplayName(DefaultNameFormatter.getInstance()); + } + + @Override + public Icon getDescriptionIcon() { + return ImageProvider.get(osm.getDisplayType()); + } + + @Override + public Collection getParticipatingPrimitives() { + return Collections.singleton(osm); + } + } + /** * All primitives that are affected with this command. @@ -212,21 +236,5 @@ if (objects.size() == 1) return null; - List children = new ArrayList<>(); - for (final OsmPrimitive osm : objects) { - children.add(new PseudoCommand() { - @Override public String getDescriptionText() { - return osm.getDisplayName(DefaultNameFormatter.getInstance()); - } - - @Override public Icon getDescriptionIcon() { - return ImageProvider.get(osm.getDisplayType()); - } - - @Override public Collection getParticipatingPrimitives() { - return Collections.singleton(osm); - } - }); - } - return children; + return objects.stream().map(OsmPseudoCommand::new).collect(Collectors.toList()); } Index: trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/gui/ImageryMenu.java (revision 11348) @@ -42,21 +42,13 @@ /** * Imagery menu, holding entries for imagery preferences, offset actions and dynamic imagery entries - * depending on current maview coordinates. + * depending on current mapview coordinates. * @since 3737 */ public class ImageryMenu extends JMenu implements LayerChangeListener { - /** - * Compare ImageryInfo objects alphabetically by name. - * - * ImageryInfo objects are normally sorted by country code first - * (for the preferences). We don't want this in the imagery menu. - */ - public static final Comparator alphabeticImageryComparator = - (ii1, ii2) -> ii1.getName().toLowerCase(Locale.ENGLISH).compareTo(ii2.getName().toLowerCase(Locale.ENGLISH)); - - private final transient Action offsetAction = new JosmAction( - tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false) { - { + static final class AdjustImageryOffsetAction extends JosmAction { + + AdjustImageryOffsetAction() { + super(tr("Imagery offset"), "mapmode/adjustimg", tr("Adjust imagery offset"), null, false, false); putValue("toolbar", "imagery-offset"); Main.toolbar.register(this); @@ -94,5 +86,16 @@ popup.show(source, source.getWidth()/2, source.getHeight()/2); } - }; + } + + /** + * Compare ImageryInfo objects alphabetically by name. + * + * ImageryInfo objects are normally sorted by country code first + * (for the preferences). We don't want this in the imagery menu. + */ + public static final Comparator alphabeticImageryComparator = + (ii1, ii2) -> ii1.getName().toLowerCase(Locale.ENGLISH).compareTo(ii2.getName().toLowerCase(Locale.ENGLISH)); + + private final transient Action offsetAction = new AdjustImageryOffsetAction(); private final JMenuItem singleOffset = new JMenuItem(offsetAction); @@ -227,4 +230,7 @@ } + /** + * Refresh offset menu item. + */ public void refreshOffsetMenu() { offsetMenuItem = getNewOffsetMenu(); Index: trunk/src/org/openstreetmap/josm/gui/MainFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainFrame.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/gui/MainFrame.java (revision 11348) @@ -89,10 +89,5 @@ l.add(ImageProvider.get("logo").getImage()); setIconImages(l); - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(final WindowEvent evt) { - Main.exitJosm(true, 0, null); - } - }); + addWindowListener(new ExitWindowAdapter()); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); @@ -159,4 +154,11 @@ if (layer == Main.getLayerManager().getEditLayer()) { refreshTitle(); + } + } + + static final class ExitWindowAdapter extends WindowAdapter { + @Override + public void windowClosing(final WindowEvent evt) { + Main.exitJosm(true, 0, null); } } Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java (revision 11348) @@ -213,15 +213,5 @@ splitPane.setDividerSize(5); splitPane.setBorder(null); - splitPane.setUI(new BasicSplitPaneUI() { - @Override - public BasicSplitPaneDivider createDefaultDivider() { - return new BasicSplitPaneDivider(this) { - @Override - public void setBorder(Border b) { - // Do nothing - } - }; - } - }); + splitPane.setUI(new NoBorderSplitPaneUI()); // JSplitPane supports F6 and F8 shortcuts by default, but we need them for Audio actions @@ -533,4 +523,16 @@ } + static final class NoBorderSplitPaneUI extends BasicSplitPaneUI { + @Override + public BasicSplitPaneDivider createDefaultDivider() { + return new BasicSplitPaneDivider(this) { + @Override + public void setBorder(Border b) { + // Do nothing + } + }; + } + } + private final class SideToolbarPopupMenu extends JPopupMenu { private static final int staticMenuEntryCount = 2; Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 11348) @@ -134,4 +134,23 @@ private final transient Collector collector; + static final class ShowMonitorDialogMouseAdapter extends MouseAdapter { + @Override + public void mouseClicked(MouseEvent e) { + PleaseWaitProgressMonitor monitor = Main.currentProgressMonitor; + if (monitor != null) { + monitor.showForegroundDialog(); + } + } + } + + static final class JumpToOnLeftClickMouseAdapter extends MouseAdapter { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getButton() != MouseEvent.BUTTON3) { + Main.main.menu.jumpToAct.showJumpToDialog(); + } + } + } + public class BackgroundProgressMonitor implements ProgressMonitorDialog { @@ -829,12 +848,5 @@ // also show Jump To dialog on mouse click (except context menu) - MouseListener jumpToOnLeftClick = new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - if (e.getButton() != MouseEvent.BUTTON3) { - Main.main.menu.jumpToAct.showJumpToDialog(); - } - } - }; + MouseListener jumpToOnLeftClick = new JumpToOnLeftClickMouseAdapter(); // Listen for mouse movements and set the position text field @@ -918,13 +930,5 @@ gbc.ipadx = 100; add(progressBar, gbc); - progressBar.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - PleaseWaitProgressMonitor monitor = Main.currentProgressMonitor; - if (monitor != null) { - monitor.showForegroundDialog(); - } - } - }); + progressBar.addMouseListener(new ShowMonitorDialogMouseAdapter()); Main.pref.addPreferenceChangeListener(this); Index: trunk/src/org/openstreetmap/josm/gui/NotificationManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (revision 11348) @@ -183,4 +183,17 @@ private static class NotificationPanel extends JPanel { + static final class ShowNoteHelpAction extends AbstractAction { + private final Notification note; + + private ShowNoteHelpAction(Notification note) { + this.note = note; + } + + @Override + public void actionPerformed(ActionEvent e) { + SwingUtilities.invokeLater(() -> HelpBrowser.setUrlForHelpTopic(note.getHelpTopic())); + } + } + private JPanel innerPanel; @@ -214,10 +227,5 @@ btnHelp.setToolTipText(tr("Show help information")); HelpUtil.setHelpContext(btnHelp, note.getHelpTopic()); - btnHelp.addActionListener(new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - SwingUtilities.invokeLater(() -> HelpBrowser.setUrlForHelpTopic(note.getHelpTopic())); - } - }); + btnHelp.addActionListener(new ShowNoteHelpAction(note)); btnHelp.setOpaque(false); tbHelp = new JToolBar(); Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (revision 11347) +++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java (revision 11348) @@ -18,7 +18,5 @@ public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel { - private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer(); - - private final transient OsmPrimitivRenderer primitiveRenderer = new OsmPrimitivRenderer() { + static final class MemberRenderer extends OsmPrimitivRenderer { @Override public Component getTableCellRendererComponent(JTable table, @@ -27,9 +25,20 @@ table, isSelected, row); } - }; + } + + private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer(); + + private final transient OsmPrimitivRenderer primitiveRenderer = new MemberRenderer(); private final transient TableCellRenderer tableRenderer = (table, value, isSelected, hasFocus, row, column) -> setColors(defaultTableCellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column), table, isSelected, row); + + /** + * Constructs a new {@code RelationMemberConflictResolverColumnModel}. + */ + public RelationMemberConflictResolverColumnModel() { + createColumns(); + } private static Component setColors(Component comp, JTable table, boolean isSelected, int row) { @@ -110,10 +119,3 @@ addColumn(col); } - - /** - * Constructs a new {@code RelationMemberConflictResolverColumnModel}. - */ - public RelationMemberConflictResolverColumnModel() { - createColumns(); - } }