restore extension fonts on virtualization

closes gh-225

jasperreports/src/net/sf/jasperreports/engine/fill/JRVirtualizationContext.java

@@ -23,6 +23,7 @@
  */
 package net.sf.jasperreports.engine.fill;
 
+import java.awt.Font;
 import java.io.IOException;
 import java.io.ObjectInputStream.GetField;
 import java.io.Serializable;
@@ -56,6 +57,7 @@
 import net.sf.jasperreports.engine.base.JRVirtualPrintPage;
 import net.sf.jasperreports.engine.base.VirtualElementsData;
 import net.sf.jasperreports.engine.base.VirtualizableElementList;
+import net.sf.jasperreports.engine.fonts.FontUtil;
 import net.sf.jasperreports.engine.util.DeepPrintElementVisitor;
 import net.sf.jasperreports.engine.util.UniformPrintElementVisitor;
 import net.sf.jasperreports.renderers.Renderable;
@@ -599,6 +601,10 @@ else if (obj instanceof VirtualizationContextIdHolder)
 			}
 			resolve = context;
 		}
+		else if (obj instanceof Font)
+		{
+			resolve = FontUtil.getInstance(jasperReportsContext).resolveDeserializedFont((Font) obj);
+		}
 		return resolve;
 	}
 

jasperreports/src/net/sf/jasperreports/engine/fonts/FontUtil.java

@@ -657,6 +657,27 @@ public Font getAwtFont(JRFont font, Locale locale)
 		return awtFont;
 	}
 
+	public Font resolveDeserializedFont(Font font)
+	{
+		// We use the font.getName() method here because the name field in the java.awt.Font class is the only font name related information that gets serialized,
+		// along with the size and style. The font.getFontName() and font.getFamily() both return runtime calculated values, which are not accurate in case of AWT fonts
+		// created at runtime through font extensions (both seem to return 'Dialog').
+		// For AWT fonts created from font extensions using the Font.createFont(int, InputStream), the name field is set to the same value as the font.getFontName(),
+		// which is the recommended method to get the name of an AWT font.
+		String fontName = font.getName();
+		// We load an instance of an AWT font, even if the specified font name is not available (ignoreMissingFont=true),
+		// because only third-party visualization packages such as JFreeChart (chart themes) store serialized java.awt.Font objects,
+		// and they are responsible for the drawing as well.
+		// Here we rely on the utility method ability to find a font by face name, not only family name. This is because font.getName() above returns an AWT font name,
+		// not a font family name.
+		Font newFont = getAwtFontFromBundles(fontName, font.getStyle(), font.getSize2D(), null, true);
+		if (newFont != null)
+		{
+			return newFont.deriveFont(font.getAttributes());
+		}
+
+		return font;
+	}
 
 	private FontUtil()
 	{

jasperreports/src/net/sf/jasperreports/engine/util/ContextClassLoaderObjectInputStream.java

@@ -122,23 +122,7 @@ protected Object resolveObject(Object obj) throws IOException
 
 		if (font != null)
 		{
-			// We use the font.getName() method here because the name field in the java.awt.Font class is the only font name related information that gets serialized,
-			// along with the size and style. The font.getFontName() and font.getFamily() both return runtime calculated values, which are not accurate in case of AWT fonts
-			// created at runtime through font extensions (both seem to return 'Dialog').
-			// For AWT fonts created from font extensions using the Font.createFont(int, InputStream), the name field is set to the same value as the font.getFontName(),
-			// which is the recommended method to get the name of an AWT font.
-			String fontName = font.getName();
-			// We load an instance of an AWT font, even if the specified font name is not available (ignoreMissingFont=true),
-			// because only third-party visualization packages such as JFreeChart (chart themes) store serialized java.awt.Font objects,
-			// and they are responsible for the drawing as well.
-			// Here we rely on the utility method ability to find a font by face name, not only family name. This is because font.getName() above returns an AWT font name,
-			// not a font family name.
-			Font newFont = FontUtil.getInstance(jasperReportsContext).getAwtFontFromBundles(fontName, font.getStyle(), font.getSize2D(), null, true);
-
-			if (newFont != null)
-			{
-				return newFont.deriveFont(font.getAttributes());
-			}
+			return FontUtil.getInstance(jasperReportsContext).resolveDeserializedFont(font);
 		}
 
 		return obj;

jasperreports/src/net/sf/jasperreports/engine/virtualization/VirtualizationInput.java

@@ -23,6 +23,7 @@
  */
 package net.sf.jasperreports.engine.virtualization;
 
+import java.awt.Font;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;
@@ -31,6 +32,7 @@
 
 import net.sf.jasperreports.engine.JRRuntimeException;
 import net.sf.jasperreports.engine.fill.JRVirtualizationContext;
+import net.sf.jasperreports.engine.fonts.FontUtil;
 
 /**
  * @author Lucian Chirita (lucianc@users.sourceforge.net)
@@ -52,6 +54,8 @@ public VirtualizationInput(InputStream in,
 		super(in);
 
 		this.virtualizationContext = virtualizationContext;
+
+		enableResolveObject(true);		
 	}
 
 	public JRVirtualizationContext getVirtualizationContext()
@@ -129,4 +133,15 @@ protected void putReference(int typeValue, Object value)
 
 		objects.add(value);
 	}
+
+	@Override
+	protected Object resolveObject(Object obj) throws IOException
+	{
+		if (obj instanceof Font)
+		{
+			return FontUtil.getInstance(virtualizationContext.getJasperReportsContext()).resolveDeserializedFont((Font) obj);
+		}
+
+		return obj;
+	}
 }