Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 18140)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java	(revision 18141)
@@ -38,5 +38,5 @@
 
     private boolean autocompleteEnabled = true;
-    private boolean locked = false;
+    private boolean locked;
 
     private int maxTextLength = -1;
Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 18140)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 18141)
@@ -104,5 +104,5 @@
         // "Mac" is the native LAF, "Aqua" is Quaqua. Both use native menus with native tooltips.
         String laf = UIManager.getLookAndFeel().getID();
-        return !("true".equals(Utils.getSystemProperty("apple.laf.useScreenMenuBar"))
+        return !("true".equals(getSystemProperty("apple.laf.useScreenMenuBar"))
                 && ("Aqua".equals(laf) || laf.contains("Mac")));
     }