Changeset 19254 in josm for trunk

Timestamp:

2024-11-06T16:27:33+01:00 (2 weeks ago)

Author:

stoecker

Message:

some small cleanups

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• GettingStarted.java (modified) (6 diffs)
• animation/AnimationExtension.java (modified) (1 diff)
• animation/AnimationExtensionManager.java (modified) (3 diffs)
• animation/BirthdayExtension.java (added)
• animation/ChristmasExtension.java (modified) (1 diff)
• animation/NoExtension.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -7 +7 @@
 import java.awt.EventQueue;
 import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -15 +19 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.border.EmptyBorder;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
+import javax.swing.event.MouseInputListener;
 
 import org.openstreetmap.josm.actions.DownloadAction;
@@ -24 +30 @@
 import org.openstreetmap.josm.actions.HistoryInfoAction;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.gui.animation.AnimationExtension;
 import org.openstreetmap.josm.gui.animation.AnimationExtensionManager;
 import org.openstreetmap.josm.gui.datatransfer.OpenTransferHandler;
@@ -48 +55 @@
  * contains news about recent major changes, warning in case of outdated versions, etc.
  */
-public final class GettingStarted extends JPanel implements ProxyPreferenceListener {
+public final class GettingStarted extends JPanel implements ProxyPreferenceListener, MouseInputListener {
 
     private final LinkGeneral lg;
@@ -155 +162 @@
         add(scroller, BorderLayout.CENTER);
 
+        scroller.addMouseMotionListener(this);
+        scroller.addMouseListener(this);
+        lg.addMouseMotionListener(this);
+        lg.addMouseListener(this);
+
         getMOTD();
 
@@ -177 +189 @@
 
     @Override
+    public void mouseMoved(MouseEvent e) {
+        final AnimationExtension extension = AnimationExtensionManager.getExtension();
+        if (extension instanceof MouseMotionListener) {
+            ((MouseMotionListener) extension).mouseMoved(e);
+        }
+    }
+
+    @Override
+    public void mouseDragged(MouseEvent e) {
+        // Ignored
+    }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+        final AnimationExtension extension = AnimationExtensionManager.getExtension();
+        if (extension instanceof MouseListener) {
+            ((MouseListener) extension).mousePressed(e);
+        }
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+        // Ignored
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+        // Ignored
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+        final AnimationExtension extension = AnimationExtensionManager.getExtension();
+        if (extension instanceof MouseListener) {
+            ((MouseListener) extension).mouseReleased(e);
+        }
+    }
+
+    @Override
+    public void mouseClicked(MouseEvent e) {
+        // Ignored
+    }
+
+    @Override
     public void paint(Graphics g) {
         super.paint(g);
         if (isShowing()) {
-            AnimationExtensionManager.getExtension().adjustForSize(getWidth(), getHeight());
+            Point p = new Point(0, 0);
+            SwingUtilities.convertPointToScreen(p, this);
+            AnimationExtensionManager.getExtension().adjustForSize(getWidth(), getHeight(), p.x, p.y);
             AnimationExtensionManager.getExtension().animate();
             AnimationExtensionManager.getExtension().paint(g);

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

@@ -16 +16 @@
      * @param w width
      * @param h height
+     * @param x x origin of view area
+     * @param y y origin of view area
      */
-    void adjustForSize(int w, int h);
+    void adjustForSize(int w, int h, int x, int y);
 
     /**

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

@@ -3 +3 @@
 
 import java.time.LocalDate;
+import java.time.Month;
 import java.time.ZoneId;
 
@@ -28 +29 @@
     public static AnimationExtension getExtension() {
         if (currentExtension == null) {
-            currentExtension = Boolean.TRUE.equals(PROP_ANIMATION.get()) && isChristmas() ? new ChristmasExtension()
-                    : new NoExtension();
+            final boolean isAnimated = Boolean.TRUE.equals(PROP_ANIMATION.get());
+            if (isAnimated && isChristmas()) {
+                currentExtension = new ChristmasExtension();
+            } else if (isAnimated && isBirthday()) {
+                currentExtension = new BirthdayExtension();
+            } else {
+                currentExtension = new NoExtension();
+            }
         }
         return currentExtension;
@@ -46 +53 @@
         return LocalDate.now(ZoneId.systemDefault()).getDayOfYear() > 350;
     }
+
+    /**
+     * The first commit of JOSM to svn (r1) was on 2005-09-27
+     * @return {@code true} if today is JOSM's birthday
+     */
+    private static boolean isBirthday() {
+        LocalDate l = LocalDate.now(ZoneId.systemDefault());
+        return l.getMonth() == Month.SEPTEMBER && l.getDayOfMonth() == 27;
+    }
 }

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

@@ -29 +29 @@
 
     @Override
-    public final void adjustForSize(int w, int h) {
+    public final void adjustForSize(int w, int h, int x, int y) {
         int count = w / (2 * (Star.averageStarWidth + 1));
         while (objs.size() > count) {

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

@@ -16 +16 @@
 
     @Override
-    public void adjustForSize(int w, int h) {
+    public void adjustForSize(int w, int h, int x, int y) {
         // No-op
     }