Author: krosenvold
Date: Sun Oct 14 20:35:47 2012
New Revision: 1398130

URL: http://svn.apache.org/viewvc?rev=1398130&view=rev
Log:
o Reduced visibilit/removed unused stuff

Modified:
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
    
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/Os.java
 Sun Oct 14 20:35:47 2012
@@ -211,7 +211,7 @@ public class Os
      *          <li>os/400</li>
      *          </ul>
      */
-    public void setFamily( String f )
+    private void setFamily( String f )
     {
         family = f.toLowerCase( Locale.ENGLISH );
     }

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/CommandLineUtils.java
 Sun Oct 14 20:35:47 2012
@@ -22,14 +22,12 @@ package org.apache.maven.shared.utils.cl
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 import java.util.StringTokenizer;
-
 import org.apache.maven.shared.utils.Os;
 import org.apache.maven.shared.utils.StringUtils;
 
@@ -39,13 +37,6 @@ import org.apache.maven.shared.utils.Str
  */
 public abstract class CommandLineUtils
 {
-    /**
-     * Sixteen-bit Unicode Transformation Format, little-endian byte order.
-     * Every implementation of the Java platform is required to support this 
character encoding.
-     *
-     * @see java.nio.charset.Charset
-     */
-    private static final String UTF_16LE = "UTF-16LE";
 
 
     public static class StringStreamConsumer
@@ -437,22 +428,6 @@ public abstract class CommandLineUtils
         return result.toString();
     }
 
-    private static Method getEnvMethod()
-    {
-        try
-        {
-            return System.class.getMethod( "getenv" );
-        }
-        catch ( NoSuchMethodException e )
-        {
-            return null;
-        }
-        catch ( SecurityException e )
-        {
-            return null;
-        }
-    }
-
     static Properties ensureCaseSensitivity( Map<String, String> envs, boolean 
preserveKeyCase )
         throws IllegalAccessException, IllegalArgumentException, 
InvocationTargetException
     {

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
 Sun Oct 14 20:35:47 2012
@@ -301,9 +301,10 @@ public class Commandline
 
     public Object clone()
     {
-        Commandline c = new Commandline( (Shell) shell.clone() );
-        c.addArguments( getArguments() );
-        return c;
+        throw new RuntimeException( "Do we ever clone a commandline?" );
+/*        Commandline c = new Commandline( (Shell) shell.clone() );
+       c.addArguments( getArguments() );
+        return c;*/
     }
 
     /**

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/shell/Shell.java
 Sun Oct 14 20:35:47 2012
@@ -56,12 +56,8 @@ public class Shell
 
     private boolean quotedExecutableEnabled = true;
 
-    private boolean doubleQuotedArgumentEscaped = false;
-
     private boolean singleQuotedArgumentEscaped = false;
 
-    private boolean doubleQuotedExecutableEscaped = false;
-
     private boolean singleQuotedExecutableEscaped = false;
 
     private char argQuoteDelimiter = '\"';
@@ -71,7 +67,7 @@ public class Shell
     /**
      * Set the command to execute the shell (eg. COMMAND.COM, /bin/bash,...)
      *
-     * @param shellCommand
+     * @param shellCommand The command
      */
     void setShellCommand( String shellCommand )
     {
@@ -81,7 +77,7 @@ public class Shell
     /**
      * Get the command to execute the shell
      *
-     * @return
+     * @return  The command
      */
     String getShellCommand()
     {
@@ -103,7 +99,7 @@ public class Shell
     /**
      * Get the shell arguments
      *
-     * @return
+     * @return  The arguments
      */
     String[] getShellArgs()
     {
@@ -211,7 +207,7 @@ public class Shell
 
     protected boolean isDoubleQuotedArgumentEscaped()
     {
-        return doubleQuotedArgumentEscaped;
+        return false;
     }
 
     protected boolean isSingleQuotedArgumentEscaped()
@@ -221,7 +217,7 @@ public class Shell
 
     boolean isDoubleQuotedExecutableEscaped()
     {
-        return doubleQuotedExecutableEscaped;
+        return false;
     }
 
     boolean isSingleQuotedExecutableEscaped()
@@ -283,11 +279,6 @@ public class Shell
         return shellArgs;
     }
 
-    void addShellArg( String arg )
-    {
-        shellArgs.add( arg );
-    }
-
     public void setQuotedArgumentsEnabled( boolean quotedArgumentsEnabled )
     {
         this.quotedArgumentsEnabled = quotedArgumentsEnabled;
@@ -359,21 +350,12 @@ public class Shell
 
     public Object clone()
     {
-        Shell shell = new Shell();
+        throw new RuntimeException( "Do we ever clone this?" );
+/*        Shell shell = new Shell();
         shell.setExecutable( getExecutable() );
         shell.setWorkingDirectory( getWorkingDirectory() );
         shell.setShellArgs( getShellArgs() );
-        return shell;
-    }
-
-    protected void setDoubleQuotedArgumentEscaped( boolean 
doubleQuotedArgumentEscaped )
-    {
-        this.doubleQuotedArgumentEscaped = doubleQuotedArgumentEscaped;
-    }
-
-    protected void setDoubleQuotedExecutableEscaped( boolean 
doubleQuotedExecutableEscaped )
-    {
-        this.doubleQuotedExecutableEscaped = doubleQuotedExecutableEscaped;
+        return shell;*/
     }
 
     void setSingleQuotedArgumentEscaped( boolean singleQuotedArgumentEscaped )

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ClassMap.java
 Sun Oct 14 20:35:47 2012
@@ -32,7 +32,7 @@ import java.util.Map;
  * @author <a href="mailto:ge...@optonline.net";>Geir Magnusson Jr.</a>
  * @version $Id$
  */
-class ClassMap
+public class ClassMap
 {
     private static final class CacheMiss
     {

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/IntrospectionException.java
 Sun Oct 14 20:35:47 2012
@@ -19,20 +19,10 @@ package org.apache.maven.shared.utils.in
  * under the License.
  */
 
-public class IntrospectionException
+class IntrospectionException
     extends Exception
 {
 
-    public IntrospectionException()
-    {
-        super();
-    }
-
-    public IntrospectionException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-
     public IntrospectionException( String message )
     {
         super( message );

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/MethodMap.java
 Sun Oct 14 20:35:47 2012
@@ -32,7 +32,7 @@ import java.util.Map;
  * @author <a href="mailto:szege...@freemail.hu";>Attila Szegedi</a>
  * @version $Id$
  */
-public class MethodMap
+class MethodMap
 {
     private static final int MORE_SPECIFIC = 0;
 
@@ -52,7 +52,7 @@ public class MethodMap
      *
      * @param method The method
      */
-    public void add( Method method )
+    void add( Method method )
     {
         String methodName = method.getName();
 
@@ -73,7 +73,7 @@ public class MethodMap
      * @param key The name of the method.
      * @return List list of methods
      */
-    public List<Method> get( String key )
+    List<Method> get( String key )
     {
         return methodByNameMap.get( key );
     }
@@ -106,7 +106,7 @@ public class MethodMap
      * @throws AmbiguousException if there is more than one maximally
      *                            specific applicable method
      */
-    public Method find( String methodName, Object... args )
+    Method find( String methodName, Object... args )
         throws AmbiguousException
     {
         List<Method> methodList = get( methodName );
@@ -137,7 +137,7 @@ public class MethodMap
      * simple distinguishable exception, used when
      * we run across ambiguous overloading
      */
-    public static class AmbiguousException
+    static class AmbiguousException
         extends Exception
     {
     }

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
 Sun Oct 14 20:35:47 2012
@@ -28,6 +28,9 @@ import java.util.regex.Pattern;
 import org.apache.maven.shared.utils.StringUtils;
 import 
org.apache.maven.shared.utils.introspection.MethodMap.AmbiguousException;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 
 /**
  * <p>Using simple dotted expressions to extract the values from an Object 
instance,
@@ -82,7 +85,7 @@ public class ReflectionValueExtractor
      * @return the object defined by the expression
      * @throws IntrospectionException if any
      */
-    public static Object evaluate( String expression, Object root )
+    public static Object evaluate( @Nonnull String expression, @Nullable 
Object root )
         throws IntrospectionException
     {
         return evaluate( expression, root, true );
@@ -103,7 +106,7 @@ public class ReflectionValueExtractor
      * @return the object defined by the expression
      * @throws IntrospectionException if any
      */
-    public static Object evaluate( String expression, Object root, boolean 
trimRootToken )
+    public static Object evaluate( @Nonnull String expression, @Nullable 
Object root, boolean trimRootToken )
         throws IntrospectionException
     {
         // if the root token refers to the supplied root object parameter, 
remove it.

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/DirectoryScanner.java
 Sun Oct 14 20:35:47 2012
@@ -29,6 +29,7 @@ import java.util.Set;
 import org.apache.maven.shared.utils.ArrayUtils;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Class for scanning a directory for files/directories which match certain 
criteria.
@@ -454,7 +455,7 @@ public class DirectoryScanner
         return diffFiles( oldFiles, filesIncluded.toArray( new 
String[filesIncluded.size()] ) );
     }
 
-    public static DirectoryScanResult diffFiles( String[] oldFiles, String[] 
newFiles )
+    public static DirectoryScanResult diffFiles( @Nullable String[] oldFiles, 
@Nullable  String[] newFiles )
     {
         Set<String> oldFileSet = arrayAsHashSet( oldFiles );
         Set<String> newFileSet = arrayAsHashSet( newFiles );
@@ -492,7 +493,7 @@ public class DirectoryScanner
      * @param array  The array
      * @return the filled HashSet of type T
      */
-    private static <T> Set<T> arrayAsHashSet( T[] array )
+    private static <T> Set<T> arrayAsHashSet( @Nullable T[] array )
     {
         if ( array == null || array.length == 0 )
         {
@@ -559,7 +560,7 @@ public class DirectoryScanner
      * @see #dirsExcluded
      * @see #slowScan
      */
-    void scandir( final File dir, final String vpath, final boolean fast )
+    void scandir( @Nonnull final File dir, @Nonnull final String vpath, final 
boolean fast )
     {
         String[] newfiles = dir.list();
 
@@ -755,7 +756,7 @@ public class DirectoryScanner
      * @return <code>true</code> when the name matches against the start of at 
least one include pattern, or
      *         <code>false</code> otherwise.
      */
-    boolean couldHoldIncluded( final String name )
+    boolean couldHoldIncluded( @Nonnull final String name )
     {
         return includesPatterns.matchesPatternStart( name, isCaseSensitive );
     }
@@ -767,7 +768,7 @@ public class DirectoryScanner
      * @return <code>true</code> when the name matches against at least one 
exclude pattern, or <code>false</code>
      *         otherwise.
      */
-    boolean isExcluded( final String name )
+    boolean isExcluded( @Nonnull final String name )
     {
         return excludesPatterns.matches( name, isCaseSensitive );
     }

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPattern.java
 Sun Oct 14 20:35:47 2012
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import javax.annotation.Nonnull;
+
 /**
  * Describes a match target for SelectorUtils.
  * <p/>
@@ -40,7 +42,7 @@ public class MatchPattern
 
     private final String[] tokenized;
 
-    private MatchPattern( String source, String separator )
+    private MatchPattern( @Nonnull String source, @Nonnull String separator )
     {
         regexPattern = SelectorUtils.isRegexPrefixedPattern( source ) ? 
source.substring(
             SelectorUtils.REGEX_HANDLER_PREFIX.length(),
@@ -79,7 +81,7 @@ public class MatchPattern
         }
     }
 
-    public boolean matchPatternStart( String str, boolean isCaseSensitive )
+    public boolean matchPatternStart( @Nonnull String str, boolean 
isCaseSensitive )
     {
         if ( regexPattern != null )
         {
@@ -108,7 +110,7 @@ public class MatchPattern
     }
 
 
-    static String[] tokenizePathToString( String path, String separator )
+    static String[] tokenizePathToString( @Nonnull String path, @Nonnull 
String separator )
     {
         List<String> ret = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer( path, separator );

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/MatchPatterns.java
 Sun Oct 14 20:35:47 2012
@@ -20,6 +20,8 @@ package org.apache.maven.shared.utils.io
 
 import java.io.File;
 
+import javax.annotation.Nonnull;
+
 /**
  * A list of patterns to be matched
  *
@@ -29,7 +31,7 @@ public class MatchPatterns
 {
     private final MatchPattern[] patterns;
 
-    private MatchPatterns( MatchPattern... patterns )
+    private MatchPatterns( @Nonnull MatchPattern... patterns )
     {
         this.patterns = patterns;
     }
@@ -43,7 +45,7 @@ public class MatchPatterns
      * @param isCaseSensitive If the comparison is case sensitive
      * @return true if any of the supplied patterns match
      */
-    public boolean matches( String name, boolean isCaseSensitive )
+    public boolean matches( @Nonnull String name, boolean isCaseSensitive )
     {
         String[] tokenized = MatchPattern.tokenizePathToString( name, 
File.separator );
         for ( MatchPattern pattern : patterns )
@@ -56,7 +58,7 @@ public class MatchPatterns
         return false;
     }
 
-    public boolean matchesPatternStart( String name, boolean isCaseSensitive )
+    public boolean matchesPatternStart( @Nonnull String name, boolean 
isCaseSensitive )
     {
         for ( MatchPattern includesPattern : patterns )
         {
@@ -68,7 +70,7 @@ public class MatchPatterns
         return false;
     }
 
-    public static MatchPatterns from( String... sources )
+    public static MatchPatterns from( @Nonnull String... sources )
     {
         final int length = sources.length;
         MatchPattern[] result = new MatchPattern[length];

Modified: 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java?rev=1398130&r1=1398129&r2=1398130&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
 (original)
+++ 
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/SelectorUtils.java
 Sun Oct 14 20:35:47 2012
@@ -25,6 +25,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
+import javax.annotation.Nonnull;
+
 /**
  * <p>This is a utility class used by selectors and DirectoryScanner. The
  * functionality more properly belongs just to selectors, but unfortunately
@@ -573,7 +575,9 @@ public final class SelectorUtils
 
 
     @SuppressWarnings("SimplifiableIfStatement")
-    static boolean matchAntPathPatternStart( MatchPattern pattern, String str, 
String separator,
+    static boolean matchAntPathPatternStart( @Nonnull MatchPattern pattern,
+                                             @Nonnull String str,
+                                             @Nonnull String separator,
                                              boolean isCaseSensitive )
     {
         if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
@@ -584,7 +588,7 @@ public final class SelectorUtils
         return matchAntPathPatternStart( pattern.getTokenizedPathString(), 
str, separator, isCaseSensitive );
     }
 
-    private static String[] tokenizePathToString( String path, String 
separator )
+    private static String[] tokenizePathToString( @Nonnull String path, 
@Nonnull String separator )
     {
         List<String> ret = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer( path, separator );
@@ -595,7 +599,10 @@ public final class SelectorUtils
         return ret.toArray( new String[ret.size()] );
     }
 
-    private static boolean matchAntPathPatternStart( String[] patDirs, String 
str, String separator, boolean isCaseSensitive )
+    private static boolean matchAntPathPatternStart( @Nonnull String[] patDirs,
+                                                     @Nonnull String str,
+                                                     @Nonnull  String 
separator,
+                                                     boolean isCaseSensitive )
     {
         String[] strDirs = tokenizePathToString( str, separator );
 
@@ -623,7 +630,8 @@ public final class SelectorUtils
         return strIdxStart > strIdxEnd || patIdxStart <= patIdxEnd;
     }
 
-    private static boolean separatorPatternStartSlashMismatch( MatchPattern 
matchPattern, String str, String separator )
+    private static boolean separatorPatternStartSlashMismatch( @Nonnull 
MatchPattern matchPattern, @Nonnull String str,
+                                                               @Nonnull String 
separator )
     {
         return str.startsWith( separator ) != matchPattern.startsWith( 
separator );
     }
@@ -776,7 +784,7 @@ public final class SelectorUtils
             && pattern.startsWith( ANT_HANDLER_PREFIX ) && pattern.endsWith( 
PATTERN_HANDLER_SUFFIX );
     }
 
-    static boolean matchAntPathPattern( MatchPattern matchPattern, String str, 
String separator,
+    static boolean matchAntPathPattern( @Nonnull MatchPattern matchPattern, 
@Nonnull String str, @Nonnull String separator,
                                         boolean isCaseSensitive )
     {
         if ( separatorPatternStartSlashMismatch( matchPattern, str, separator 
) )


Reply via email to