Log Message
Make Java 5 compatible.
Modified Paths
Diff
Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/FontConverter.java (2138 => 2139)
--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/FontConverter.java 2013-09-26 19:59:23 UTC (rev 2138)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/FontConverter.java 2013-09-26 20:10:12 UTC (rev 2139)
@@ -15,6 +15,7 @@
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.SingleValueConverter;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.core.JVM;
import com.thoughtworks.xstream.io.ExtendedHierarchicalStreamWriterHelper;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
@@ -112,6 +113,13 @@
} else {
attributes = Collections.EMPTY_MAP;
}
+ if (!JVM.is16()) {
+ for (Iterator iter = attributes.values().iterator(); iter.hasNext(); ) {
+ if (iter.next() == null) {
+ iter.remove();
+ }
+ }
+ }
Font font = Font.getFont(attributes);
if (context.getRequiredType() == FontUIResource.class) {
return new FontUIResource(font);
To unsubscribe from this list please visit:
