2006-11-14 Roman Kennke <kennke@aicas.com>

	* javax/swing/text/html/ImageView.java
	(getPreferredSpan): Use CSS length values.
	* javax/swing/text/html/TableView.java
	(CellView.calculateMajorAxisRequirements): Overridden to
	set the maximum reqs to maximum.
	(RowView.getMaximumSize): For the X_AXIS, set the maximum
	span to maximum.
	(RowView.getMinimumSpan): Overridden. For the X_AXIS, return
	the total column reqs.
	(RowView.getPreferredSpan): Overridden. For the X_AXIS, return
	the total column reqs.
	* gnu/javax/swing/text/html/css/CSSColor.java
	(convertValue): Catch NumberFormatExceptions for more robustness.
	* gnu/javax/swing/text/html/css/FontSize.java
	(mapPixels): Actually map px values. Catch NFE for more robustness.

2 files changed, 36 insertions, 8 deletions

diff --git a/javax/swing/text/html/ImageView.java b/javax/swing/text/html/ImageView.java
index ff0d3ea40..45f22ced3 100644
--- a/javax/swing/text/html/ImageView.java
+++ b/javax/swing/text/html/ImageView.java
@@ -2,6 +2,7 @@ package javax.swing.text.html;
 
 import gnu.javax.swing.text.html.CombinedAttributes;
 import gnu.javax.swing.text.html.ImageViewIconFactory;
+import gnu.javax.swing.text.html.css.Length;
 
 import java.awt.Graphics;
 import java.awt.Image;
@@ -245,9 +246,9 @@ public class ImageView extends View
 
     if (axis == View.X_AXIS)
       {
-        Object w = attrs.getAttribute(Attribute.WIDTH);
-        if (w != null)
-          return Integer.parseInt(w.toString());
+        Object w = attrs.getAttribute(CSS.Attribute.WIDTH);
+        if (w instanceof Length)
+          return ((Length) w).getValue();
         else if (image != null)
           return image.getWidth(getContainer());
         else
@@ -255,9 +256,9 @@ public class ImageView extends View
       }
     else if (axis == View.Y_AXIS)
       {
-        Object w = attrs.getAttribute(Attribute.HEIGHT);
-        if (w != null)
-          return Integer.parseInt(w.toString());
+        Object w = attrs.getAttribute(CSS.Attribute.HEIGHT);
+        if (w instanceof Length)
+          return ((Length) w).getValue();
         else if (image != null)
           return image.getHeight(getContainer());
         else
@@ -439,6 +440,5 @@ public class ImageView extends View
     if (imageIcon == null)
       reloadImage(false);
   }  
-  
 
 }
diff --git a/javax/swing/text/html/TableView.java b/javax/swing/text/html/TableView.java
index 2bd11ffcf..1e99042b5 100644
--- a/javax/swing/text/html/TableView.java
+++ b/javax/swing/text/html/TableView.java
@@ -84,7 +84,27 @@ class TableView
       if (axis == Y_AXIS)
         span = super.getPreferredSpan(axis);
       else
-        span = super.getMaximumSpan(axis);
+        span = Integer.MAX_VALUE;
+      return span;
+    }
+
+    public float getMinimumSpan(int axis)
+    {
+      float span;
+      if (axis == X_AXIS)
+        span = totalColumnRequirements.minimum;
+      else
+        span = super.getMinimumSpan(axis);
+      return span;
+    }
+
+    public float getPreferredSpan(int axis)
+    {
+      float span;
+      if (axis == X_AXIS)
+        span = totalColumnRequirements.preferred;
+      else
+        span = super.getPreferredSpan(axis);
       return span;
     }
 
@@ -151,6 +171,14 @@ class TableView
       super(el, Y_AXIS);
     }
 
+    protected SizeRequirements calculateMajorAxisRequirements(int axis,
+                                                            SizeRequirements r)
+    {
+      r = super.calculateMajorAxisRequirements(axis, r);
+      r.maximum = Integer.MAX_VALUE;
+      return r;
+    }
+
     /**
      * Overridden to fetch the columnSpan attibute.
      */