Skip to content

Commit 09bbe64

Browse files
Samuel HuylebroeckiText-CI
authored andcommitted
Deprecate VISIBLE and OVERFLOW in CssConstants
Deprecated in favour of the same constants in CommonCssConstants in Styled-Xml-parser DEVSIX-2240
1 parent 908db28 commit 09bbe64

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/main/java/com/itextpdf/html2pdf/attach/util/WaitingInlineElementsHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ This file is part of the iText (R) project.
5656
import com.itextpdf.layout.element.ListItem;
5757
import com.itextpdf.layout.element.Paragraph;
5858
import com.itextpdf.layout.element.Text;
59+
import com.itextpdf.styledxmlparser.css.CommonCssConstants;
5960
import com.itextpdf.styledxmlparser.util.WhiteSpaceUtil;
6061

6162
import java.util.ArrayList;
@@ -178,7 +179,7 @@ public void flushHangingLeaves(IPropertyContainer container) {
178179
Paragraph p = createLeavesContainer();
179180
if (p != null) {
180181
Map<String, String> map = new HashMap<>();
181-
map.put(CssConstants.OVERFLOW, CssConstants.VISIBLE);
182+
map.put(CssConstants.OVERFLOW, CommonCssConstants.VISIBLE);
182183
OverflowApplierUtil.applyOverflow(map, p);
183184
if (container instanceof Document) {
184185
((Document) container).add(p);

src/main/java/com/itextpdf/html2pdf/css/CssConstants.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public class CssConstants extends CommonCssConstants {
9494
/** The Constant OUTLINE_OFFSET. */
9595
public static final String OUTLINE_OFFSET = "outline-offset";
9696

97-
/** The Constant OVERFLOW. */
97+
/** The Constant OVERFLOW. @Deprecated in favour of CommonCssConstants.OVERFLOW */
98+
@Deprecated
9899
public static final String OVERFLOW = "overflow";
99100

100101
/** The Constant OVERFLOW_X. */
@@ -121,7 +122,10 @@ public class CssConstants extends CommonCssConstants {
121122
/** The Constant VERTICAL_ALIGN. */
122123
public static final String VERTICAL_ALIGN = "vertical-align";
123124

124-
/** The Constant VISIBLE. */
125+
/** The Constant VISIBLE.
126+
* @deprecated in favour of StyledXmlParser
127+
*/
128+
@Deprecated
125129
public static final String VISIBLE = "visible";
126130

127131
// property values
@@ -262,7 +266,7 @@ public class CssConstants extends CommonCssConstants {
262266

263267
/** The Constant OVERFLOW_VALUES. */
264268
public static final Set<String> OVERFLOW_VALUES = new HashSet<>(
265-
Arrays.asList(new String[] {VISIBLE, HIDDEN, SCROLL, AUTO}));
269+
Arrays.asList(new String[] {CommonCssConstants.VISIBLE, HIDDEN, SCROLL, AUTO}));
266270

267271
// pseudo-elements
268272

src/test/java/com/itextpdf/html2pdf/css/PageRuleTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ This file is part of the iText (R) project.
6363
import com.itextpdf.layout.Document;
6464
import com.itextpdf.layout.element.Image;
6565
import com.itextpdf.layout.tagging.IAccessibleElement;
66+
import com.itextpdf.styledxmlparser.css.CommonCssConstants;
6667
import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
6768
import com.itextpdf.styledxmlparser.css.page.PageMarginBoxContextNode;
6869
import com.itextpdf.styledxmlparser.node.IElementNode;
@@ -267,7 +268,7 @@ private static class CustomOverflowPageMarginBoxCssApplier extends PageMarginBox
267268
public void apply(ProcessorContext context, IStylesContainer stylesContainer, ITagWorker tagWorker) {
268269
Map<String, String> styles = stylesContainer.getStyles();
269270
if (styles.get(CssConstants.OVERFLOW) == null) {
270-
styles.put(CssConstants.OVERFLOW, CssConstants.VISIBLE);
271+
styles.put(CssConstants.OVERFLOW, CommonCssConstants.VISIBLE);
271272
}
272273
super.apply(context, stylesContainer, tagWorker);
273274
}

0 commit comments

Comments
 (0)