Changeset 10046 in josm for trunk

Timestamp:

2016-03-26T15:20:07+01:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S1449 - Locale should be used in String operations
sonar - squid:S2177 - Child class methods named for parent class methods should be overrides

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/UntaggedNode.java (modified) (2 diffs)
• gui/widgets/JosmImageView.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java

@@ -4 +4 @@
 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 +54 @@
     @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''");

trunk/src/org/openstreetmap/josm/gui/widgets/JosmImageView.java

@@ -41 +41 @@
      * @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 +56 @@
      * 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 +85 @@
      * @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 +98 @@
         try {
             // Load the image
-            loadImage();
+            doLoadImage();
 
             // And update the size params
@@ -122 +121 @@
      * @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 +140 @@
     @Override
     public Image getImage() {
-        sync();
+        doSync();
         return super.getImage();
     }
@@ -148 +146 @@
     @Override
     public AttributeSet getAttributes() {
-        sync();
+        doSync();
         return super.getAttributes();
     }
@@ -154 +152 @@
     @Override
     public void paint(Graphics g, Shape a) {
-        sync();
+        doSync();
         super.paint(g, a);
     }
@@ -160 +158 @@
     @Override
     public float getPreferredSpan(int axis) {
-        sync();
+        doSync();
         return super.getPreferredSpan(axis);
     }
@@ -166 +164 @@
     @Override
     public void setSize(float width, float height) {
-        sync();
+        doSync();
         super.setSize(width, height);
     }