Skip to content

Commit 34b08cd

Browse files
author
Benoit Lagae
committed
Delete duplicate package that were moved to SXP
DEVSIX-1955
1 parent 5ebd561 commit 34b08cd

File tree

393 files changed

+418
-50414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

393 files changed

+418
-50414
lines changed

‎src/main/java/com/itextpdf/html2pdf/ConverterProperties.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ This file is part of the iText (R) project.
4545

4646
import com.itextpdf.html2pdf.attach.ITagWorkerFactory;
4747
import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
48+
import com.itextpdf.html2pdf.css.CssConstants;
4849
import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
49-
import com.itextpdf.html2pdf.css.media.MediaDeviceDescription;
5050
import com.itextpdf.kernel.counter.event.IMetaInfo;
5151
import com.itextpdf.layout.font.FontProvider;
52+
import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
5253

5354
/**
5455
* Properties that will be used by the converter.

‎src/main/java/com/itextpdf/html2pdf/HtmlConverter.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ This file is part of the iText (R) project.
4545

4646
import com.itextpdf.html2pdf.attach.Attacher;
4747
import com.itextpdf.html2pdf.exception.Html2PdfException;
48-
import com.itextpdf.html2pdf.html.IHtmlParser;
49-
import com.itextpdf.html2pdf.html.impl.jsoup.JsoupHtmlParser;
50-
import com.itextpdf.html2pdf.html.node.IDocumentNode;
5148
import com.itextpdf.io.util.FileUtil;
5249
import com.itextpdf.kernel.counter.event.IMetaInfo;
5350
import com.itextpdf.kernel.pdf.DocumentProperties;
@@ -59,6 +56,9 @@ This file is part of the iText (R) project.
5956
import java.lang.reflect.Constructor;
6057
import java.lang.reflect.Method;
6158
import com.itextpdf.kernel.Version;
59+
import com.itextpdf.styledxmlparser.IXmlParser;
60+
import com.itextpdf.styledxmlparser.node.IDocumentNode;
61+
import com.itextpdf.styledxmlparser.node.impl.jsoup.JsoupHtmlParser;
6262

6363
import java.io.File;
6464
import java.io.FileInputStream;
@@ -367,7 +367,7 @@ public static Document convertToDocument(String html, PdfDocument pdfDocument, C
367367
if (pdfDocument.getReader() != null) {
368368
throw new Html2PdfException(Html2PdfException.PdfDocumentShouldBeInWritingMode);
369369
}
370-
IHtmlParser parser = new JsoupHtmlParser();
370+
IXmlParser parser = new JsoupHtmlParser();
371371
IDocumentNode doc = parser.parse(html);
372372
return Attacher.attach(doc, pdfDocument, converterProperties);
373373
}
@@ -423,7 +423,7 @@ public static Document convertToDocument(InputStream htmlStream, PdfDocument pdf
423423
if (pdfDocument.getReader() != null) {
424424
throw new Html2PdfException(Html2PdfException.PdfDocumentShouldBeInWritingMode);
425425
}
426-
IHtmlParser parser = new JsoupHtmlParser();
426+
IXmlParser parser = new JsoupHtmlParser();
427427
IDocumentNode doc = parser.parse(htmlStream, converterProperties != null ? converterProperties.getCharset() : null);
428428
return Attacher.attach(doc, pdfDocument, converterProperties);
429429
}
@@ -499,7 +499,7 @@ public static List<IElement> convertToElements(String html, ConverterProperties
499499
}
500500
}
501501

502-
IHtmlParser parser = new JsoupHtmlParser();
502+
IXmlParser parser = new JsoupHtmlParser();
503503
IDocumentNode doc = parser.parse(html);
504504
return Attacher.attach(doc, converterProperties);
505505
}
@@ -551,7 +551,7 @@ public static List<IElement> convertToElements(InputStream htmlStream, Converter
551551
}
552552
}
553553

554-
IHtmlParser parser = new JsoupHtmlParser();
554+
IXmlParser parser = new JsoupHtmlParser();
555555
IDocumentNode doc = parser.parse(htmlStream, converterProperties != null ? converterProperties.getCharset() : null);
556556
return Attacher.attach(doc, converterProperties);
557557
}

‎src/main/java/com/itextpdf/html2pdf/LogMessageConstant.java‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,6 @@ public final class LogMessageConstant {
9696
public static final String PAGE_SIZE_VALUE_IS_INVALID = "Page size value {0} is invalid.";
9797
/** The Constant QUOTES_PROPERTY_INVALID. */
9898
public static final String QUOTES_PROPERTY_INVALID = "Quote property \"{0}\" is invalid. It should contain even number of <string> values.";
99-
/** The Constant QUOTE_IS_NOT_CLOSED_IN_CSS_EXPRESSION. */
100-
public static final String QUOTE_IS_NOT_CLOSED_IN_CSS_EXPRESSION = "The quote is not closed in css expression: {0}";
10199
/** The Constant RULE_IS_NOT_SUPPORTED. */
102100
public static final String RULE_IS_NOT_SUPPORTED = "The rule @{0} is unsupported. All selectors in this rule will be ignored.";
103101
/** The Constant TEXT_DECORATION_BLINK_NOT_SUPPORTED. */
@@ -114,21 +112,12 @@ public final class LogMessageConstant {
114112
public static final String UNABLE_TO_RESOLVE_FONT = "Unable to resolve font: {0}. The default one will be used instead";
115113
/** The Constant UNABLE_TO_RETRIEVE_FONT. */
116114
public static final String UNABLE_TO_RETRIEVE_FONT = "Unable to retrieve font:\n {0}";
117-
/** The Constant UNABLE_TO_RETRIEVE_IMAGE_FROM_BASE64_SOURCE. */
118-
public static final String UNABLE_TO_RETRIEVE_IMAGE_FROM_BASE64_SOURCE = "Unable to retrieve image from given base64 source string";
119115
/** The Constant UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI. */
120116
public static final String UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI = "Unable to retrieve image with given base URI ({0}) and image source path ({1})";
121117
/** The Constant UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI. */
122118
public static final String UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI = "Unable to retrieve stream with given base URI ({0}) and source path ({1})";
123-
/** The Constant UNKNOWN_ABSOLUTE_METRIC_LENGTH_PARSED. */
124-
public static final String UNKNOWN_ABSOLUTE_METRIC_LENGTH_PARSED = "Unknown absolute metric length parsed \"{0}\".";
125119
/** The Constant UNKNOWN_MARGIN_BOX_CHILD. */
126120
public static final String UNKNOWN_MARGIN_BOX_CHILD = "Unknown margin box child";
127-
public static final String UNSUPPORTED_PSEUDO_CSS_SELECTOR = "Unsupported pseudo css selector: {0}";
128-
public static final String URL_IS_EMPTY_IN_CSS_EXPRESSION = "url function is empty in expression:{0}";
129-
public static final String URL_IS_NOT_CLOSED_IN_CSS_EXPRESSION = "url function is not properly closed in expression:{0}";
130-
/** The Constant WAS_NOT_ABLE_TO_DEFINE_BACKGROUND_CSS_SHORTHAND_PROPERTIES. */
131-
public static final String WAS_NOT_ABLE_TO_DEFINE_BACKGROUND_CSS_SHORTHAND_PROPERTIES = "Was not able to define one of the background CSS shorthand properties: {0}";
132121
/** The Constant WORKER_UNABLE_TO_PROCESS_IT_S_TEXT_CONTENT. */
133122
public static final String WORKER_UNABLE_TO_PROCESS_IT_S_TEXT_CONTENT = "Worker of type {0} unable to process it's text content";
134123
/** The Constant WORKER_UNABLE_TO_PROCESS_OTHER_WORKER. */

‎src/main/java/com/itextpdf/html2pdf/PortUtil.java‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎src/main/java/com/itextpdf/html2pdf/attach/Attacher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ This file is part of the iText (R) project.
4444

4545
import com.itextpdf.html2pdf.ConverterProperties;
4646
import com.itextpdf.html2pdf.attach.impl.DefaultHtmlProcessor;
47-
import com.itextpdf.html2pdf.html.node.IDocumentNode;
4847
import com.itextpdf.kernel.pdf.PdfDocument;
4948
import com.itextpdf.layout.Document;
5049
import com.itextpdf.layout.element.IElement;
50+
import com.itextpdf.styledxmlparser.node.IDocumentNode;
5151

5252
import java.util.List;
5353

‎src/main/java/com/itextpdf/html2pdf/attach/IHtmlProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ This file is part of the iText (R) project.
4242
*/
4343
package com.itextpdf.html2pdf.attach;
4444

45-
import com.itextpdf.html2pdf.html.node.INode;
4645
import com.itextpdf.kernel.pdf.PdfDocument;
4746
import com.itextpdf.layout.Document;
4847
import com.itextpdf.layout.element.IElement;
48+
import com.itextpdf.styledxmlparser.node.INode;
4949

5050
import java.util.List;
5151

‎src/main/java/com/itextpdf/html2pdf/attach/ITagWorker.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ This file is part of the iText (R) project.
4242
*/
4343
package com.itextpdf.html2pdf.attach;
4444

45-
import com.itextpdf.html2pdf.html.node.IElementNode;
4645
import com.itextpdf.layout.IPropertyContainer;
46+
import com.itextpdf.styledxmlparser.node.IElementNode;
4747

4848
/**
4949
* Interface for all the tag worker implementations.

‎src/main/java/com/itextpdf/html2pdf/attach/ITagWorkerFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
4242
*/
4343
package com.itextpdf.html2pdf.attach;
4444

45-
import com.itextpdf.html2pdf.html.node.IElementNode;
45+
import com.itextpdf.styledxmlparser.node.IElementNode;
4646

4747
/**
4848
* {@link ITagWorkerFactory} interface is used for instantiating new {@link ITagWorker} objects.

‎src/main/java/com/itextpdf/html2pdf/attach/ProcessorContext.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ This file is part of the iText (R) project.
4848
import com.itextpdf.html2pdf.attach.impl.LinkContext;
4949
import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
5050
import com.itextpdf.html2pdf.css.apply.impl.DefaultCssApplierFactory;
51-
import com.itextpdf.html2pdf.css.media.MediaDeviceDescription;
5251
import com.itextpdf.html2pdf.css.resolve.CssContext;
5352
import com.itextpdf.html2pdf.resolver.font.DefaultFontProvider;
5453
import com.itextpdf.html2pdf.resolver.form.FormFieldNameResolver;
5554
import com.itextpdf.html2pdf.resolver.form.RadioCheckResolver;
56-
import com.itextpdf.html2pdf.resolver.resource.ResourceResolver;
5755
import com.itextpdf.io.font.FontProgram;
5856
import com.itextpdf.kernel.counter.event.IMetaInfo;
5957
import com.itextpdf.kernel.pdf.PdfDocument;
6058
import com.itextpdf.layout.font.FontInfo;
6159
import com.itextpdf.layout.font.FontProvider;
6260
import com.itextpdf.layout.font.FontSet;
61+
import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
62+
import com.itextpdf.styledxmlparser.resolver.resource.ResourceResolver;
6363

6464
/**
6565
* Keeps track of the context of the processor.

‎src/main/java/com/itextpdf/html2pdf/attach/impl/DefaultHtmlProcessor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,12 @@ This file is part of the iText (R) project.
5555
import com.itextpdf.html2pdf.attach.impl.tags.RunningElementTagWorker;
5656
import com.itextpdf.html2pdf.attach.util.LinkHelper;
5757
import com.itextpdf.html2pdf.css.CssConstants;
58-
import com.itextpdf.html2pdf.css.CssFontFaceRule;
5958
import com.itextpdf.html2pdf.css.apply.ICssApplier;
6059
import com.itextpdf.html2pdf.css.apply.util.PageBreakApplierUtil;
61-
import com.itextpdf.html2pdf.css.pseudo.CssPseudoElementNode;
62-
import com.itextpdf.html2pdf.css.pseudo.CssPseudoElementUtil;
6360
import com.itextpdf.html2pdf.css.resolve.DefaultCssResolver;
64-
import com.itextpdf.html2pdf.css.resolve.ICssResolver;
6561
import com.itextpdf.html2pdf.events.PdfHtmlEvent;
6662
import com.itextpdf.html2pdf.exception.Html2PdfException;
6763
import com.itextpdf.html2pdf.html.TagConstants;
68-
import com.itextpdf.html2pdf.html.node.IElementNode;
69-
import com.itextpdf.html2pdf.html.node.INode;
70-
import com.itextpdf.html2pdf.html.node.ITextNode;
7164
import com.itextpdf.io.font.FontProgram;
7265
import com.itextpdf.io.font.FontProgramFactory;
7366
import com.itextpdf.io.font.PdfEncodings;
@@ -80,6 +73,13 @@ This file is part of the iText (R) project.
8073
import com.itextpdf.layout.element.Div;
8174
import com.itextpdf.layout.font.FontInfo;
8275
import com.itextpdf.layout.property.Property;
76+
import com.itextpdf.styledxmlparser.css.CssFontFaceRule;
77+
import com.itextpdf.styledxmlparser.css.ICssResolver;
78+
import com.itextpdf.styledxmlparser.css.pseudo.CssPseudoElementNode;
79+
import com.itextpdf.styledxmlparser.css.pseudo.CssPseudoElementUtil;
80+
import com.itextpdf.styledxmlparser.node.IElementNode;
81+
import com.itextpdf.styledxmlparser.node.INode;
82+
import com.itextpdf.styledxmlparser.node.ITextNode;
8383
import org.slf4j.Logger;
8484
import org.slf4j.LoggerFactory;
8585

0 commit comments

Comments
 (0)