Skip to content

Commit e73eb26

Browse files
author
Kate Ivanova
committed
Clean up manual porting for java's Matcher
DEVSIX-4850 Autoported commit. Original commit hash: [b1a36b183] Manual files: kernel/src/main/java/com/itextpdf/kernel/pdf/canvas/parser/listener/RegexBasedLocationExtractionStrategy.java styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/jsoup/PortUtil.java styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/jsoup/helper/DataUtil.java svg/src/main/java/com/itextpdf/svg/utils/SvgRegexUtils.java
1 parent 2da6519 commit e73eb26

File tree

6 files changed

+10
-74
lines changed

6 files changed

+10
-74
lines changed

itext/itext.styledxmlparser/itext/styledxmlparser/jsoup/PortUtil.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ public static FileStream GetReadOnlyRandomAccesFile(FileInfo file) {
5858
return file.Open(FileMode.Open, FileAccess.Read);
5959
}
6060

61+
[System.ObsoleteAttribute(@"use iText.IO.Util.Matcher.Find")]
6162
public static bool HasMatch(Regex pattern, String input) {
6263

6364
return pattern.IsMatch(input);
@@ -84,6 +85,7 @@ public static bool CharsetIsSupported(string charset) {
8485
}
8586
}
8687

88+
[System.ObsoleteAttribute(@"use iText.IO.Util.Matcher.Find")]
8789
public static bool IsSuccessful(Match m) {
8890
return m.Success;
8991
}

itext/itext.styledxmlparser/itext/styledxmlparser/jsoup/helper/DataUtil.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,9 @@ internal static String GetCharsetFromContentType(String contentType) {
234234
if (contentType == null) {
235235
return null;
236236
}
237-
Match m = iText.IO.Util.StringUtil.Match(charsetPattern, contentType);
238-
if (PortUtil.IsSuccessful(m)) {
239-
String charset = iText.IO.Util.StringUtil.Group(m, 1).Trim();
237+
Matcher m = iText.IO.Util.Matcher.Match(charsetPattern, contentType);
238+
if (m.Find()) {
239+
String charset = m.Group(1).Trim();
240240
charset = charset.Replace("charset=", "");
241241
return ValidateCharset(charset);
242242
}

itext/itext.styledxmlparser/itext/styledxmlparser/jsoup/select/Evaluator.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ public AttributeWithValueMatching(String key, Regex pattern) {
256256

257257
public override bool Matches(iText.StyledXmlParser.Jsoup.Nodes.Element root, iText.StyledXmlParser.Jsoup.Nodes.Element
258258
element) {
259-
return element.HasAttr(key) && PortUtil.HasMatch(pattern, element.Attr(key));
259+
return element.HasAttr(key) && iText.IO.Util.Matcher.Match(pattern, element.Attr(key)).Find();
260260
}
261261

262262
public override String ToString() {
@@ -643,7 +643,7 @@ public MatchesOwn(Regex pattern) {
643643

644644
public override bool Matches(iText.StyledXmlParser.Jsoup.Nodes.Element root, iText.StyledXmlParser.Jsoup.Nodes.Element
645645
element) {
646-
return PortUtil.HasMatch(pattern, element.OwnText());
646+
return iText.IO.Util.Matcher.Match(pattern, element.OwnText()).Find();
647647
}
648648

649649
public override String ToString() {
@@ -662,7 +662,7 @@ public MatchesElement(Regex pattern) {
662662

663663
public override bool Matches(iText.StyledXmlParser.Jsoup.Nodes.Element root, iText.StyledXmlParser.Jsoup.Nodes.Element
664664
element) {
665-
return PortUtil.HasMatch(pattern, element.Text());
665+
return iText.IO.Util.Matcher.Match(pattern, element.Text()).Find();
666666
}
667667

668668
public override String ToString() {

itext/itext.svg/itext/svg/renderers/impl/PathSvgNodeRenderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ private static String[] Concatenate(String[] first, String[] second) {
366366
}
367367

368368
internal virtual bool ContainsInvalidAttributes(String attributes) {
369-
return SvgRegexUtils.ContainsAtLeastOneMatch(invalidRegexPattern, attributes);
369+
return iText.IO.Util.Matcher.Match(invalidRegexPattern, attributes).Find();
370370
}
371371

372372
internal virtual ICollection<String> ParsePathOperations() {

itext/itext.svg/itext/svg/utils/SvgRegexUtils.cs

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

port-hash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
e93ce2346fa7eecb5f4be722d65f1f19b3a6f35e
1+
b1a36b18324a4ae185ab5e272427d0c17ba48765

0 commit comments

Comments
 (0)