diff --git a/apps/addressbook/java/src/addressbook/AddressBook.java b/apps/addressbook/java/src/addressbook/AddressBook.java index a59091591..547cb71cb 100644 --- a/apps/addressbook/java/src/addressbook/AddressBook.java +++ b/apps/addressbook/java/src/addressbook/AddressBook.java @@ -57,7 +57,7 @@ public class AddressBook { this.addresses = addresses; } - /** + /* * Construct an AddressBook from the contents of the file at url. If the * remote file cannot be read, construct an empty AddressBook * @@ -81,6 +81,7 @@ public class AddressBook { new File("addressbook.tmp").delete(); } */ + static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts /** * Construct an AddressBook from the Subscription subscription. If the * address book at subscription has not changed since the last time it was @@ -89,8 +90,9 @@ public class AddressBook { * * @param subscription * A Subscription instance pointing at a remote address book. + * @param proxyHost hostname of proxy + * @param proxyPort port number of proxy */ - static final long MAX_SUB_SIZE = 3 * 1024 * 1024l; //about 5,000 hosts public AddressBook(Subscription subscription, String proxyHost, int proxyPort) { this.location = subscription.getLocation(); EepGet get = new EepGet(I2PAppContext.getGlobalContext(), true, @@ -152,6 +154,7 @@ public class AddressBook { * * @return A String representing the contents of the AddressBook. */ + @Override public String toString() { return this.addresses.toString(); } @@ -195,6 +198,7 @@ public class AddressBook { * * @param other * An AddressBook to merge with. + * @param overwrite True to overwrite * @param log * The log to write messages about new addresses or conflicts to. */ diff --git a/apps/addressbook/java/src/addressbook/ConfigParser.java b/apps/addressbook/java/src/addressbook/ConfigParser.java index 2df3f6397..8cdce6e26 100644 --- a/apps/addressbook/java/src/addressbook/ConfigParser.java +++ b/apps/addressbook/java/src/addressbook/ConfigParser.java @@ -213,8 +213,7 @@ public class ConfigParser { * * @param file * A File to attempt to parse. - * @param string - * A List to use as the default, if file fails. + * @param list list of files to parse * @return A List consisting of one element for each line in file, or if * file cannot be read, list. */ diff --git a/apps/addressbook/java/src/addressbook/Daemon.java b/apps/addressbook/java/src/addressbook/Daemon.java index 752e898dc..2a4962b60 100644 --- a/apps/addressbook/java/src/addressbook/Daemon.java +++ b/apps/addressbook/java/src/addressbook/Daemon.java @@ -160,7 +160,8 @@ public class Daemon { settings = ConfigParser.parse(settingsFile, defaultSettings); // wait try { - Thread.currentThread().sleep(5*60*1000); + Thread.sleep(5*60*1000); + // Static method, and redundent Thread.currentThread().sleep(5*60*1000); } catch (InterruptedException ie) {} while (true) { diff --git a/apps/addressbook/java/src/addressbook/DaemonThread.java b/apps/addressbook/java/src/addressbook/DaemonThread.java index 7b8f09646..fb869d807 100644 --- a/apps/addressbook/java/src/addressbook/DaemonThread.java +++ b/apps/addressbook/java/src/addressbook/DaemonThread.java @@ -43,6 +43,7 @@ public class DaemonThread extends Thread { /* (non-Javadoc) * @see java.lang.Runnable#run() */ + @Override public void run() { //try { // Thread.sleep(5 * 60 * 1000); diff --git a/apps/addressbook/java/src/addressbook/Servlet.java b/apps/addressbook/java/src/addressbook/Servlet.java index a6b61bcf7..50bc1eb6d 100644 --- a/apps/addressbook/java/src/addressbook/Servlet.java +++ b/apps/addressbook/java/src/addressbook/Servlet.java @@ -44,6 +44,7 @@ public class Servlet extends GenericServlet { /* (non-Javadoc) * @see javax.servlet.Servlet#init(javax.servlet.ServletConfig) */ + @Override public void init(ServletConfig config) { try { super.init(config); diff --git a/apps/addressbook/java/src/addressbook/SubscriptionIterator.java b/apps/addressbook/java/src/addressbook/SubscriptionIterator.java index 6ad3c4e3d..2c3e13b73 100644 --- a/apps/addressbook/java/src/addressbook/SubscriptionIterator.java +++ b/apps/addressbook/java/src/addressbook/SubscriptionIterator.java @@ -41,6 +41,8 @@ public class SubscriptionIterator implements Iterator { * * @param subscriptions * List of Subscription objects that represent address books. + * @param proxyHost proxy hostname + * @param proxyPort proxt port number */ public SubscriptionIterator(List subscriptions, String proxyHost, int proxyPort) { this.subIterator = subscriptions.iterator(); diff --git a/apps/addressbook/java/src/addressbook/SubscriptionList.java b/apps/addressbook/java/src/addressbook/SubscriptionList.java index 66c45829b..77597eef6 100644 --- a/apps/addressbook/java/src/addressbook/SubscriptionList.java +++ b/apps/addressbook/java/src/addressbook/SubscriptionList.java @@ -60,6 +60,9 @@ public class SubscriptionList { * @param lastModifiedFile * A file containg the last-modified headers used for conditional * GET. The file is in the format "url=leastmodified". + * @param defaultSubs default subscription file + * @param proxyHost proxy hostname + * @param proxyPort proxy port number */ public SubscriptionList(File locationsFile, File etagsFile, File lastModifiedFile, List defaultSubs, String proxyHost, diff --git a/build.xml b/build.xml index fcea08489..e97b01a48 100644 --- a/build.xml +++ b/build.xml @@ -149,9 +149,11 @@ + + - +