[javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:442: illegal start of expression
    [javac] <<<<<<< .mine
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:446: 'else' without 'if'
    [javac]                     else
    [javac]                 ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:448: illegal start of expression
    [javac] =======
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:452: 'else' without 'if'
    [javac]                 else
    [javac]                 ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:454: illegal start of expression
    [javac] >>>>>>> .r1722
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:455: ';' expected
    [javac]             }
    [javac]             ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:657: illegal start of type
    [javac] <<<<<<< .mine
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:948: <identifier> expected
    [javac]         throw UnhandledCommandException.create(DataConnectionHandler.class,
    [javac]                                                                      ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:948: <identifier> expected
    [javac]         throw UnhandledCommandException.create(DataConnectionHandler.class,
    [javac]                                                                           ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:949: '{' expected
    [javac]             conn.getRequest());
    [javac]                               ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:1273: illegal start of expression
    [javac] <<<<<<< .mine
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:1277: 'else' without 'if'
    [javac]                     else
    [javac]                         ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:1279: illegal start of expression
    [javac] =======
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:1282: 'else' without 'if'
    [javac]                     else
    [javac]                         ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:1284: illegal start of expression
    [javac] >>>>>>> .r1722
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/net/sf/drftpd/master/command/plugins/DataConnectionHandler.java:1285: ';' expected
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:694: illegal start of expression
    [javac] <<<<<<< .mine
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:737: ';' expected
    [javac]             }
    [javac]             ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1364: illegal start of expression
    [javac] <<<<<<< .mine
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1379: illegal start of expression
    [javac] =======
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1392: illegal start of expression
    [javac] >>>>>>> .r1722
    [javac] ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1525: illegal start of expression
    [javac]     public void say(SectionInterface section, String message) {
    [javac]     ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1698: ';' expected
    [javac]     private class WhoisEntry {
    [javac]             ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1708: illegal start of expression
    [javac]     public void update(Observable observer, Object updated) {
    [javac]     ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1777: ';' expected
    [javac]                                 "ident.denymsg", env, SiteBot.class));
    [javac]                                                               ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1777: <identifier> expected
    [javac]                                 "ident.denymsg", env, SiteBot.class));
    [javac]                                                                    ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1777: '{' expected
    [javac]                                 "ident.denymsg", env, SiteBot.class));
    [javac]                                                                      ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1779: <identifier> expected
    [javac]                         .warn("Not enough permissions for user to execute "
    [javac]                              ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1781: illegal start of type
    [javac]                         return;
    [javac]                         ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1781: <identifier> expected
    [javac]                         return;
    [javac]                               ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1805: 'class' or 'interface' expected
    [javac]         }
    [javac]         ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1903: 'class' or 'interface' expected
    [javac]     public synchronized String getBlowfishKey(String channel, User user) throws ObjectNotFoundException {
    [javac]                         ^
    [javac] /home/fastboy/drftpd-plus/trunk/src/org/drftpd/plugins/SiteBot.java:1921: 'class' or 'interface' expected
    [javac] }
    [javac] ^
    [javac] 33 errors