Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java	(revision 10045)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java	(revision 10046)
@@ -4,4 +4,6 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Locale;
 
 import org.openstreetmap.josm.command.Command;
@@ -52,5 +54,5 @@
     @Override
     public void visitKeyValue(AbstractPrimitive n, String key, String value) {
-        if (key.toLowerCase().contains("fixme") || value.toLowerCase().contains("fixme")) {
+        if (key.toLowerCase(Locale.ENGLISH).contains("fixme") || value.toLowerCase(Locale.ENGLISH).contains("fixme")) {
             /* translation note: don't translate quoted words */
             String msg = marktr("Has tag containing ''fixme'' or ''FIXME''");
Index: /trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java	(revision 10045)
+++ /trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java	(revision 10046)
@@ -41,5 +41,5 @@
      * @throws NoSuchFieldException see {@link Class#getDeclaredField} for details
      */
-    public JosmImageView(Element elem) throws NoSuchFieldException, SecurityException {
+    public JosmImageView(Element elem) throws NoSuchFieldException {
         super(elem);
         imageField = ImageView.class.getDeclaredField("image");
@@ -56,9 +56,9 @@
      * Makes sure the necessary properties and image is loaded.
      */
-    private void sync() {
+    private void doSync() {
         try {
             int s = (int) stateField.get(this);
             if ((s & RELOAD_IMAGE_FLAG) != 0) {
-                refreshImage();
+                doRefreshImage();
             }
             s = (int) stateField.get(this);
@@ -85,6 +85,5 @@
      * @throws SecurityException see {@link Class#getDeclaredMethod} for details
      */
-    private void refreshImage() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException,
-        NoSuchMethodException, SecurityException {
+    private void doRefreshImage() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
         synchronized (this) {
             // clear out width/height/reloadimage flag and set loading flag
@@ -99,5 +98,5 @@
         try {
             // Load the image
-            loadImage();
+            doLoadImage();
 
             // And update the size params
@@ -122,6 +121,5 @@
      * @throws SecurityException see {@link Class#getDeclaredMethod} for details
      */
-    private void loadImage() throws IllegalArgumentException, IllegalAccessException, InvocationTargetException,
-        NoSuchMethodException, SecurityException {
+    private void doLoadImage() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException {
         URL src = getImageURL();
         if (src != null) {
@@ -142,5 +140,5 @@
     @Override
     public Image getImage() {
-        sync();
+        doSync();
         return super.getImage();
     }
@@ -148,5 +146,5 @@
     @Override
     public AttributeSet getAttributes() {
-        sync();
+        doSync();
         return super.getAttributes();
     }
@@ -154,5 +152,5 @@
     @Override
     public void paint(Graphics g, Shape a) {
-        sync();
+        doSync();
         super.paint(g, a);
     }
@@ -160,5 +158,5 @@
     @Override
     public float getPreferredSpan(int axis) {
-        sync();
+        doSync();
         return super.getPreferredSpan(axis);
     }
@@ -166,5 +164,5 @@
     @Override
     public void setSize(float width, float height) {
-        sync();
+        doSync();
         super.setSize(width, height);
     }