Several bug fixes and cleanup.

Found using PMD and FindBugs.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1553 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-06-01 10:40:12 +00:00
parent 2a614e53a7
commit 117d938ac5
74 changed files with 645 additions and 354 deletions

View file

@ -45,16 +45,25 @@ public class Commandinfo extends EssentialsCommand
}
if (file.exists())
{
BufferedReader rx = new BufferedReader(new FileReader(file));
int i = 0;
for (String l = null; rx.ready() && (l = rx.readLine()) != null; i++)
final BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
try
{
if (l.startsWith("#"))
int lineNumber = 0;
while (bufferedReader.ready())
{
bookmarks.put(l.substring(1).toLowerCase().replaceAll("&[0-9a-f]", ""), i);
chapters.add(l.substring(1).replace('&', '§'));
final String line = bufferedReader.readLine();
if (line.length() > 0 && line.charAt(0) == '#')
{
bookmarks.put(line.substring(1).toLowerCase().replaceAll("&[0-9a-f]", ""), lineNumber);
chapters.add(line.substring(1).replace('&', '§'));
}
lines.add(line.replace('&', '§'));
lineNumber++;
}
lines.add(l.replace('&', '§'));
}
finally
{
bufferedReader.close();
}
}
else