deweese 01/08/07 10:50:47
Modified: samples/tests anchor.svg
sources/org/apache/batik/ext/awt/image/spi
ImageTagRegistry.java
Log:
Fixed my fix for broken-link images...
Revision Changes Path
1.2 +2 -2 xml-batik/samples/tests/anchor.svg
Index: anchor.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/anchor.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anchor.svg 2001/08/03 16:20:47 1.1
+++ anchor.svg 2001/08/07 17:50:47 1.2
@@ -15,7 +15,7 @@
<!-- various element types. -->
<!-- -->
<!-- @author [EMAIL PROTECTED] -->
-<!-- @version $Id: anchor.svg,v 1.1 2001/08/03 16:20:47 vhardy Exp $ -->
+<!-- @version $Id: anchor.svg,v 1.2 2001/08/07 17:50:47 deweese Exp $ -->
<!-- ========================================================================= -->
<?xml-stylesheet type="text/css" href="test.css" ?>
@@ -175,7 +175,7 @@
<text x="30" y="15" class="label"><image></text>
<a xlink:href="#svgView(viewBox(3,2.5,4,4))">
- <image transform="translate(60, 0)" x="8" y="2" width="43"
height="18" xlink:href="tke.jpg"/>
+ <image transform="translate(60, 0)" x="8" y="2" width="43"
height="18" xlink:href="tde.jpg"/>
</a>
</g> <!-- "imageRow" -->
1.11 +13 -12
xml-batik/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java
Index: ImageTagRegistry.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/ext/awt/image/spi/ImageTagRegistry.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ImageTagRegistry.java 2001/08/07 17:28:22 1.10
+++ ImageTagRegistry.java 2001/08/07 17:50:47 1.11
@@ -33,7 +33,7 @@
* instances of RegisteryEntry in this package.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Thomas DeWeese</a>
- * @version $Id: ImageTagRegistry.java,v 1.10 2001/08/07 17:28:22 deweese Exp $
+ * @version $Id: ImageTagRegistry.java,v 1.11 2001/08/07 17:50:47 deweese Exp $
*/
public class ImageTagRegistry implements ErrorConstants {
@@ -137,17 +137,18 @@
}
}
- if (openFailed) {
- // Technially it's possible that it's an unknown
- // 'protocol that caused the open to fail but probably
- // it's a bad URL...
- ret = getBrokenLinkImage(this, ERR_URL_UNREACHABLE,
- new Object[] { purl });
- } else {
- // We were able to get to the data we just couldn't
- // make sense of it...
- ret = getBrokenLinkImage(this, ERR_URL_UNINTERPRETABLE,
- new Object[] { purl } );
+ if (ret == null) {
+ if (openFailed)
+ // Technially it's possible that it's an unknown
+ // 'protocol that caused the open to fail but probably
+ // it's a bad URL...
+ ret = getBrokenLinkImage(this, ERR_URL_UNREACHABLE,
+ new Object[] { purl });
+ else
+ // We were able to get to the data we just couldn't
+ // make sense of it...
+ ret = getBrokenLinkImage(this, ERR_URL_UNINTERPRETABLE,
+ new Object[] { purl } );
}
cache.put(purl, ret);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
