TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved the error handling

This commit is contained in:
Oliver Burn 2002-09-04 14:33:07 +00:00
parent 8a2f9d179f
commit 2df5874fc8
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/checkstyle/com/puppycrawl/tools/checkstyle/CheckStyleTask.java
View File

@ -27,6 +27,7 @@ import org.apache.tools.ant.taskdefs.LogOutputStream;
import org.apache.tools.ant.types.EnumeratedAttribute;
import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.Path;
import org.apache.regexp.RESyntaxException;
import java.io.File;
import java.io.FileInputStream;
@ -153,20 +154,33 @@ public class CheckStyleTask
*/
public void setProperties(File aProps)
{
Properties mProperties = new Properties();
final Properties mProperties = new Properties();
try {
mProperties.load(new FileInputStream(aProps));
mConfig = new Configuration(mProperties, System.out);
}
catch (FileNotFoundException e) {
throw new BuildException(
"Could not find Properties file '" + aProps + "'",
e, getLocation());
"Could not find Properties file '" + aProps + "'",
e, getLocation());
}
catch (Exception e) {
catch (IOException e) {
throw new BuildException(
"Error loading Properties file '" + aProps + "'",
e, getLocation());
"Error loading Properties file '" + aProps + "'",
e, getLocation());
}
try {
mConfig = new Configuration(mProperties, System.out);
}
catch (RESyntaxException e) {
throw new BuildException(
"An regular expression error exists in '" + aProps + "'",
e, getLocation());
}
catch (IOException e) {
throw new BuildException(
"An error loading the file '" + e.getMessage() + "'",
e, getLocation());
}
}

4
src/checkstyle/com/puppycrawl/tools/checkstyle/Configuration.java
View File

@ -726,6 +726,10 @@ public class Configuration
private void setHeaderFile(String aFileName)
throws FileNotFoundException, IOException
{
// TODO: Need to fix bug that relative paths are not handled. Need to
// be given an absolute path to add to paths. This is needed for
// all properties that specified paths (headerFile, baseDir).
// Handle a missing property, or an empty one
if ((aFileName == null) || (aFileName.trim().length() == 0)) {
return;