[Jrisk-cvs] SF.net SVN: domination-code:[2715] Domination/swingUI

[<yu...@us...>]

Revision: 2715
          http://sourceforge.net/p/domination/code/2715
Author:   yuranet
Date:     2025-12-23 19:22:05 +0000 (Tue, 23 Dec 2025)
Log Message:
-----------
fix to work in java 1.5-1.7

Modified Paths:
--------------
    Domination/swingUI/game/Domination/jar/net/yura/domination/ui/flashgui/graph.jpg
    Domination/swingUI/src/net/yura/swing/ArcCornerIcon.java
    Domination/swingUI/src/net/yura/swing/GraphicsUtil.java

Modified: Domination/swingUI/game/Domination/jar/net/yura/domination/ui/flashgui/graph.jpg
===================================================================
(Binary files differ)

Modified: Domination/swingUI/src/net/yura/swing/ArcCornerIcon.java
===================================================================
--- Domination/swingUI/src/net/yura/swing/ArcCornerIcon.java	2025-12-23 00:03:11 UTC (rev 2714)
+++ Domination/swingUI/src/net/yura/swing/ArcCornerIcon.java	2025-12-23 19:22:05 UTC (rev 2715)
@@ -3,6 +3,7 @@
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
+import java.awt.MediaTracker;
 import javax.swing.Icon;
 import javax.swing.ScrollPaneConstants;
 import java.awt.geom.RoundRectangle2D;
@@ -49,6 +50,17 @@
             ((Graphics2D)grphcs).clip(new RoundRectangle2D.Double(x + xOffset, y + yOffset, w + r, h + r, r * 2, r * 2));
         }
 
+        // fix for java 1.5/1.6/1.7, if image is in ABORTED state, if we try and paint it
+        // it will call back to the ImageObserver/component, and if that component does not recognise it
+        // the component will just return false and say it does not care about this image,
+        // so it will never get loaded and so never get painted
+        if (base instanceof javax.swing.ImageIcon) {
+            if (((javax.swing.ImageIcon)base).getImageLoadStatus() == MediaTracker.ABORTED) {
+                // setting this to null forces it to try and paint it right away
+                cmpnt = null;
+            }
+        }
+
         base.paintIcon(cmpnt, grphcs, x, y);
     }
 

Modified: Domination/swingUI/src/net/yura/swing/GraphicsUtil.java
===================================================================
--- Domination/swingUI/src/net/yura/swing/GraphicsUtil.java	2025-12-23 00:03:11 UTC (rev 2714)
+++ Domination/swingUI/src/net/yura/swing/GraphicsUtil.java	2025-12-23 19:22:05 UTC (rev 2715)
@@ -300,6 +300,10 @@
         catch(InterruptedException e) {
             System.out.println("Loading of the image was interrupted" );
         }
+        int status = mediaTracker.statusID(1, true);
+        if (status != MediaTracker.COMPLETE) {
+            System.out.println("Image status NOT COMPLETE " + status + " " +img);
+        }
         mediaTracker.removeImage(img);
     }
 }