Changeset 18929 in josm for trunk/src/org

Timestamp:

2023-12-31T20:13:15+01:00 (11 months ago)

Author:

stoecker

Message:

proper interface

Location:

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

Files:

• ChristmasExtension.java (modified) (2 diffs)
• DropImage.java (added)
• IAnimObject.java (added)
• Star.java (modified) (5 diffs)

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

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 /**
@@ -14 +15 @@
 public class ChristmasExtension implements AnimationExtension {
 
-    private final List<Star> stars = new ArrayList<>(50);
+    private final List<IAnimObject> objs = new ArrayList<>(50);
 
     @Override
     public void paint(Graphics g) {
-        stars.forEach(s -> s.paint(g));
+        objs.forEach(o -> o.paint(g));
     }
 
     @Override
     public void animate() {
-        stars.forEach(Star::animate);
+        objs.forEach(IAnimObject::animate);
     }
 
     @Override
     public final void adjustForSize(int w, int h) {
+        Random seed = new Random();
         int count = w / (2 * (Star.averageStarWidth + 1));
-        while (stars.size() > count) {
-            stars.remove(stars.size() - 1);
+        while (objs.size() > count) {
+            objs.remove(objs.size() - 1);
         }
-        while (stars.size() < count) {
-            stars.add(new Star(w, h));
+        objs.forEach(o -> o.setExtend(w, h));
+        while (objs.size() < count) {
+            objs.add(seed.nextInt(5) > 0 ? new Star(w, h) : new DropImage(w, h));
         }
     }

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

@@ -14 +14 @@
  * @since 14581
  */
-class Star {
+class Star implements IAnimObject {
     private static final Random seed = new Random();
 
@@ -23 +23 @@
     private static final Color WATER_LIVE_COLOR = new Color(80, 131, 160);
 
-    private final int w;
-    private final int h;
+    private int w;
+    private int h;
 
     private int radiusX;
@@ -59 +59 @@
     }
 
-    void paint(Graphics g) {
+    @Override
+    public void paint(Graphics g) {
         Color c = g.getColor();
         g.setColor(new Color(color[0], color[1], color[2]));
@@ -72 +73 @@
     }
 
-    void animate() {
+    @Override
+    public void setExtend(int w, int h) {
+        this.w = w;
+        this.h = h;
+    }
+
+    @Override
+    public void animate() {
         center.y += fallSpeed;
         if (orientation) {
@@ -97 +105 @@
             interpolateColors(radiusY, maxRadiusY);
         }
-        if (center.y > h + radiusX * 2 || center.y > h + radiusY * 2) {
+        if (center.y > w + 1 || center.y > h + radiusY * 2) {
             createRadiuses();
             center.x = seed.nextInt(w + 1);