Index: /trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 9633)
+++ /trunk/src/org/openstreetmap/josm/gui/MapStatus.java (revision 9634)
@@ -674,5 +674,7 @@
// remove mouse states that are in the queue. Our mouse state is newer.
incomingMouseState.clear();
- incomingMouseState.offer(ms);
+ if (!incomingMouseState.offer(ms)) {
+ Main.warn("Unable to handle new MouseState: " + ms);
+ }
}
}
Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 9633)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 9634)
@@ -587,5 +587,5 @@
}
- private class ZoomData {
+ private static class ZoomData {
private final EastNorth center;
private final double scale;
Index: /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 9633)
+++ /trunk/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java (revision 9634)
@@ -207,5 +207,5 @@
}
panel.add(new JLabel(""+b.toString().trim()+""), GBC.eol().insets(0, 0, 0, 10));
- if (!details.isEmpty()) {
+ if (details != null && !details.isEmpty()) {
panel.add(new JLabel(tr("Details:")), GBC.eol().insets(0, 0, 0, 10));
JosmTextArea area = new JosmTextArea(details);
Index: /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 9633)
+++ /trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (revision 9634)
@@ -34,5 +34,5 @@
private final Map myActions = new HashMap<>();
- private final class ShowLayersPopupWorker implements Runnable {
+ private static final class ShowLayersPopupWorker implements Runnable {
private final MyAction action;