? antlr.jar ? pedantic.patch Index: src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java =================================================================== RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java,v retrieving revision 1.8 diff -u -w -r1.8 ClassPathLoader.java --- src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java 14 Feb 2002 09:30:30 -0000 1.8 +++ src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/ClassPathLoader.java 19 Feb 2002 21:07:25 -0000 @@ -119,10 +119,10 @@ /** the interface to implement to look up for specific resources */ public interface FileLoader { /** the file url that is looked for .class files */ - public File getFile(); + File getFile(); /** return the set of classes found in the file */ - public ClassFile[] getClasses() throws IOException; + ClassFile[] getClasses() throws IOException; } /** Index: src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java =================================================================== RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java,v retrieving revision 1.3 diff -u -w -r1.3 AttributeInfo.java --- src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java 18 Nov 2001 00:51:51 -0000 1.3 +++ src/main/org/apache/tools/ant/taskdefs/optional/sitraka/bytecode/attributes/AttributeInfo.java 19 Feb 2002 21:07:25 -0000 @@ -60,26 +60,26 @@ */ public interface AttributeInfo { - public final static String SOURCE_FILE = "SourceFile"; + String SOURCE_FILE = "SourceFile"; - public final static String CONSTANT_VALUE = "ConstantValue"; + String CONSTANT_VALUE = "ConstantValue"; - public final static String CODE = "Code"; + String CODE = "Code"; - public final static String EXCEPTIONS = "Exceptions"; + String EXCEPTIONS = "Exceptions"; - public final static String LINE_NUMBER_TABLE = "LineNumberTable"; + String LINE_NUMBER_TABLE = "LineNumberTable"; - public final static String LOCAL_VARIABLE_TABLE = "LocalVariableTable"; + String LOCAL_VARIABLE_TABLE = "LocalVariableTable"; - public final static String INNER_CLASSES = "InnerClasses"; + String INNER_CLASSES = "InnerClasses"; - public final static String SOURCE_DIR = "SourceDir"; + String SOURCE_DIR = "SourceDir"; - public final static String SYNTHETIC = "Synthetic"; + String SYNTHETIC = "Synthetic"; - public final static String DEPRECATED = "Deprecated"; + String DEPRECATED = "Deprecated"; - public final static String UNKNOWN = "Unknown"; + String UNKNOWN = "Unknown"; } Index: src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java =================================================================== RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java,v retrieving revision 1.2 diff -u -w -r1.2 SOSCmd.java --- src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java 4 Feb 2002 11:03:04 -0000 1.2 +++ src/main/org/apache/tools/ant/taskdefs/optional/sos/SOSCmd.java 19 Feb 2002 21:07:25 -0000 @@ -62,32 +62,32 @@ */ public interface SOSCmd { // soscmd Command options - public final static String COMMAND_SOS_EXE = "soscmd"; - public final static String COMMAND_GET_FILE = "GetFile"; - public final static String COMMAND_GET_PROJECT = "GetProject"; - public final static String COMMAND_CHECKOUT_FILE = "CheckOutFile"; - public final static String COMMAND_CHECKOUT_PROJECT = "CheckOutProject"; - public final static String COMMAND_CHECKIN_FILE = "CheckInFile"; - public final static String COMMAND_CHECKIN_PROJECT = "CheckInProject"; - public final static String COMMAND_HISTORY = "GetFileHistory"; - public final static String COMMAND_LABEL = "AddLabel"; - public final static String PROJECT_PREFIX = "$"; + String COMMAND_SOS_EXE = "soscmd"; + String COMMAND_GET_FILE = "GetFile"; + String COMMAND_GET_PROJECT = "GetProject"; + String COMMAND_CHECKOUT_FILE = "CheckOutFile"; + String COMMAND_CHECKOUT_PROJECT = "CheckOutProject"; + String COMMAND_CHECKIN_FILE = "CheckInFile"; + String COMMAND_CHECKIN_PROJECT = "CheckInProject"; + String COMMAND_HISTORY = "GetFileHistory"; + String COMMAND_LABEL = "AddLabel"; + String PROJECT_PREFIX = "$"; // soscmd Option flags - public final static String FLAG_COMMAND = "-command"; - public final static String FLAG_VSS_SERVER = "-database"; - public final static String FLAG_USERNAME = "-name"; - public final static String FLAG_PASSWORD = "-password"; - public final static String FLAG_COMMENT = "-log"; - public final static String FLAG_WORKING_DIR = "-workdir"; - public final static String FLAG_RECURSION = "-recursive"; - public final static String FLAG_VERSION = "-revision"; - public final static String FLAG_LABEL = "-label"; - public final static String FLAG_NO_COMPRESSION = "-nocompress"; - public final static String FLAG_NO_CACHE = "-nocache"; - public final static String FLAG_SOS_SERVER = "-server"; - public final static String FLAG_SOS_HOME = "-soshome"; - public final static String FLAG_PROJECT = "-project"; - public final static String FLAG_FILE = "-file"; - public final static String FLAG_VERBOSE = "-verbose"; + String FLAG_COMMAND = "-command"; + String FLAG_VSS_SERVER = "-database"; + String FLAG_USERNAME = "-name"; + String FLAG_PASSWORD = "-password"; + String FLAG_COMMENT = "-log"; + String FLAG_WORKING_DIR = "-workdir"; + String FLAG_RECURSION = "-recursive"; + String FLAG_VERSION = "-revision"; + String FLAG_LABEL = "-label"; + String FLAG_NO_COMPRESSION = "-nocompress"; + String FLAG_NO_CACHE = "-nocache"; + String FLAG_SOS_SERVER = "-server"; + String FLAG_SOS_HOME = "-soshome"; + String FLAG_PROJECT = "-project"; + String FLAG_FILE = "-file"; + String FLAG_VERBOSE = "-verbose"; } Index: src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java =================================================================== RCS file: /home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java,v retrieving revision 1.6 diff -u -w -r1.6 Jdk14RegexpMatcher.java --- src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java 31 Jan 2002 09:24:16 -0000 1.6 +++ src/main/org/apache/tools/ant/util/regexp/Jdk14RegexpMatcher.java 19 Feb 2002 21:07:25 -0000 @@ -162,7 +162,7 @@ protected int getCompilerOptions(int options) { // be strict about line separator - int cOptions = Pattern.UNIX_LINES; + int cOptions = 0;// = Pattern.UNIX_LINES; if (RegexpUtil.hasFlag(options, MATCH_CASE_INSENSITIVE)) { cOptions |= Pattern.CASE_INSENSITIVE;