[PATCH 3 of 3] issue1606: Handle annotation text as well

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1384852827 -3600
# Node ID 4b67eb1a3a68b86048630f3c724c66da5d5d2ae0
# Parent  8ebca831486b3ebe7209ff8d188e4302e8371909
issue1606: Handle annotation text as well.

diff -r 8ebca831486b -r 4b67eb1a3a68 artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java
--- a/artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java	Tue Nov 19 10:19:25 2013 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/themes/ThemeDocument.java	Tue Nov 19 10:20:27 2013 +0100
@@ -391,10 +391,16 @@
         return Font.PLAIN;
     }
 
+    /** Handle info for label or annotation text. */
     public TextStyle parseComplexTextStyle() {
+        Font font = parseTextFont();
+        // Try the annotation text styles.
+        if (font == null) {
+            font = parseFont();
+        }
         return new TextStyle(
             parseTextColor(),
-            parseTextFont(),
+            font,
             parseTextBackground(),
             parseLabelShowBackground(),
             !parseTextOrientation().equals("horizontal"));