summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@klomp.org>2006-12-04 22:09:34 +0000
committerMark Wielaard <mark@klomp.org>2006-12-04 22:09:34 +0000
commit68066f90e1e2c7df5f7e6c701e54490f82490834 (patch)
treebb65acbbb9e35aa83004eaed09f8d9a086c27474
parent64f37d32c0b724578d67ff4084fb786518b96065 (diff)
downloadclasspath-68066f90e1e2c7df5f7e6c701e54490f82490834.tar.gz
2006-12-04 Roman Kennke <kennke@aicas.com>
* javax/swing/text/BoxView.java (paint): Replaced painting algorithm with more simple and more reliable painting of the box. * javax/swing/text/html/BlockView.java (PositionInfo): New inner class. Stores additional CSS positioning information. (positionInfo): New field. (BlockView): Initialize positionInfo field. (fetchLayoutInfo): New helper method. Fetches additional CSS positioning information. (layoutMajorAxis): Perform additional CSS layout. (layoutMinorAxis): Perform additional CSS layout. (positionView): New helper method. (replace): Overridden to fetch additional layout information. * javax/swing/text/html/CSS.java (Attribute.POSITION): New field. (Attribute.LEFT): New field. (Attribute.RIGHT): New field. (Attribute.TOP): New field. (Attribute.BOTTOM): New field. (getValue): Create Length for left, right, top and bottom attributes. 2006-12-04 Roman Kennke <kennke@aicas.com> * gnu/javax/swing/text/html/parser/support/Parser.java (Sgml): Consume any whitespace that immediately follows and sgml insertion. (parseDocument): Consume any initial whitespace.
-rw-r--r--ChangeLog32
-rw-r--r--javax/swing/text/html/CSS.java1
2 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 995d5977b..b8aafeb09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2006-12-04 Roman Kennke <kennke@aicas.com>
+
+ * javax/swing/text/BoxView.java
+ (paint): Replaced painting algorithm with more simple and more
+ reliable painting of the box.
+ * javax/swing/text/html/BlockView.java
+ (PositionInfo): New inner class. Stores additional CSS
+ positioning information.
+ (positionInfo): New field.
+ (BlockView): Initialize positionInfo field.
+ (fetchLayoutInfo): New helper method. Fetches additional
+ CSS positioning information.
+ (layoutMajorAxis): Perform additional CSS layout.
+ (layoutMinorAxis): Perform additional CSS layout.
+ (positionView): New helper method.
+ (replace): Overridden to fetch additional layout information.
+ * javax/swing/text/html/CSS.java
+ (Attribute.POSITION): New field.
+ (Attribute.LEFT): New field.
+ (Attribute.RIGHT): New field.
+ (Attribute.TOP): New field.
+ (Attribute.BOTTOM): New field.
+ (getValue): Create Length for left, right, top and bottom
+ attributes.
+
+2006-12-04 Roman Kennke <kennke@aicas.com>
+
+ * gnu/javax/swing/text/html/parser/support/Parser.java
+ (Sgml): Consume any whitespace that immediately follows
+ and sgml insertion.
+ (parseDocument): Consume any initial whitespace.
+
2006-12-03 Mark Wielaard <mark@klomp.org>
* gnu/javax/management/Server.java (beans): Initialize.
diff --git a/javax/swing/text/html/CSS.java b/javax/swing/text/html/CSS.java
index 77f94a608..294d47fb2 100644
--- a/javax/swing/text/html/CSS.java
+++ b/javax/swing/text/html/CSS.java
@@ -645,6 +645,7 @@ public class CSS implements Serializable
if (numTokens == 1)
{
Length l = new Length(tokens.nextToken());
+ System.err.println("margin: " + l);
atts.addAttribute(Attribute.MARGIN_BOTTOM, l);
atts.addAttribute(Attribute.MARGIN_LEFT, l);
atts.addAttribute(Attribute.MARGIN_RIGHT, l);