summaryrefslogtreecommitdiff
path: root/javax/swing/text/html/TableView.java
diff options
context:
space:
mode:
authorRoman Kennke <roman@kennke.org>2006-11-11 11:02:07 +0000
committerRoman Kennke <roman@kennke.org>2006-11-11 11:02:07 +0000
commitd6468560da4a79c4d09bbf7b62598ad2bf7d9b99 (patch)
tree21e62cde57cb8a6728c8a5f56da10deb1eb0847a /javax/swing/text/html/TableView.java
parent5a7231e58f2b64cd18389479181b89e8da7e1bae (diff)
downloadclasspath-d6468560da4a79c4d09bbf7b62598ad2bf7d9b99.tar.gz
2006-11-11 Roman Kennke <kennke@aicas.com>
* gnu/javax/swing/text/html/css/CSSColor.java (isValidColor): New helper method. Checks strings if they form a valid color value. * gnu/javax/swing/text/html/css/Length.java (Length): Catch number format exceptions. * javax/swing/text/html/CSS.java (addInternal): New method. Checks for shorthand CSS attributes and parses them. (parseBackgroundShorthand): New method. Parses the background shorthand attribute. * javax/swing/text/html/HTMLDocument.java (HTMLReader.LinkAction): Made class a subclass of HiddenAction. (HTMLReader.LinkAction.start): Implemented to load the linked stylesheet. (HTMLReader.LinkAction.end): Removed. This is not needed. * javax/swing/text/html/StyleSheet.java (CSSStyleSheetParserCallback.declaration): Push declaration through CSS.addInternal() to parse shorthand attributes. (addCSSAttribute): Push declaration through CSS.addInternal() to parse shorthand attributes. (importStyleSheet): Implemented. This adds a stylesheet from an URL. * javax/swing/text/html/TableView.java (calculateColumnRequirements): Increase column index for non CellView children to avoid endless loop. * javax/swing/text/CompositeView.java (setParent): Comparen with numChildren not with real arraylength.
Diffstat (limited to 'javax/swing/text/html/TableView.java')
-rw-r--r--javax/swing/text/html/TableView.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/javax/swing/text/html/TableView.java b/javax/swing/text/html/TableView.java
index ba959b589..2bd11ffcf 100644
--- a/javax/swing/text/html/TableView.java
+++ b/javax/swing/text/html/TableView.java
@@ -467,6 +467,8 @@ class TableView
}
c += colSpan;
}
+ else
+ c++;
}
// Update the total requirements as follows: