changes for Rat

Author: Claudenw

pom.xml

@@ -26,7 +26,7 @@ limitations under the License.
   </parent>
 
   <artifactId>plexus-utils</artifactId>
-  <version>3.5.1</version>
+  <version>3.5.2-SNAPSHOT</version>
 
   <name>Plexus Common Utilities</name>
   <description>A collection of various utility classes to ease working with strings, files, command lines, XML and

src/main/java/org/codehaus/plexus/util/MatchPattern.java

@@ -60,6 +60,14 @@ private MatchPattern( String source, String separator )
 
     }
 
+    /**
+     * Gets the source pattern for this matchpattern.
+     * @return the source string without Ant or Regex pattern markers.
+     */
+    public String getSource() {
+        return source;
+    }
+
     public boolean matchPath( String str, boolean isCaseSensitive )
     {
         if ( regexPattern != null )
@@ -116,7 +124,7 @@ public boolean startsWith( String string )
         return source.startsWith( string );
     }
 
-    static String[] tokenizePathToString( String path, String separator )
+    public static String[] tokenizePathToString( String path, String separator )
     {
         List<String> ret = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer( path, separator );

src/main/java/org/codehaus/plexus/util/MatchPatterns.java

@@ -18,6 +18,19 @@ private MatchPatterns( MatchPattern[] patterns )
         this.patterns = patterns;
     }
 
+    /**
+     * Gets a list of enclosed MatchPattern sources.
+     * @return A list of enclosed MatchPattern sources.
+     */
+    public List<String> getSources() {
+        List<String> sources = new ArrayList<>();
+        for (MatchPattern pattern : patterns) {
+            sources.add(pattern.getSource());
+        }
+        return sources;
+    }
+
+
     /**
      * <p>Checks these MatchPatterns against a specified string.</p>
      * 

src/main/java/org/codehaus/plexus/util/SelectorUtils.java

@@ -149,7 +149,7 @@ public static boolean matchPatternStart( String pattern, String str, boolean isC
         }
     }
 
-    static boolean isAntPrefixedPattern( String pattern )
+    public static boolean isAntPrefixedPattern( String pattern )
     {
         return pattern.length() > ( ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
             && pattern.startsWith( ANT_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX );
@@ -281,7 +281,7 @@ private static String toOSRelatedPath( String pattern, String separator )
         return pattern;
     }
 
-    static boolean isRegexPrefixedPattern( String pattern )
+    public static boolean isRegexPrefixedPattern( String pattern )
     {
         return pattern.length() > ( REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
             && pattern.startsWith( REGEX_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX );
@@ -834,4 +834,22 @@ public static String removeWhitespace( String input )
         }
         return result.toString();
     }
+
+    /**
+     * Extract the pattern without the Regex or Ant prefix.
+     * @param pattern the pattern to extract from.
+     * @param separator the file name separator in the pattern.
+     * @return The pattern without the Regex or Ant prefix.
+     */
+    public static String extractPattern(final String pattern, final String separator) {
+        if (isRegexPrefixedPattern(pattern)) {
+            return pattern.substring(
+                    REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length());
+        } else {
+            String localPattern = isAntPrefixedPattern(pattern)
+                    ? pattern.substring(ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length())
+                    : pattern;
+            return toOSRelatedPath(localPattern, separator);
+        }
+    }
 }