avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbenn...@apache.org
Subject cvs commit: avalon/composition/impl/src/java/org/apache/avalon/composition/model/impl DefaultFilesetModel.java
Date Wed, 21 Apr 2004 17:53:52 GMT
tbennett    2004/04/21 10:53:52

  Modified:    composition/impl/src/java/org/apache/avalon/composition/model/impl
                        DefaultFilesetModel.java
  Log:
  Made some setter methods private in response to the trimming of the FilesetModel interface
  
  Revision  Changes    Path
  1.6       +9 -20     avalon/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultFilesetModel.java
  
  Index: DefaultFilesetModel.java
  ===================================================================
  RCS file: /home/cvs/avalon/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultFilesetModel.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultFilesetModel.java	21 Apr 2004 06:20:41 -0000	1.5
  +++ DefaultFilesetModel.java	21 Apr 2004 17:53:52 -0000	1.6
  @@ -120,7 +120,7 @@
        * 
        * @param anchor the base directory anchor
        */
  -    public void setBaseDirectory(File anchor) {
  +    private void setBaseDirectory(File anchor) {
           m_anchor = anchor;
       }
   
  @@ -130,7 +130,7 @@
        * 
        * @param includes array of <code>IncludeDirective</code> objects
        */
  -    public void setIncludeDirectives(IncludeDirective[] includes) {
  +    private void setIncludeDirectives(IncludeDirective[] includes) {
           m_includes = includes;
       }
   
  @@ -140,7 +140,7 @@
        * 
        * @param excludes array of <code>ExcludeDirectives</code>
        */
  -    public void setExcludeDirectives(ExcludeDirective[] excludes) {
  +    private void setExcludeDirectives(ExcludeDirective[] excludes) {
           m_excludes = excludes;
       }
   
  @@ -152,7 +152,7 @@
        * @param defaultIncludes array of <code>String</code> objects
        * representing a set of default fileset includes
        */
  -    public void setDefaultIncludes(String[] defaultIncludes) {
  +    private void setDefaultIncludes(String[] defaultIncludes) {
           if (defaultIncludes == null) {
               //m_defaultIncludes = new String[1];
               //m_defaultIncludes[0] = "*.jar";
  @@ -170,7 +170,7 @@
        * @param defaultExcludes array of <code>String</code> objects
        * representing a set of default fileset excludes
        */
  -    public void setDefaultExcludes(String[] defaultExcludes) {
  +    private void setDefaultExcludes(String[] defaultExcludes) {
           if (defaultExcludes == null) {
               m_defaultExcludes = new String[0];
           } else {
  @@ -209,13 +209,15 @@
                                               + " is not a directory");
           }
           
  -        // New stuff...
  +        // Return the directory attribute as a classpath if there are no
  +        // includes
           if ( m_includes.length == 0 && m_defaultIncludes.length == 0 ) {
               m_list.add( m_anchor );
               m_logger.debug("candidates=[" + m_anchor + "]");
               return;
           }
           
  +        // create a directory scanner
           DirectoryScanner ds = new DirectoryScanner();
           ds.setLogger(m_logger);
   
  @@ -281,18 +283,5 @@
               m_list.add( m_anchor );
               m_logger.debug("candidates=[" + m_anchor + "]");
           }
  -/*        
  -        // Original stuff...
  -        if( m_includes.length > 0 ) {
  -            for( int j=0; j<m_includes.length; j++ ) {
  -                File file = new File( m_anchor, m_includes[j].getPath() );
  -                m_logger.debug("candidates[" + j + "]=[" + file.getAbsolutePath() + "]");
  -                m_list.add( file );
  -            }
  -        } else {
  -            m_list.add( m_anchor );
  -            m_logger.debug("candidates=[" + m_anchor + "]");
  -        }
  -*/
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message