Changeset 18932 in josm for trunk/src/org

Timestamp:

2024-01-01T12:58:39+01:00 (11 months ago)

Author:

stoecker

Message:

fix some CI warnings

Location:

trunk/src/org/openstreetmap/josm/gui/animation

Files:

• ChristmasExtension.java (modified) (2 diffs)
• DropImage.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/animation/ChristmasExtension.java

@@ -15 +15 @@
 public class ChristmasExtension implements AnimationExtension {
 
+    private static final Random seed = new Random();
     private final List<IAnimObject> objs = new ArrayList<>(50);
 
@@ -29 +30 @@
     @Override
     public final void adjustForSize(int w, int h) {
-        Random seed = new Random();
         int count = w / (2 * (Star.averageStarWidth + 1));
         while (objs.size() > count) {

trunk/src/org/openstreetmap/josm/gui/animation/DropImage.java

@@ -75 +75 @@
                 dirs.add(new File(url.toURI()));
                 do {
-                    for (File f : dirs.remove(0).listFiles()) {
-                        if (f.isFile()) {
-                            result.add(f.getPath());
-                        } else {
-                            dirs.add(f);
+                    File[] files = dirs.remove(0).listFiles();
+                    if (files != null) {
+                        for (File f : files) {
+                            if (f.isFile()) {
+                                result.add(f.getPath());
+                            } else {
+                                dirs.add(f);
+                            }
                         }
                     }
@@ -97 +100 @@
                 name = result.get(seed.nextInt(result.size()));
             }
+            return new ImageProvider(name).setMaxSize(new Dimension(size, size)).get().getImage();
         } catch (Exception ex) {
             Logging.log(Logging.LEVEL_DEBUG, ex);
         }
-        return new ImageProvider(name).setMaxSize(new Dimension(size, size)).get().getImage();
+        return new ImageProvider("logo").setMaxSize(new Dimension(size, size)).get().getImage();
     }
 }