ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/zip UnixStat.java ZipExtraField.java
Date Thu, 13 Sep 2001 08:40:38 GMT
donaldp     01/09/13 01:40:38

  Modified:    src/main/org/apache/tools/ant BuildListener.java
                        BuildLogger.java FileScanner.java
                        IntrospectionHelper.java
               src/main/org/apache/tools/ant/taskdefs
                        ExecuteStreamHandler.java XSLTLiaison.java
               src/main/org/apache/tools/ant/taskdefs/compilers
                        CompilerAdapter.java
               src/main/org/apache/tools/ant/taskdefs/condition
                        Condition.java
               src/main/org/apache/tools/ant/taskdefs/optional/depend
                        ClassFileIterator.java
               src/main/org/apache/tools/ant/taskdefs/optional/ejb
                        EJBDeploymentTool.java
               src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers
                        CompilerAdapter.java
               src/main/org/apache/tools/ant/taskdefs/rmic RmicAdapter.java
               src/main/org/apache/tools/ant/util FileNameMapper.java
               src/main/org/apache/tools/ant/util/regexp RegexpMatcher.java
               src/main/org/apache/tools/tar TarConstants.java
               src/main/org/apache/tools/zip UnixStat.java
                        ZipExtraField.java
  Log:
  Removed redundent access specifiers so that Ant compiles cleanly in jikes pedantic mode.
They are "strongly discouraged" by the JLS spec.
  
  Revision  Changes    Path
  1.4       +8 -9      jakarta-ant/src/main/org/apache/tools/ant/BuildListener.java
  
  Index: BuildListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/BuildListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- BuildListener.java	2001/01/03 14:18:26	1.3
  +++ BuildListener.java	2001/09/13 08:40:37	1.4
  @@ -68,7 +68,7 @@
       /**
        *  Fired before any targets are started.
        */
  -    public void buildStarted(BuildEvent event);
  +    void buildStarted(BuildEvent event);
   
       /**
        *  Fired after the last target has finished. This event
  @@ -76,14 +76,14 @@
        *
        *  @see BuildEvent#getException()
        */
  -    public void buildFinished(BuildEvent event);
  +    void buildFinished(BuildEvent event);
   
       /**
        *  Fired when a target is started.
        *
        *  @see BuildEvent#getTarget()
        */
  -    public void targetStarted(BuildEvent event);
  +    void targetStarted(BuildEvent event);
   
       /**
        *  Fired when a target has finished. This event will
  @@ -91,14 +91,14 @@
        *
        *  @see BuildEvent#getException()
        */
  -    public void targetFinished(BuildEvent event);
  +    void targetFinished(BuildEvent event);
   
       /**
        *  Fired when a task is started.
        *
        *  @see BuildEvent#getTask()
        */
  -    public void taskStarted(BuildEvent event);
  +    void taskStarted(BuildEvent event);
   
       /**
        *  Fired when a task has finished. This event will still
  @@ -106,7 +106,7 @@
        *
        *  @see BuildEvent#getException()
        */
  -    public void taskFinished(BuildEvent event);
  +    void taskFinished(BuildEvent event);
   
       /**
        *  Fired whenever a message is logged.
  @@ -114,6 +114,5 @@
        *  @see BuildEvent#getMessage()
        *  @see BuildEvent#getPriority()
        */
  -    public void messageLogged(BuildEvent event);
  -
  -}
  \ No newline at end of file
  +    void messageLogged(BuildEvent event);
  +}
  
  
  
  1.5       +4 -5      jakarta-ant/src/main/org/apache/tools/ant/BuildLogger.java
  
  Index: BuildLogger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/BuildLogger.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BuildLogger.java	2001/01/11 12:13:01	1.4
  +++ BuildLogger.java	2001/09/13 08:40:37	1.5
  @@ -77,14 +77,14 @@
        *
        * @param level the logging level for the logger.
        */
  -    public void setMessageOutputLevel(int level);
  +    void setMessageOutputLevel(int level);
       
       /**
        * Set the output stream to which this logger is to send its output.
        *
        * @param output the output stream for the logger.
        */
  -    public void setOutputPrintStream(PrintStream output);
  +    void setOutputPrintStream(PrintStream output);
       
       /**
        * Set this logger to produce emacs (and other editor) friendly output.
  @@ -92,13 +92,12 @@
        * @param emacsMode true if output is to be unadorned so that emacs and other
        * editors can parse files names, etc.
        */
  -    public void setEmacsMode(boolean emacsMode);
  +    void setEmacsMode(boolean emacsMode);
   
       /**
        * Set the output stream to which this logger is to send error messages.
        *
        * @param err the error stream for the logger.
        */
  -    public void setErrorPrintStream(PrintStream err);
  -    
  +    void setErrorPrintStream(PrintStream err);    
   }
  
  
  
  1.5       +13 -13    jakarta-ant/src/main/org/apache/tools/ant/FileScanner.java
  
  Index: FileScanner.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/FileScanner.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FileScanner.java	2001/01/03 14:18:26	1.4
  +++ FileScanner.java	2001/09/13 08:40:37	1.5
  @@ -64,14 +64,14 @@
        * Adds an array with default exclusions to the current exclusions set.
        *
        */
  -    public void addDefaultExcludes();
  +    void addDefaultExcludes();
       /**
        * Gets the basedir that is used for scanning. This is the directory that
        * is scanned recursively.
        *
        * @return the basedir that is used for scanning
        */
  -    public File getBasedir();
  +    File getBasedir();
       /**
        * Get the names of the directories that matched at least one of the include
        * patterns, an matched also at least one of the exclude patterns.
  @@ -79,7 +79,7 @@
        *
        * @return the names of the directories
        */
  -    public String[] getExcludedDirectories();
  +    String[] getExcludedDirectories();
       /**
        * Get the names of the files that matched at least one of the include
        * patterns, an matched also at least one of the exclude patterns.
  @@ -87,7 +87,7 @@
        *
        * @return the names of the files
        */
  -    public String[] getExcludedFiles();
  +    String[] getExcludedFiles();
       /**
        * Get the names of the directories that matched at least one of the include
        * patterns, an matched none of the exclude patterns.
  @@ -95,7 +95,7 @@
        *
        * @return the names of the directories
        */
  -    public String[] getIncludedDirectories();
  +    String[] getIncludedDirectories();
       /**
        * Get the names of the files that matched at least one of the include
        * patterns, an matched none of the exclude patterns.
  @@ -103,7 +103,7 @@
        *
        * @return the names of the files
        */
  -    public String[] getIncludedFiles();
  +    String[] getIncludedFiles();
       /**
        * Get the names of the directories that matched at none of the include
        * patterns.
  @@ -111,45 +111,45 @@
        *
        * @return the names of the directories
        */
  -    public String[] getNotIncludedDirectories();
  +    String[] getNotIncludedDirectories();
       /**
        * Get the names of the files that matched at none of the include patterns.
        * The names are relative to the basedir.
        *
        * @return the names of the files
        */
  -    public String[] getNotIncludedFiles();
  +    String[] getNotIncludedFiles();
       /**
        * Scans the base directory for files that match at least one include
        * pattern, and don't match any exclude patterns.
        *
        * @exception IllegalStateException when basedir was set incorrecly
        */
  -    public void scan();
  +    void scan();
       /**
        * Sets the basedir for scanning. This is the directory that is scanned
        * recursively. 
        *
        * @param basedir the (non-null) basedir for scanning
        */
  -    public void setBasedir(String basedir);
  +    void setBasedir(String basedir);
       /**
        * Sets the basedir for scanning. This is the directory that is scanned
        * recursively.
        *
        * @param basedir the basedir for scanning
        */
  -    public void setBasedir(File basedir);
  +    void setBasedir(File basedir);
       /**
        * Sets the set of exclude patterns to use.
        *
        * @param excludes list of exclude patterns
        */
  -    public void setExcludes(String[] excludes);
  +    void setExcludes(String[] excludes);
       /**
        * Sets the set of include patterns to use.
        *
        * @param includes list of include patterns
        */
  -    public void setIncludes(String[] includes);
  +    void setIncludes(String[] includes);
   }
  
  
  
  1.22      +3 -3      jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java
  
  Index: IntrospectionHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- IntrospectionHelper.java	2001/08/05 11:06:53	1.21
  +++ IntrospectionHelper.java	2001/09/13 08:40:37	1.22
  @@ -629,17 +629,17 @@
       }
   
       private interface NestedCreator {
  -        public Object create(Object parent) 
  +        Object create(Object parent) 
               throws InvocationTargetException, IllegalAccessException, InstantiationException;
       }
       
       private interface NestedStorer {
  -        public void store(Object parent, Object child) 
  +        void store(Object parent, Object child) 
               throws InvocationTargetException, IllegalAccessException, InstantiationException;
       }
       
       private interface AttributeSetter {
  -        public void set(Project p, Object parent, String value)
  +        void set(Project p, Object parent, String value)
               throws InvocationTargetException, IllegalAccessException, 
                      BuildException;
       }
  
  
  
  1.3       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java
  
  Index: ExecuteStreamHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/ExecuteStreamHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExecuteStreamHandler.java	2001/01/03 14:18:30	1.2
  +++ ExecuteStreamHandler.java	2001/09/13 08:40:37	1.3
  @@ -72,29 +72,29 @@
        * @param os output stream to write to the standard input stream of the
        *           subprocess
        */
  -    public void setProcessInputStream(OutputStream os) throws IOException;
  +    void setProcessInputStream(OutputStream os) throws IOException;
   
       /**
        * Install a handler for the error stream of the subprocess.
        *
        * @param is input stream to read from the error stream from the subprocess
        */
  -    public void setProcessErrorStream(InputStream is) throws IOException;
  +    void setProcessErrorStream(InputStream is) throws IOException;
   
       /**
        * Install a handler for the output stream of the subprocess.
        *
        * @param is input stream to read from the error stream from the subprocess
        */
  -    public void setProcessOutputStream(InputStream is) throws IOException;
  +    void setProcessOutputStream(InputStream is) throws IOException;
   
       /**
        * Start handling of the streams.
        */
  -    public void start() throws IOException;
  +    void start() throws IOException;
   
       /**
        * Stop handling of the streams - will not be restarted.
        */
  -    public void stop();
  +    void stop();
   }
  
  
  
  1.5       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java
  
  Index: XSLTLiaison.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/XSLTLiaison.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSLTLiaison.java	2001/08/18 14:59:39	1.4
  +++ XSLTLiaison.java	2001/09/13 08:40:37	1.5
  @@ -76,13 +76,13 @@
        * case since most parsers for now incorrectly makes no difference
        * between it.. and users also have problem with that :)
        */
  -    public final static String FILE_PROTOCOL_PREFIX = "file:///";
  +    String FILE_PROTOCOL_PREFIX = "file:///";
   
       /**
        * set the stylesheet to use for the transformation.
        * @param stylesheet the stylesheet to be used for transformation.
        */
  -    public void setStylesheet(File stylesheet) throws Exception;
  +    void setStylesheet(File stylesheet) throws Exception;
   
       /**
        * Add a parameter to be set during the XSL transformation.
  @@ -90,7 +90,7 @@
        * @param expression the parameter value as an expression string.
        * @throws Exception thrown if any problems happens.
        */
  -    public void addParam(String name, String expression) throws Exception;
  +    void addParam(String name, String expression) throws Exception;
   
       /**
        * Perform the transformation of a file into another.
  @@ -99,6 +99,6 @@
        * @throws Exception thrown if any problems happens.
        * @see #setStylesheet(File)
        */
  -    public void transform(File infile, File outfile) throws Exception;
  +    void transform(File infile, File outfile) throws Exception;
   
   } //-- XSLTLiaison
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java
  
  Index: CompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/compilers/CompilerAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompilerAdapter.java	2001/01/12 14:08:51	1.1
  +++ CompilerAdapter.java	2001/09/13 08:40:37	1.2
  @@ -75,12 +75,12 @@
       /**
        * Sets the compiler attributes, which are stored in the Javac task.
        */
  -    public void setJavac( Javac attributes );
  +    void setJavac( Javac attributes );
   
       /**
        * Executes the task.
        *
        * @return has the compilation been successful
        */
  -    public boolean execute() throws BuildException;
  +    boolean execute() throws BuildException;
   }
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java
  
  Index: Condition.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/condition/Condition.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Condition.java	2001/08/03 16:38:20	1.1
  +++ Condition.java	2001/09/13 08:40:38	1.2
  @@ -60,12 +60,12 @@
    * Interface for conditions to use inside the <condition> task.
    *
    * @author <a href="mailto:stefan.bodewig@epost.de>Stefan Bodewig</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public interface Condition {
       /**
        * Is this condition true?
        */
  -    public boolean eval() throws BuildException;
  +    boolean eval() throws BuildException;
   }
   
  
  
  
  1.3       +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java
  
  Index: ClassFileIterator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/depend/ClassFileIterator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassFileIterator.java	2001/01/03 14:18:36	1.2
  +++ ClassFileIterator.java	2001/09/13 08:40:38	1.3
  @@ -56,5 +56,5 @@
   
   public interface ClassFileIterator {
   
  -    public ClassFile getNextClassFile();
  +    ClassFile getNextClassFile();
   }
  
  
  
  1.9       +5 -5      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java
  
  Index: EJBDeploymentTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/EJBDeploymentTool.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- EJBDeploymentTool.java	2001/02/13 12:31:59	1.8
  +++ EJBDeploymentTool.java	2001/09/13 08:40:38	1.9
  @@ -70,22 +70,22 @@
        * @param descriptorFilename the name of the deployment descriptor
        * @param saxParser a SAX parser which can be used to parse the deployment descriptor.

        */
  -    public void processDescriptor(String descriptorFilename, SAXParser saxParser) 
  +    void processDescriptor(String descriptorFilename, SAXParser saxParser) 
           throws BuildException;
       
       /**
        * Called to validate that the tool parameters have been configured.
        *
        */
  -    public void validateConfigured() throws BuildException;
  +    void validateConfigured() throws BuildException;
   
       /**
        * Set the task which owns this tool
        */
  -    public void setTask(Task task);
  +    void setTask(Task task);
       
       /**
        * Configure this tool for use in the ejbjar task.
        */
  -    public void configure(EjbJar.Config config);     
  -}
  \ No newline at end of file
  +    void configure(EjbJar.Config config);     
  +}
  
  
  
  1.2       +2 -2      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java
  
  Index: CompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/jsp/compilers/CompilerAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompilerAdapter.java	2001/09/13 08:31:21	1.1
  +++ CompilerAdapter.java	2001/09/13 08:40:38	1.2
  @@ -75,12 +75,12 @@
       /**
        * Sets the compiler attributes, which are stored in the Jspc task.
        */
  -    public void setJspc( JspC attributes );
  +    void setJspc( JspC attributes );
   
       /**
        * Executes the task.
        *
        * @return has the compilation been successful
        */
  -    public boolean execute() throws BuildException;
  +    boolean execute() throws BuildException;
   }
  
  
  
  1.4       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
  
  Index: RmicAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RmicAdapter.java	2001/06/26 13:42:20	1.3
  +++ RmicAdapter.java	2001/09/13 08:40:38	1.4
  @@ -78,23 +78,23 @@
       /**
        * Sets the rmic attributes, which are stored in the Rmic task.
        */
  -    public void setRmic( Rmic attributes );
  +    void setRmic( Rmic attributes );
   
       /**
        * Executes the task.
        *
        * @return has the compilation been successful
        */
  -    public boolean execute() throws BuildException;
  +    boolean execute() throws BuildException;
   
       /**
        * Maps source class files to the files generated by this rmic
        * implementation.
        */
  -    public FileNameMapper getMapper();
  +    FileNameMapper getMapper();
   
       /**
        * The CLASSPATH this rmic process will use.
        */
  -    public Path getClasspath();
  +    Path getClasspath();
   }
  
  
  
  1.3       +3 -3      jakarta-ant/src/main/org/apache/tools/ant/util/FileNameMapper.java
  
  Index: FileNameMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/FileNameMapper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FileNameMapper.java	2001/01/03 14:18:47	1.2
  +++ FileNameMapper.java	2001/09/13 08:40:38	1.3
  @@ -71,12 +71,12 @@
       /**
        * Sets the from part of the transformation rule.
        */
  -    public void setFrom(String from);
  +    void setFrom(String from);
   
       /**
        * Sets the to part of the transformation rule.
        */
  -    public void setTo(String to);
  +    void setTo(String to);
   
       /**
        * Returns an array containing the target filename(s) for the
  @@ -89,5 +89,5 @@
        * @param sourceFileName the name of the source file relative to
        *                       some given basedirectory.
        */
  -    public String[] mapFileName(String sourceFileName);
  +    String[] mapFileName(String sourceFileName);
   }
  
  
  
  1.2       +4 -4      jakarta-ant/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java
  
  Index: RegexpMatcher.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/RegexpMatcher.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RegexpMatcher.java	2000/11/28 15:10:37	1.1
  +++ RegexpMatcher.java	2001/09/13 08:40:38	1.2
  @@ -67,17 +67,17 @@
       /**
        * Set the regexp pattern from the String description.
        */
  -    public void setPattern(String pattern) throws BuildException;
  +    void setPattern(String pattern) throws BuildException;
   
       /**
        * Get a String representation of the regexp pattern
        */
  -    public String getPattern();
  +    String getPattern();
   
       /**
        * Does the given argument match the pattern?
        */
  -    public boolean matches(String argument);
  +    boolean matches(String argument);
   
       /**
        * Returns a Vector of matched groups found in the argument.
  @@ -85,5 +85,5 @@
        * <p>Group 0 will be the full match, the rest are the
        * parenthesized subexpressions</p>.
        */
  -    public Vector getGroups(String argument);
  +    Vector getGroups(String argument);
   }
  
  
  
  1.4       +24 -24    jakarta-ant/src/main/org/apache/tools/tar/TarConstants.java
  
  Index: TarConstants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/tar/TarConstants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TarConstants.java	2001/02/01 15:46:31	1.3
  +++ TarConstants.java	2001/09/13 08:40:38	1.4
  @@ -71,121 +71,121 @@
       /**
        * The length of the name field in a header buffer.
        */
  -    public static final int    NAMELEN = 100;
  +    int    NAMELEN = 100;
   
       /**
        * The length of the mode field in a header buffer.
        */
  -    public static final int    MODELEN = 8;
  +    int    MODELEN = 8;
   
       /**
        * The length of the user id field in a header buffer.
        */
  -    public static final int    UIDLEN = 8;
  +    int    UIDLEN = 8;
   
       /**
        * The length of the group id field in a header buffer.
        */
  -    public static final int    GIDLEN = 8;
  +    int    GIDLEN = 8;
   
       /**
        * The length of the checksum field in a header buffer.
        */
  -    public static final int    CHKSUMLEN = 8;
  +    int    CHKSUMLEN = 8;
   
       /**
        * The length of the size field in a header buffer.
        */
  -    public static final int    SIZELEN = 12;
  +    int    SIZELEN = 12;
   
       /**
        * The length of the magic field in a header buffer.
        */
  -    public static final int    MAGICLEN = 8;
  +    int    MAGICLEN = 8;
   
       /**
        * The length of the modification time field in a header buffer.
        */
  -    public static final int    MODTIMELEN = 12;
  +    int    MODTIMELEN = 12;
   
       /**
        * The length of the user name field in a header buffer.
        */
  -    public static final int    UNAMELEN = 32;
  +    int    UNAMELEN = 32;
   
       /**
        * The length of the group name field in a header buffer.
        */
  -    public static final int    GNAMELEN = 32;
  +    int    GNAMELEN = 32;
   
       /**
        * The length of the devices field in a header buffer.
        */
  -    public static final int    DEVLEN = 8;
  +    int    DEVLEN = 8;
   
       /**
        * LF_ constants represent the "link flag" of an entry, or more commonly,
        * the "entry type". This is the "old way" of indicating a normal file.
        */
  -    public static final byte   LF_OLDNORM = 0;
  +    byte   LF_OLDNORM = 0;
   
       /**
        * Normal file type.
        */
  -    public static final byte   LF_NORMAL = (byte) '0';
  +    byte   LF_NORMAL = (byte) '0';
   
       /**
        * Link file type.
        */
  -    public static final byte   LF_LINK = (byte) '1';
  +    byte   LF_LINK = (byte) '1';
   
       /**
        * Symbolic link file type.
        */
  -    public static final byte   LF_SYMLINK = (byte) '2';
  +    byte   LF_SYMLINK = (byte) '2';
   
       /**
        * Character device file type.
        */
  -    public static final byte   LF_CHR = (byte) '3';
  +    byte   LF_CHR = (byte) '3';
   
       /**
        * Block device file type.
        */
  -    public static final byte   LF_BLK = (byte) '4';
  +    byte   LF_BLK = (byte) '4';
   
       /**
        * Directory file type.
        */
  -    public static final byte   LF_DIR = (byte) '5';
  +    byte   LF_DIR = (byte) '5';
   
       /**
        * FIFO (pipe) file type.
        */
  -    public static final byte   LF_FIFO = (byte) '6';
  +    byte   LF_FIFO = (byte) '6';
   
       /**
        * Contiguous file type.
        */
  -    public static final byte   LF_CONTIG = (byte) '7';
  +    byte   LF_CONTIG = (byte) '7';
   
       /**
        * The magic tag representing a POSIX tar archive.
        */
  -    public static final String TMAGIC = "ustar";
  +    String TMAGIC = "ustar";
   
       /**
        * The magic tag representing a GNU tar archive.
        */
  -    public static final String GNU_TMAGIC = "ustar  ";
  +    String GNU_TMAGIC = "ustar  ";
   
       /**
        * The namr of the GNU tar entry which contains a long name.
        */
  -    public static final String GNU_LONGLINK = "././@LongLink";
  +    String GNU_LONGLINK = "././@LongLink";
       
       /**
        * Identifies the *next* file on the tape as having a long name.  
        */
  -    public static final byte LF_GNUTYPE_LONGNAME = (byte) 'L';
  +    byte LF_GNUTYPE_LONGNAME = (byte) 'L';
   }
  
  
  
  1.2       +8 -8      jakarta-ant/src/main/org/apache/tools/zip/UnixStat.java
  
  Index: UnixStat.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/zip/UnixStat.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- UnixStat.java	2001/04/23 16:12:20	1.1
  +++ UnixStat.java	2001/09/13 08:40:38	1.2
  @@ -58,7 +58,7 @@
    * Constants from stat.h on Unix systems.
    *
    * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public interface UnixStat {
   
  @@ -67,25 +67,25 @@
        *
        * @since 1.1
        */
  -    public static final int PERM_MASK =           07777;
  +    int PERM_MASK =           07777;
       /**
        * Indicates symbolic links.
        *
        * @since 1.1
        */
  -    public static final int LINK_FLAG =         0120000;
  +    int LINK_FLAG =         0120000;
       /**
        * Indicates plain files.
        *
        * @since 1.1
        */
  -    public static final int FILE_FLAG =         0100000;
  +    int FILE_FLAG =         0100000;
       /**
        * Indicates directories.
        *
        * @since 1.1
        */
  -    public static final int DIR_FLAG =           040000;
  +    int DIR_FLAG =           040000;
       
       // ----------------------------------------------------------
       // somewhat arbitrary choices that are quite common for shared 
  @@ -97,17 +97,17 @@
        *
        * @since 1.1
        */
  -    public static final int DEFAULT_LINK_PERM =    0777;
  +    int DEFAULT_LINK_PERM =    0777;
       /**
        * Default permissions for directories.
        *
        * @since 1.1
        */
  -    public static final int DEFAULT_DIR_PERM =     0755;
  +    int DEFAULT_DIR_PERM =     0755;
       /**
        * Default permissions for plain files.
        *
        * @since 1.1
        */
  -    public static final int DEFAULT_FILE_PERM =    0644;
  +    int DEFAULT_FILE_PERM =    0644;
   }
  
  
  
  1.3       +7 -7      jakarta-ant/src/main/org/apache/tools/zip/ZipExtraField.java
  
  Index: ZipExtraField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/zip/ZipExtraField.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ZipExtraField.java	2001/07/05 12:27:46	1.2
  +++ ZipExtraField.java	2001/09/13 08:40:38	1.3
  @@ -66,7 +66,7 @@
    * only use the local file data in both places.</p>
    *
    * @author <a href="stefan.bodewig@epost.de">Stefan Bodewig</a>
  - * @version $Revision: 1.2 $
  + * @version $Revision: 1.3 $
    */
   public interface ZipExtraField {
   
  @@ -75,7 +75,7 @@
        *
        * @since 1.1
        */
  -    public ZipShort getHeaderId();
  +    ZipShort getHeaderId();
   
       /**
        * Length of the extra field in the local file data - without
  @@ -83,7 +83,7 @@
        *
        * @since 1.1
        */
  -    public ZipShort getLocalFileDataLength();
  +    ZipShort getLocalFileDataLength();
   
       /**
        * Length of the extra field in the central directory - without
  @@ -91,7 +91,7 @@
        *
        * @since 1.1
        */
  -    public ZipShort getCentralDirectoryLength();
  +    ZipShort getCentralDirectoryLength();
   
       /**
        * The actual data to put into local file data - without Header-ID
  @@ -99,7 +99,7 @@
        *
        * @since 1.1
        */
  -    public byte[] getLocalFileDataData();
  +    byte[] getLocalFileDataData();
   
       /**
        * The actual data to put central directory - without Header-ID or
  @@ -107,13 +107,13 @@
        *
        * @since 1.1
        */
  -    public byte[] getCentralDirectoryData();
  +    byte[] getCentralDirectoryData();
   
       /**
        * Populate data from this array as if it was in local file data.
        *
        * @since 1.1
        */
  -    public void parseFromLocalFileData(byte[] data, int offset, int length)
  +    void parseFromLocalFileData(byte[] data, int offset, int length)
           throws ZipException;
   }
  
  
  

Mime
View raw message