Clean up manual porting for java's Matcher

DEVSIX-4850

Author: Kate Ivanova

kernel/src/main/java/com/itextpdf/kernel/pdf/canvas/parser/listener/RegexBasedLocationExtractionStrategy.java

@@ -89,7 +89,7 @@ public Collection<IPdfTextLocation> getResultantLocations() {
             Integer startIndex = getStartIndex(txt.indexMap, mat.start(), txt.text);
             Integer endIndex = getEndIndex(txt.indexMap, mat.end() - 1);
             if (startIndex != null && endIndex != null && startIndex <= endIndex) {
-                for (Rectangle r : toRectangles(parseResult.subList(startIndex, endIndex + 1))) {
+                for (Rectangle r : toRectangles(parseResult.subList(startIndex.intValue(), endIndex.intValue() + 1))) {
                     retval.add(new DefaultPdfTextLocation(0, r, mat.group(0)));
                 }
             }

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/jsoup/PortUtil.java

@@ -54,6 +54,10 @@ public class PortUtil {
     public static final String escapedSingleBracket = "''";
     public static final String signedNumberFormat = ",number,+#;-#";
 
+    /**
+     * @deprecated use {@link Matcher#find()} instead
+     * */
+    @Deprecated
     public static boolean hasMatch(Pattern pattern, String input) {
         return pattern.matcher(input).find();
     }
@@ -70,6 +74,10 @@ public static RandomAccessFile getReadOnlyRandomAccesFile(File file)throws FileN
         return new RandomAccessFile(file, "r");
     }
 
+    /**
+     * @deprecated use {@link Matcher#find()} instead
+     * */
+    @Deprecated
     public static boolean isSuccessful(Matcher m) {
         return m.find();
     }

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/jsoup/helper/DataUtil.java

@@ -241,7 +241,7 @@ static ByteBuffer emptyByteBuffer() {
     static String getCharsetFromContentType(String contentType) {
         if (contentType == null) return null;
         Matcher m = charsetPattern.matcher(contentType);
-        if (PortUtil.isSuccessful(m)) {
+        if (m.find()) {
             String charset = m.group(1).trim();
             charset = charset.replace("charset=", "");
             return validateCharset(charset);

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/jsoup/select/Evaluator.java

@@ -302,7 +302,7 @@ public AttributeWithValueMatching(String key, Pattern pattern) {
 
         @Override
         public boolean matches(Element root, Element element) {
-            return element.hasAttr(key) && PortUtil.hasMatch(pattern, element.attr(key));
+            return element.hasAttr(key) && pattern.matcher(element.attr(key)).find();
         }
 
         @Override
@@ -715,7 +715,7 @@ public Matches(Pattern pattern) {
 
         @Override
         public boolean matches(Element root, Element element) {
-            return PortUtil.hasMatch(pattern, element.text());
+            return pattern.matcher(element.text()).find();
         }
 
         @Override
@@ -736,7 +736,7 @@ public MatchesOwn(Pattern pattern) {
 
         @Override
         public boolean matches(Element root, Element element) {
-            return PortUtil.hasMatch(pattern, element.ownText());
+            return pattern.matcher(element.ownText()).find();
         }
 
         @Override

svg/src/main/java/com/itextpdf/svg/renderers/impl/PathSvgNodeRenderer.java

@@ -64,7 +64,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.svg.renderers.path.impl.SmoothSCurveTo;
 import com.itextpdf.svg.utils.SvgCoordinateUtils;
 import com.itextpdf.svg.utils.SvgCssUtils;
-import com.itextpdf.svg.utils.SvgRegexUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -301,7 +300,7 @@ private static String[] concatenate(String[] first, String[] second) {
 
 
     boolean containsInvalidAttributes(String attributes) {
-        return SvgRegexUtils.containsAtLeastOneMatch(invalidRegexPattern, attributes);
+        return invalidRegexPattern.matcher(attributes).find();
     }
 
     Collection<String> parsePathOperations() {