Author: acumiskey
Date: Tue Apr 15 01:53:51 2008
New Revision: 648187
URL: http://svn.apache.org/viewvc?rev=648187&view=rev
Log:
Merged revisions 647770,648122 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r647770 | jeremias | 2008-04-14 13:41:00 +0100 (Mon, 14 Apr 2008) | 1 line
Fixed a possible follow-up NPE when the TTC cannot be loaded.
........
r648122 | jeremias | 2008-04-15 07:07:00 +0100 (Tue, 15 Apr 2008) | 1 line
A note about the generation of event-model.xml.
........
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/ (props changed)
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/events.xml
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
Propchange: xmlgraphics/fop/branches/Temp_AFPGOCAResources/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Apr 15 01:53:51 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-647766
+/xmlgraphics/fop/trunk:1-648185
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/events.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/events.xml?rev=648187&r1=648186&r2=648187&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/events.xml
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/documentation/content/xdocs/trunk/events.xml
Tue Apr 15 01:53:51 2008
@@ -276,6 +276,12 @@
uses <a href="http://qdox.codehaus.org/";>QDox</a> to parse these
interfaces.
</p>
<p>
+ The event model XML files are generated during build by the Ant task
mentioned above when
+ running the "resourcegen" task. So just run <code>"ant
resourcegen"</code> if you receive
+ a <code>MissingResourceException</code> at runtime indicating that
+ <code>"event-model.xml"</code> is missing.
+ </p>
+ <p>
Primarily, the QDox-based collector task records the parameters'
names and types.
Furthermore, it extracts additional attributes embedded as Javadoc
comments from
the methods. At the moment, the only such attribute is
"@event.severity" which indicates
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java?rev=648187&r1=648186&r2=648187&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
Tue Apr 15 01:53:51 2008
@@ -196,7 +196,6 @@
// Get a list of the TTC Font names
List ttcNames = null; //List<String>
String fontFileURI = fontUrl.toExternalForm().trim();
- TTFFontLoader ttfLoader = new TTFFontLoader(fontFileURI, resolver);
InputStream in = null;
try {
in = FontLoader.openFontUri(resolver, fontFileURI);
@@ -207,6 +206,7 @@
if (this.eventListener != null) {
this.eventListener.fontLoadingErrorAtAutoDetection(this,
fontFileURI, e);
}
+ return null;
} finally {
IOUtils.closeQuietly(in);
}
@@ -223,7 +223,7 @@
log.debug("Loading " + fontName);
}
try {
- ttfLoader = new TTFFontLoader(fontFileURI, fontName,
resolver);
+ TTFFontLoader ttfLoader = new TTFFontLoader(fontFileURI,
fontName, resolver);
customFont = ttfLoader.getFont();
if (this.eventListener != null) {
customFont.setEventListener(this.eventListener);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
