- Fix order of modifiers

- Fix duplicate/unecessary imports
- Fix single if/else and loop without block


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270814 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/DefaultLogger.java

@@ -55,8 +55,8 @@
 package org.apache.tools.ant;
 
 import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+
+
 
 import org.apache.tools.ant.util.StringUtils;
 

src/main/org/apache/tools/ant/TaskAdapter.java

@@ -55,7 +55,7 @@
 package org.apache.tools.ant;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
+
 
 
 /**

src/main/org/apache/tools/ant/XmlLogger.java

@@ -58,8 +58,8 @@ import java.io.Writer;
 import java.io.OutputStreamWriter;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
+
+
 import java.util.Hashtable;
 import java.util.Stack;
 import javax.xml.parsers.DocumentBuilder;

src/main/org/apache/tools/ant/taskdefs/Echo.java

@@ -57,7 +57,7 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
+
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import java.io.File;
 import java.io.FileWriter;

src/main/org/apache/tools/ant/taskdefs/Exit.java

@@ -56,7 +56,7 @@ package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
+
 
 /**
  * Just exit the active build, giving an additional message 

src/main/org/apache/tools/ant/taskdefs/Input.java

@@ -59,7 +59,9 @@ import  java.io.InputStreamReader;
 import  java.io.IOException;
 import  java.util.StringTokenizer;
 import  java.util.Vector;
-import  org.apache.tools.ant.*;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
 
 
 /**

src/main/org/apache/tools/ant/taskdefs/Jar.java

@@ -60,9 +60,18 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.ZipFileSet;
 import org.apache.tools.zip.ZipOutputStream;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.File;
+import java.io.InputStream;
+import java.io.Reader;
+import java.io.FileReader;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
+import java.io.ByteArrayInputStream;
+import java.io.OutputStreamWriter;
+import java.io.InputStreamReader;
 import java.util.Enumeration;
-import java.util.Vector;
+
 
 /**
  * Creates a JAR archive.

src/main/org/apache/tools/ant/taskdefs/Javadoc.java

@@ -64,7 +64,7 @@ import java.util.StringTokenizer;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
+
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.types.Path;

src/main/org/apache/tools/ant/taskdefs/LoadFile.java

@@ -56,8 +56,8 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.types.EnumeratedAttribute;
+
+
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/org/apache/tools/ant/taskdefs/SQLExec.java

@@ -59,7 +59,7 @@ import org.apache.tools.ant.AntClassLoader;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
+
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Reference;

src/main/org/apache/tools/ant/taskdefs/Tstamp.java

@@ -234,14 +234,14 @@ public class Tstamp extends Task {
 
     public static class Unit extends EnumeratedAttribute {
 
-        private static final String MILLISECOND = "millisecond";
-        private static final String SECOND = "second";
-        private static final String MINUTE = "minute";
-        private static final String HOUR = "hour";
-        private static final String DAY = "day";
-        private static final String WEEK = "week";
-        private static final String MONTH = "month";
-        private static final String YEAR = "year";
+        private final static String MILLISECOND = "millisecond";
+        private final static String SECOND = "second";
+        private final static String MINUTE = "minute";
+        private final static String HOUR = "hour";
+        private final static String DAY = "day";
+        private final static String WEEK = "week";
+        private final static String MONTH = "month";
+        private final static String YEAR = "year";
 
         private final static String[] units = {
                                                 MILLISECOND,

src/main/org/apache/tools/ant/taskdefs/Untar.java

@@ -62,7 +62,7 @@ import org.apache.tools.ant.util.FileUtils;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.Date;
+
 
 /**
  * Untar a file.

src/main/org/apache/tools/ant/taskdefs/WaitFor.java

@@ -161,12 +161,12 @@ public class WaitFor extends ConditionBase {
 
     public static class Unit extends EnumeratedAttribute {
 
-        private static final String MILLISECOND = "millisecond";
-        private static final String SECOND = "second";
-        private static final String MINUTE = "minute";
-        private static final String HOUR = "hour";
-        private static final String DAY = "day";
-        private static final String WEEK = "week";
+        private final static String MILLISECOND = "millisecond";
+        private final static String SECOND = "second";
+        private final static String MINUTE = "minute";
+        private final static String HOUR = "hour";
+        private final static String DAY = "day";
+        private final static String WEEK = "week";
 
         private final static String[] units = {
             MILLISECOND, SECOND, MINUTE, HOUR, DAY, WEEK

src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java

@@ -62,7 +62,7 @@ import org.apache.tools.ant.taskdefs.Execute;
 import org.apache.tools.ant.taskdefs.LogStreamHandler;
 import org.apache.tools.ant.types.Path;
 import org.apache.tools.ant.types.Commandline;
-import org.apache.tools.ant.types.FileSet;
+
 import org.apache.tools.ant.util.FileUtils;
 
 import java.io.File;

src/main/org/apache/tools/ant/taskdefs/condition/Http.java

@@ -58,7 +58,7 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectComponent;
 
-import java.io.IOException;
+
 import java.net.MalformedURLException;
 import java.net.HttpURLConnection;
 import java.net.URLConnection;

src/main/org/apache/tools/ant/taskdefs/condition/Os.java

@@ -66,13 +66,13 @@ import java.util.Locale;
  * @version $Revision$
  */
 public class Os implements Condition {
-    private static final String osName =
+    private final static String osName =
         System.getProperty("os.name").toLowerCase(Locale.US);
-    private static final String osArch =
+    private final static String osArch =
         System.getProperty("os.arch").toLowerCase(Locale.US);
-    private static final String osVersion =
+    private final static String osVersion =
         System.getProperty("os.version").toLowerCase(Locale.US);
-    private static final String pathSep = System.getProperty("path.separator");
+    private final static String pathSep = System.getProperty("path.separator");
 
     private String family;
     private String name;

src/main/org/apache/tools/ant/taskdefs/optional/ReplaceRegExp.java

@@ -70,7 +70,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.LineNumberReader;
 import java.io.PrintWriter;
-import java.util.Random;
+
 import java.util.Vector;
 
 /***

src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java

@@ -67,7 +67,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.Templates;
-import javax.xml.transform.Source;
+
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;

src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java

@@ -74,12 +74,13 @@ import javax.xml.parsers.SAXParser;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
+
+
 import org.apache.tools.ant.util.depend.Dependencies;
 import org.apache.tools.ant.util.depend.Filter;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.*;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.ClassParser;
+
 
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.BuildException;

src/main/org/apache/tools/ant/taskdefs/optional/ejb/WebsphereDeploymentTool.java

@@ -54,18 +54,30 @@
 
 package org.apache.tools.ant.taskdefs.optional.ejb;
 
-import java.io.*;
-import java.util.jar.*;
-import java.util.*;
-import java.net.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.jar.JarFile;
+import java.util.jar.JarOutputStream;
+import java.util.jar.JarEntry;
+import java.util.Iterator;
+import java.util.Hashtable;
+import java.util.Enumeration;
 
-import javax.xml.parsers.*;
-import org.xml.sax.*;
 
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.taskdefs.*;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.taskdefs.ExecTask;
+
+
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.taskdefs.Java;
+import org.apache.tools.ant.types.EnumeratedAttribute;
+import org.apache.tools.ant.types.Path;
+import org.apache.tools.ant.types.Environment;
+import org.apache.tools.ant.types.Commandline;
+
 /**
  * Websphere deployment tool that augments the ejbjar task.
  * @author <mailto:msahu@interkeel.com>Maneesh Sahu</mailto>
@@ -83,16 +95,16 @@ public class WebsphereDeploymentTool extends GenericDeploymentTool {
         }
     }
         
-    public static final String PUBLICID_EJB11
+    public final static String PUBLICID_EJB11
         = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN";
-    public static final String PUBLICID_EJB20
+    public final static String PUBLICID_EJB20
         = "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN";
-    protected static final String SCHEMA_DIR = "Schema/";
+    protected final static String SCHEMA_DIR = "Schema/";
         
-    protected static final String WAS_EXT = "ibm-ejb-jar-ext.xmi";
-    protected static final String WAS_BND = "ibm-ejb-jar-bnd.xmi";
-    protected static final String WAS_CMP_MAP = "Map.mapxmi";
-    protected static final String WAS_CMP_SCHEMA = "Schema.dbxmi";
+    protected final static String WAS_EXT = "ibm-ejb-jar-ext.xmi";
+    protected final static String WAS_BND = "ibm-ejb-jar-bnd.xmi";
+    protected final static String WAS_CMP_MAP = "Map.mapxmi";
+    protected final static String WAS_CMP_SCHEMA = "Schema.dbxmi";
         
     /** Instance variable that stores the suffix for the websphere jarfile. */
     private String jarSuffix = ".jar";

src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java

@@ -53,11 +53,22 @@
  */
 package org.apache.tools.ant.taskdefs.optional.i18n;
 
-import java.io.*;
-import java.util.*;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
-import org.apache.tools.ant.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.FileOutputStream;
+import java.io.BufferedWriter;
+import java.io.OutputStreamWriter;
+import java.util.Vector;
+import java.util.Hashtable;
+import java.util.Locale;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.taskdefs.MatchingTask;
 
 /**

src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJAntToolGUI.java

@@ -85,8 +85,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.TextEvent;
 import java.awt.event.WindowEvent;
-import java.io.StringWriter;
-import java.io.PrintWriter;
+
+
 import java.beans.PropertyChangeListener;
 
 import org.apache.tools.ant.BuildException;

src/main/org/apache/tools/ant/taskdefs/optional/ide/VAJToolsServlet.java

@@ -57,8 +57,8 @@ package org.apache.tools.ant.taskdefs.optional.ide;
 
 
 import java.io.IOException;
-import java.io.StringWriter;
-import java.io.PrintWriter;
+
+
 
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

src/main/org/apache/tools/ant/taskdefs/optional/junit/PlainJUnitResultFormatter.java

@@ -65,7 +65,7 @@ import java.util.Hashtable;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
-import junit.framework.TestCase;
+
 
 /**
  * Prints plain text output of the test to a specified Writer.

src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLJUnitResultFormatter.java

@@ -58,8 +58,8 @@ import java.io.OutputStream;
 import java.io.Writer;
 import java.io.OutputStreamWriter;
 import java.io.IOException;
-import java.io.StringWriter;
-import java.io.PrintWriter;
+
+
 
 
 import java.util.Properties;
@@ -75,7 +75,7 @@ import org.apache.tools.ant.util.DOMElementWriter;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;
-import junit.framework.TestCase;
+
 
 /**
  * Prints XML output of the test to a specified Writer.

src/main/org/apache/tools/ant/taskdefs/optional/junit/XMLResultAggregator.java

@@ -58,7 +58,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.StringWriter;
+
 import java.io.FileOutputStream;
 import java.util.Enumeration;
 import java.util.Vector;

src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamLabel.java

@@ -98,7 +98,7 @@ public class StarTeamLabel extends StarTeamTask {
      */
     private OLEDate lastBuild = null;
 
-    private static final SimpleDateFormat DATE_FORMAT =
+    private final static SimpleDateFormat DATE_FORMAT =
             new SimpleDateFormat("yyyyMMddHHmmss");
 
 

src/main/org/apache/tools/ant/taskdefs/optional/starteam/StarTeamList.java

@@ -192,7 +192,7 @@ public class StarTeamList extends TreeBasedTask {
         log(b.toString());
     }
 
-    private static final String blankstr = blanks(30);
+    private final static String blankstr = blanks(30);
 
     private static String blanks(int len) {
         StringBuffer b = new StringBuffer();

src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java

@@ -58,7 +58,7 @@ import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Rmic;
 import org.apache.tools.ant.types.Commandline;
 import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.FileSet;
+
 import org.apache.tools.ant.util.FileNameMapper;
 
 import java.io.File;

src/main/org/apache/tools/ant/types/PatternSet.java

@@ -55,7 +55,7 @@
 package org.apache.tools.ant.types;
 
 import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
+
 import org.apache.tools.ant.BuildException;
 
 import java.io.File;

src/main/org/apache/tools/ant/types/optional/depend/ClassfileSet.java

@@ -53,15 +53,15 @@
  */
 package org.apache.tools.ant.types.optional.depend;
 
-import java.io.File;
-import java.util.Stack;
+
+
 import java.util.List;
 import java.util.ArrayList;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.util.depend.Dependencies;
+
 
 /**
  * A DepSet is a FileSet, that enlists all classes that depend on a
@@ -76,7 +76,7 @@ import org.apache.tools.ant.util.depend.Dependencies;
 public class ClassfileSet extends FileSet {
     private List rootClasses = new ArrayList();
 
-    static public class ClassRoot {
+    public static class ClassRoot {
         private String rootClass;
         
         public void setClassname(String name) {

src/main/org/apache/tools/ant/types/optional/depend/DependScanner.java

@@ -53,15 +53,22 @@
  */
 package org.apache.tools.ant.types.optional.depend;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.Iterator;
+import java.util.HashSet;
 
 import org.apache.tools.ant.util.depend.Dependencies;
 import org.apache.tools.ant.util.depend.Filter;
 import org.apache.tools.ant.DirectoryScanner;
 
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.*;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.ClassParser;
+
 
 /**
  * An interface used to describe the actions required by any type of 

src/main/org/apache/tools/ant/util/FileUtils.java

@@ -64,7 +64,7 @@ import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStream;
+
 import java.lang.reflect.Method;
 import java.text.DecimalFormat;
 import java.util.Random;

src/main/org/apache/tools/ant/util/depend/Dependencies.java

@@ -53,10 +53,48 @@
  */
 package org.apache.tools.ant.util.depend;
 
-import java.io.*;
-import java.util.*;
-import org.apache.bcel.classfile.*;
-import org.apache.bcel.*;
+import java.io.File;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.StringTokenizer;
+import java.util.TreeSet;
+import java.util.Iterator;
+import java.util.Collection;
+import org.apache.bcel.classfile.Visitor;
+import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.ConstantPool;
+import org.apache.bcel.classfile.Code;
+import org.apache.bcel.classfile.CodeException;
+import org.apache.bcel.classfile.ConstantClass;
+import org.apache.bcel.classfile.ConstantDouble;
+import org.apache.bcel.classfile.ConstantFieldref;
+import org.apache.bcel.classfile.ConstantFloat;
+import org.apache.bcel.classfile.ConstantInteger;
+import org.apache.bcel.classfile.ConstantInterfaceMethodref;
+import org.apache.bcel.classfile.ConstantLong;
+import org.apache.bcel.classfile.ConstantMethodref;
+import org.apache.bcel.classfile.ConstantNameAndType;
+import org.apache.bcel.classfile.Constant;
+import org.apache.bcel.classfile.ConstantString;
+import org.apache.bcel.classfile.ConstantUtf8;
+import org.apache.bcel.classfile.ConstantValue;
+import org.apache.bcel.classfile.Deprecated;
+import org.apache.bcel.classfile.ExceptionTable;
+import org.apache.bcel.classfile.Field;
+import org.apache.bcel.classfile.InnerClass;
+import org.apache.bcel.classfile.InnerClasses;
+import org.apache.bcel.classfile.Method;
+import org.apache.bcel.classfile.LineNumber;
+import org.apache.bcel.classfile.LineNumberTable;
+import org.apache.bcel.classfile.LocalVariable;
+import org.apache.bcel.classfile.LocalVariableTable;
+import org.apache.bcel.classfile.SourceFile;
+import org.apache.bcel.classfile.Synthetic;
+import org.apache.bcel.classfile.Unknown;
+import org.apache.bcel.classfile.StackMap;
+import org.apache.bcel.classfile.StackMapEntry;
+import org.apache.bcel.classfile.ClassParser;
+
 
 
 public class Dependencies implements Visitor {

src/main/org/apache/tools/ant/util/depend/Filter.java

@@ -53,7 +53,7 @@
  */
 package org.apache.tools.ant.util.depend;
 
-import java.util.*;
+
 
 public interface Filter {
     boolean accept(Object object);

src/main/org/apache/tools/bzip2/CBZip2InputStream.java

@@ -59,7 +59,8 @@
  */
 package org.apache.tools.bzip2;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.IOException;
 
 /**
  * An input stream that decompresses from the BZip2 format (without the file
@@ -151,13 +152,13 @@ public class CBZip2InputStream extends InputStream implements BZip2Constants {
 
     private int currentChar = -1;
 
-    private static final int START_BLOCK_STATE = 1;
-    private static final int RAND_PART_A_STATE = 2;
-    private static final int RAND_PART_B_STATE = 3;
-    private static final int RAND_PART_C_STATE = 4;
-    private static final int NO_RAND_PART_A_STATE = 5;
-    private static final int NO_RAND_PART_B_STATE = 6;
-    private static final int NO_RAND_PART_C_STATE = 7;
+    private final static int START_BLOCK_STATE = 1;
+    private final static int RAND_PART_A_STATE = 2;
+    private final static int RAND_PART_B_STATE = 3;
+    private final static int RAND_PART_C_STATE = 4;
+    private final static int NO_RAND_PART_A_STATE = 5;
+    private final static int NO_RAND_PART_B_STATE = 6;
+    private final static int NO_RAND_PART_C_STATE = 7;
 
     private int currentState = START_BLOCK_STATE;
 

src/main/org/apache/tools/bzip2/CBZip2OutputStream.java

@@ -60,7 +60,8 @@
 
 package org.apache.tools.bzip2;
 
-import java.io.*;
+import java.io.OutputStream;
+import java.io.IOException;
 
 /**
  * An output stream that compresses into the BZip2 format (without the file
@@ -71,12 +72,12 @@ import java.io.*;
  * TODO:    Update to BZip2 1.0.1
  */
 public class CBZip2OutputStream extends OutputStream implements BZip2Constants {
-    protected static final int SETMASK = (1 << 21);
-    protected static final int CLEARMASK = (~SETMASK);
-    protected static final int GREATER_ICOST = 15;
-    protected static final int LESSER_ICOST = 0;
-    protected static final int SMALL_THRESH = 20;
-    protected static final int DEPTH_THRESH = 10;
+    protected final static int SETMASK = (1 << 21);
+    protected final static int CLEARMASK = (~SETMASK);
+    protected final static int GREATER_ICOST = 15;
+    protected final static int LESSER_ICOST = 0;
+    protected final static int SMALL_THRESH = 20;
+    protected final static int DEPTH_THRESH = 10;
 
     /*
       If you are ever unlucky/improbable enough
@@ -86,7 +87,7 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants {
       stack go above 27 elems, so the following
       limit seems very generous.
     */
-    protected static final int QSORT_STACK_SIZE = 1000;
+    protected final static int QSORT_STACK_SIZE = 1000;
 
     private static void panic() {
         System.out.println("panic");