From: David ‘Bombe’ Roden Date: Mon, 28 May 2012 11:06:41 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: 0.8.2^2~15 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=480691a26222e035e53bda56029524e160fdf898;hp=-c Merge branch 'master' into next --- 480691a26222e035e53bda56029524e160fdf898 diff --combined pom.xml index ea1db57,4fc785a..3825dfc --- a/pom.xml +++ b/pom.xml @@@ -2,12 -2,12 +2,12 @@@ 4.0.0 net.pterodactylus sone - 0.8 + 0.8.1 net.pterodactylus utils - 0.11.4 + 0.12-SNAPSHOT junit diff --combined src/main/java/net/pterodactylus/sone/core/Core.java index d37f903,26d21ed..66dd23f --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - Core.java - Copyright Â© 2010 David Roden + * Sone - Core.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -131,45 -131,45 +131,45 @@@ public class Core extends AbstractServi /** All local Sones. */ /* synchronize access on this on itself. */ - private Map localSones = new HashMap(); + private final Map localSones = new HashMap(); /** All remote Sones. */ /* synchronize access on this on itself. */ - private Map remoteSones = new HashMap(); + private final Map remoteSones = new HashMap(); /** All known Sones. */ - private Set knownSones = new HashSet(); + private final Set knownSones = new HashSet(); /** All posts. */ - private Map posts = new HashMap(); + private final Map posts = new HashMap(); /** All known posts. */ - private Set knownPosts = new HashSet(); + private final Set knownPosts = new HashSet(); /** All replies. */ - private Map replies = new HashMap(); + private final Map replies = new HashMap(); /** All known replies. */ - private Set knownReplies = new HashSet(); + private final Set knownReplies = new HashSet(); /** All bookmarked posts. */ /* synchronize access on itself. */ - private Set bookmarkedPosts = new HashSet(); + private final Set bookmarkedPosts = new HashSet(); /** Trusted identities, sorted by own identities. */ - private Map> trustedIdentities = Collections.synchronizedMap(new HashMap>()); + private final Map> trustedIdentities = Collections.synchronizedMap(new HashMap>()); /** All known albums. */ - private Map albums = new HashMap(); + private final Map albums = new HashMap(); /** All known images. */ - private Map images = new HashMap(); + private final Map images = new HashMap(); /** All temporary images. */ - private Map temporaryImages = new HashMap(); + private final Map temporaryImages = new HashMap(); /** Ticker for threads that mark own elements as known. */ - private Ticker localElementTicker = new Ticker(); + private final Ticker localElementTicker = new Ticker(); /** The time the configuration was last touched. */ private volatile long lastConfigurationUpdate; @@@ -858,7 -858,7 +858,7 @@@ try { sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri())); } catch (MalformedURLException mue1) { - logger.log(Level.SEVERE, "Could not convert the Identityâs URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1); + logger.log(Level.SEVERE, String.format("Could not convert the Identityâs URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1); return null; } sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)); @@@ -887,7 -887,7 +887,7 @@@ try { ownIdentity.addContext("Sone"); } catch (WebOfTrustException wote1) { - logger.log(Level.SEVERE, "Could not add âSoneâ context to own identity: " + ownIdentity, wote1); + logger.log(Level.SEVERE, String.format("Could not add âSoneâ context to own identity: %s", ownIdentity), wote1); return null; } Sone sone = addLocalSone(ownIdentity); @@@ -1050,7 -1050,7 +1050,7 @@@ */ public Trust getTrust(Sone origin, Sone target) { if (!isLocalSone(origin)) { - logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin); + logger.log(Level.WARNING, String.format("Tried to get trust from remote Sone: %s", origin)); return null; } return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity()); @@@ -1071,7 -1071,7 +1071,7 @@@ try { ((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment()); } catch (WebOfTrustException wote1) { - logger.log(Level.WARNING, "Could not set trust for Sone: " + target, wote1); + logger.log(Level.WARNING, String.format("Could not set trust for Sone: %s", target), wote1); } } @@@ -1088,7 -1088,7 +1088,7 @@@ try { ((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity()); } catch (WebOfTrustException wote1) { - logger.log(Level.WARNING, "Could not remove trust for Sone: " + target, wote1); + logger.log(Level.WARNING, String.format("Could not remove trust for Sone: %s", target), wote1); } } @@@ -1153,7 -1153,7 +1153,7 @@@ if (hasSone(sone.getId())) { Sone storedSone = getSone(sone.getId()); if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) { - logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone }); + logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone)); return; } synchronized (posts) { @@@ -1266,12 -1266,12 +1266,12 @@@ */ public void deleteSone(Sone sone) { if (!(sone.getIdentity() instanceof OwnIdentity)) { - logger.log(Level.WARNING, "Tried to delete Sone of non-own identity: %s", sone); + logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone)); return; } synchronized (localSones) { if (!localSones.containsKey(sone.getId())) { - logger.log(Level.WARNING, "Tried to delete non-local Sone: %s", sone); + logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone)); return; } localSones.remove(sone.getId()); @@@ -1283,7 -1283,7 +1283,7 @@@ ((OwnIdentity) sone.getIdentity()).removeContext("Sone"); ((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition"); } catch (WebOfTrustException wote1) { - logger.log(Level.WARNING, "Could not remove context and properties from Sone: " + sone, wote1); + logger.log(Level.WARNING, String.format("Could not remove context and properties from Sone: %s", sone), wote1); } try { configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null); @@@ -1319,7 -1319,7 +1319,7 @@@ */ public void loadSone(Sone sone) { if (!isLocalSone(sone)) { - logger.log(Level.FINE, "Tried to load non-local Sone: %s", sone); + logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone)); return; } @@@ -1451,14 -1451,12 +1451,14 @@@ if (albumParentId != null) { Album parentAlbum = getAlbum(albumParentId, false); if (parentAlbum == null) { - logger.log(Level.WARNING, "Invalid parent album ID: " + albumParentId); + logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId)); return; } parentAlbum.addAlbum(album); } else { - topLevelAlbums.add(album); + if (!topLevelAlbums.contains(album)) { + topLevelAlbums.add(album); + } } } @@@ -1596,7 -1594,7 +1596,7 @@@ */ public Post createPost(Sone sone, Sone recipient, long time, String text) { if (!isLocalSone(sone)) { - logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone); + logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone)); return null; } final Post post = new Post(sone, time, text); @@@ -1630,7 -1628,7 +1630,7 @@@ */ public void deletePost(Post post) { if (!isLocalSone(post.getSone())) { - logger.log(Level.WARNING, "Tried to delete post of non-local Sone: %s", post.getSone()); + logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone())); return; } post.getSone().removePost(post); @@@ -1736,7 -1734,7 +1736,7 @@@ */ public PostReply createReply(Sone sone, Post post, long time, String text) { if (!isLocalSone(sone)) { - logger.log(Level.FINE, "Tried to create reply for non-local Sone: %s", sone); + logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone)); return null; } final PostReply reply = new PostReply(sone, post, System.currentTimeMillis(), text); @@@ -1770,7 -1768,7 +1770,7 @@@ public void deleteReply(PostReply reply) { Sone sone = reply.getSone(); if (!isLocalSone(sone)) { - logger.log(Level.FINE, "Tried to delete non-local reply: %s", reply); + logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply)); return; } synchronized (replies) { @@@ -2016,15 -2014,15 +2016,15 @@@ */ private synchronized void saveSone(Sone sone) { if (!isLocalSone(sone)) { - logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone); + logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone)); return; } if (!(sone.getIdentity() instanceof OwnIdentity)) { - logger.log(Level.WARNING, "Local Sone without OwnIdentity found, refusing to save: %s", sone); + logger.log(Level.WARNING, String.format("Local Sone without OwnIdentity found, refusing to save: %s", sone)); return; } - logger.log(Level.INFO, "Saving Sone: %s", sone); + logger.log(Level.INFO, String.format("Saving Sone: %s", sone)); try { /* save Sone into configuration. */ String sonePrefix = "Sone/" + sone.getId(); @@@ -2139,11 -2137,11 +2139,11 @@@ ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition())); - logger.log(Level.INFO, "Sone %s saved.", sone); + logger.log(Level.INFO, String.format("Sone %s saved.", sone)); } catch (ConfigurationException ce1) { - logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1); + logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1); } catch (WebOfTrustException wote1) { - logger.log(Level.WARNING, "Could not set WoT property for Sone: " + sone, wote1); + logger.log(Level.WARNING, String.format("Could not set WoT property for Sone: %s", sone), wote1); } } @@@ -2380,7 -2378,7 +2380,7 @@@ try { options.getIntegerOption(optionName).set(configuration.getIntValue("Option/" + optionName).getValue(null)); } catch (IllegalArgumentException iae1) { - logger.log(Level.WARNING, "Invalid value for " + optionName + " in configuration, using default."); + logger.log(Level.WARNING, String.format("Invalid value for %s in configuration, using default.", optionName)); } } @@@ -2396,7 -2394,7 +2396,7 @@@ FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]); return uri; } catch (MalformedURLException mue1) { - logger.log(Level.WARNING, "Could not create Sone URI from URI: " + uriString, mue1); + logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString, mue1)); return null; } } @@@ -2410,7 -2408,7 +2410,7 @@@ */ @Override public void ownIdentityAdded(OwnIdentity ownIdentity) { - logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity); + logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity)); if (ownIdentity.hasContext("Sone")) { trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet())); addLocalSone(ownIdentity); @@@ -2422,7 -2420,7 +2422,7 @@@ */ @Override public void ownIdentityRemoved(OwnIdentity ownIdentity) { - logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity); + logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity)); trustedIdentities.remove(ownIdentity); } @@@ -2431,7 -2429,7 +2431,7 @@@ */ @Override public void identityAdded(OwnIdentity ownIdentity, Identity identity) { - logger.log(Level.FINEST, "Adding Identity: " + identity); + logger.log(Level.FINEST, String.format("Adding Identity: %s", identity)); trustedIdentities.get(ownIdentity).add(identity); addRemoteSone(identity); } @@@ -2550,7 -2548,7 +2550,7 @@@ */ @Override public void imageInsertStarted(Image image) { - logger.log(Level.WARNING, "Image insert started for " + image); + logger.log(Level.WARNING, String.format("Image insert started for %s...", image)); coreListenerManager.fireImageInsertStarted(image); } @@@ -2559,7 -2557,7 +2559,7 @@@ */ @Override public void imageInsertAborted(Image image) { - logger.log(Level.WARNING, "Image insert aborted for " + image); + logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image)); coreListenerManager.fireImageInsertAborted(image); } @@@ -2568,7 -2566,7 +2568,7 @@@ */ @Override public void imageInsertFinished(Image image, FreenetURI key) { - logger.log(Level.WARNING, "Image insert finished for " + image + ": " + key); + logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", image, key)); image.setKey(key.toString()); deleteTemporaryImage(image.getId()); saveSone(image.getSone()); @@@ -2580,7 -2578,7 +2580,7 @@@ */ @Override public void imageInsertFailed(Image image, Throwable cause) { - logger.log(Level.WARNING, "Image insert failed for " + image, cause); + logger.log(Level.WARNING, String.format("Image insert failed for %s." + image), cause); coreListenerManager.fireImageInsertFailed(image, cause); } diff --combined src/main/java/net/pterodactylus/sone/core/FreenetInterface.java index 8fa1b10,3348e88..a8f3efa --- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java +++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - FreenetInterface.java - Copyright Â© 2010 David Roden + * Sone - FreenetInterface.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -111,7 -111,7 +111,7 @@@ public class FreenetInterface currentUri = fe1.newURI; continue; } - logger.log(Level.WARNING, "Could not fetch â" + uri + "â!", fe1); + logger.log(Level.WARNING, String.format("Could not fetch â%sâ!", uri), fe1); return null; } } @@@ -189,13 -189,13 +189,13 @@@ */ public void registerUsk(final Sone sone, final SoneDownloader soneDownloader) { try { - logger.log(Level.FINE, "Registering Sone â%sâ for USK updates at %sâ¦", new Object[] { sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" }) }); + logger.log(Level.FINE, String.format("Registering Sone â%sâ for USK updates at %sâ¦", sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" }))); USKCallback uskCallback = new USKCallback() { @Override @SuppressWarnings("synthetic-access") public void onFoundEdition(long edition, USK key, ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) { - logger.log(Level.FINE, "Found USK update for Sone â%sâ at %s, new known good: %s, new slot too: %s.", new Object[] { sone, key, newKnownGood, newSlotToo }); + logger.log(Level.FINE, String.format("Found USK update for Sone â%sâ at %s, new known good: %s, new slot too: %s.", sone, key, newKnownGood, newSlotToo)); if (edition > sone.getLatestEdition()) { sone.setLatestEdition(edition); new Thread(new Runnable() { @@@ -221,7 -221,7 +221,7 @@@ soneUskCallbacks.put(sone.getId(), uskCallback); node.clientCore.uskManager.subscribe(USK.create(sone.getRequestUri()), uskCallback, (System.currentTimeMillis() - sone.getTime()) < 7 * 24 * 60 * 60 * 1000, (HighLevelSimpleClientImpl) client); } catch (MalformedURLException mue1) { - logger.log(Level.WARNING, "Could not subscribe USK â" + sone.getRequestUri() + "â!", mue1); + logger.log(Level.WARNING, String.format("Could not subscribe USK â%sâ!", sone.getRequestUri()), mue1); } } @@@ -237,10 -237,10 +237,10 @@@ return; } try { - logger.log(Level.FINEST, "Unsubscribing from USK for %sâ¦", new Object[] { sone }); + logger.log(Level.FINEST, String.format("Unsubscribing from USK for %sâ¦", sone)); node.clientCore.uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback); } catch (MalformedURLException mue1) { - logger.log(Level.FINE, "Could not unsubscribe USK â" + sone.getRequestUri() + "â!", mue1); + logger.log(Level.FINE, String.format("Could not unsubscribe USK â%sâ!", sone.getRequestUri()), mue1); } } @@@ -276,7 -276,7 +276,7 @@@ node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, (HighLevelSimpleClientImpl) client); uriUskCallbacks.put(uri, uskCallback); } catch (MalformedURLException mue1) { - logger.log(Level.WARNING, "Could not subscribe to USK: " + uri, uri); + logger.log(Level.WARNING, String.format("Could not subscribe to USK: %s", uri), mue1); } } @@@ -289,13 -289,13 +289,13 @@@ public void unregisterUsk(FreenetURI uri) { USKCallback uskCallback = uriUskCallbacks.remove(uri); if (uskCallback == null) { - logger.log(Level.INFO, "Could not unregister unknown USK: " + uri); + logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri)); return; } try { node.clientCore.uskManager.unsubscribe(USK.create(uri), uskCallback); } catch (MalformedURLException mue1) { - logger.log(Level.INFO, "Could not unregister invalid USK: " + uri); + logger.log(Level.INFO, String.format("Could not unregister invalid USK: %s", uri), mue1); } } diff --combined src/main/java/net/pterodactylus/sone/core/SoneDownloader.java index 8cc6d95,98337b9..72ff008 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - SoneDownloader.java - Copyright Â© 2010 David Roden + * Sone - SoneDownloader.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -151,7 -151,7 +151,7 @@@ public class SoneDownloader extends Abs * downloaded */ public Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly) { - logger.log(Level.FINE, "Starting fetch for Sone â%sâ from %sâ¦", new Object[] { sone, soneUri }); + logger.log(Level.FINE, String.format("Starting fetch for Sone â%sâ from %sâ¦", sone, soneUri)); FreenetURI requestUri = soneUri.setMetaString(new String[] { "sone.xml" }); sone.setStatus(SoneStatus.downloading); try { @@@ -160,7 -160,7 +160,7 @@@ /* TODO - mark Sone as bad. */ return null; } - logger.log(Level.FINEST, "Got %d bytes back.", fetchResults.getRight().size()); + logger.log(Level.FINEST, String.format("Got %d bytes back.", fetchResults.getRight().size())); Sone parsedSone = parseSone(sone, fetchResults.getRight(), fetchResults.getLeft()); if (parsedSone != null) { if (!fetchOnly) { @@@ -186,7 -186,7 +186,7 @@@ * @return The parsed Sone, or {@code null} if the Sone could not be parsed */ public Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) { - logger.log(Level.FINEST, "Parsing FetchResult (%d bytes, %s) for %sâ¦", new Object[] { fetchResult.size(), fetchResult.getMimeType(), originalSone }); + logger.log(Level.FINEST, String.format("Parsing FetchResult (%d bytes, %s) for %sâ¦", fetchResult.size(), fetchResult.getMimeType(), originalSone)); Bucket soneBucket = fetchResult.asBucket(); InputStream soneInputStream = null; try { @@@ -202,7 -202,7 +202,7 @@@ } return parsedSone; } catch (Exception e1) { - logger.log(Level.WARNING, "Could not parse Sone from " + requestUri + "!", e1); + logger.log(Level.WARNING, String.format("Could not parse Sone from %s!", requestUri), e1); } finally { Closer.close(soneInputStream); soneBucket.free(); @@@ -232,7 -232,7 +232,7 @@@ } if (document == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Could not parse XML for Sone %s!", new Object[] { originalSone }); + logger.log(Level.WARNING, String.format("Could not parse XML for Sone %s!", originalSone)); return null; } @@@ -243,7 -243,7 +243,7 @@@ soneXml = SimpleXML.fromDocument(document); } catch (NullPointerException npe1) { /* for some reason, invalid XML can cause NPEs. */ - logger.log(Level.WARNING, "XML for Sone " + sone + " can not be parsed!", npe1); + logger.log(Level.WARNING, String.format("XML for Sone %s can not be parsed!", sone), npe1); return null; } @@@ -258,27 -258,27 +258,27 @@@ } if (protocolVersion < 0) { - logger.log(Level.WARNING, "Invalid protocol version: " + protocolVersion + "! Not parsing Sone."); + logger.log(Level.WARNING, String.format("Invalid protocol version: %d! Not parsing Sone.", protocolVersion)); return null; } /* check for valid versions. */ if (protocolVersion > MAX_PROTOCOL_VERSION) { - logger.log(Level.WARNING, "Unknown protocol version: " + protocolVersion + "! Not parsing Sone."); + logger.log(Level.WARNING, String.format("Unknown protocol version: %d! Not parsing Sone.", protocolVersion)); return null; } String soneTime = soneXml.getValue("time", null); if (soneTime == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded time for Sone %s was null!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded time for Sone %s was null!", sone)); return null; } try { sone.setTime(Long.parseLong(soneTime)); } catch (NumberFormatException nfe1) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s with invalid time: %s", new Object[] { sone, soneTime }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s with invalid time: %s", sone, soneTime)); return null; } @@@ -287,7 -287,7 +287,7 @@@ String clientName = clientXml.getValue("name", null); String clientVersion = clientXml.getValue("version", null); if ((clientName == null) || (clientVersion == null)) { - logger.log(Level.WARNING, "Download Sone %s with client XML but missing name or version!", sone); + logger.log(Level.WARNING, String.format("Download Sone %s with client XML but missing name or version!", sone)); return null; } sone.setClient(new Client(clientName, clientVersion)); @@@ -299,7 -299,7 +299,7 @@@ sone.setRequestUri(new FreenetURI(soneRequestUri)); } catch (MalformedURLException mue1) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone " + sone + " has invalid request URI: " + soneRequestUri, mue1); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid request URI: %s", sone, soneRequestUri), mue1); return null; } } @@@ -311,7 -311,7 +311,7 @@@ sone.setLatestEdition(Math.max(sone.getRequestUri().getEdition(), sone.getInsertUri().getEdition())); } catch (MalformedURLException mue1) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone " + sone + " has invalid insert URI: " + soneInsertUri, mue1); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has invalid insert URI: %s", sone, soneInsertUri), mue1); return null; } } @@@ -319,7 -319,7 +319,7 @@@ SimpleXML profileXml = soneXml.getNode("profile"); if (profileXml == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no profile!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has no profile!", sone)); return null; } @@@ -342,13 -342,13 +342,13 @@@ String fieldName = fieldXml.getValue("field-name", null); String fieldValue = fieldXml.getValue("field-value", ""); if (fieldName == null) { - logger.log(Level.WARNING, "Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", new Object[] { sone, fieldName, fieldValue }); + logger.log(Level.WARNING, String.format("Downloaded profile field for Sone %s with missing data! Name: %s, Value: %s", sone, fieldName, fieldValue)); return null; } try { profile.addField(fieldName).setValue(fieldValue); } catch (IllegalArgumentException iae1) { - logger.log(Level.WARNING, "Duplicate field: " + fieldName, iae1); + logger.log(Level.WARNING, String.format("Duplicate field: %s", fieldName), iae1); return null; } } @@@ -359,7 -359,7 +359,7 @@@ Set posts = new HashSet(); if (postsXml == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no posts!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has no posts!", sone)); } else { for (SimpleXML postXml : postsXml.getNodes("post")) { String postId = postXml.getValue("id", null); @@@ -368,7 -368,7 +368,7 @@@ String postText = postXml.getValue("text", null); if ((postId == null) || (postTime == null) || (postText == null)) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded post for Sone %s with missing data! ID: %s, Time: %s, Text: %s", new Object[] { sone, postId, postTime, postText }); + logger.log(Level.WARNING, String.format("Downloaded post for Sone %s with missing data! ID: %s, Time: %s, Text: %s", sone, postId, postTime, postText)); return null; } try { @@@ -379,7 -379,7 +379,7 @@@ posts.add(post); } catch (NumberFormatException nfe1) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded post for Sone %s with invalid time: %s", new Object[] { sone, postTime }); + logger.log(Level.WARNING, String.format("Downloaded post for Sone %s with invalid time: %s", sone, postTime)); return null; } } @@@ -390,7 -390,7 +390,7 @@@ Set replies = new HashSet(); if (repliesXml == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has no replies!", sone)); } else { for (SimpleXML replyXml : repliesXml.getNodes("reply")) { String replyId = replyXml.getValue("id", null); @@@ -399,14 -399,14 +399,14 @@@ String replyText = replyXml.getValue("text", null); if ((replyId == null) || (replyPostId == null) || (replyTime == null) || (replyText == null)) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded reply for Sone %s with missing data! ID: %s, Post: %s, Time: %s, Text: %s", new Object[] { sone, replyId, replyPostId, replyTime, replyText }); + logger.log(Level.WARNING, String.format("Downloaded reply for Sone %s with missing data! ID: %s, Post: %s, Time: %s, Text: %s", sone, replyId, replyPostId, replyTime, replyText)); return null; } try { replies.add(core.getReply(replyId).setSone(sone).setPost(core.getPost(replyPostId)).setTime(Long.parseLong(replyTime)).setText(replyText)); } catch (NumberFormatException nfe1) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded reply for Sone %s with invalid time: %s", new Object[] { sone, replyTime }); + logger.log(Level.WARNING, String.format("Downloaded reply for Sone %s with invalid time: %s", sone, replyTime)); return null; } } @@@ -417,7 -417,7 +417,7 @@@ Set likedPostIds = new HashSet(); if (likePostIdsXml == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no post likes!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has no post likes!", sone)); } else { for (SimpleXML likedPostIdXml : likePostIdsXml.getNodes("post-like")) { String postId = likedPostIdXml.getValue(); @@@ -430,7 -430,7 +430,7 @@@ Set likedReplyIds = new HashSet(); if (likeReplyIdsXml == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no reply likes!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has no reply likes!", sone)); } else { for (SimpleXML likedReplyIdXml : likeReplyIdsXml.getNodes("reply-like")) { String replyId = likedReplyIdXml.getValue(); @@@ -449,14 -449,14 +449,14 @@@ String description = albumXml.getValue("description", ""); String albumImageId = albumXml.getValue("album-image", null); if ((id == null) || (title == null) || (description == null)) { - logger.log(Level.WARNING, "Downloaded Sone %s contains invalid album!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid album!", sone)); return null; } Album parent = null; if (parentId != null) { parent = core.getAlbum(parentId, false); if (parent == null) { - logger.log(Level.WARNING, "Downloaded Sone %s has album with invalid parent!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s has album with invalid parent!", sone)); return null; } } @@@ -477,14 -477,14 +477,14 @@@ String imageWidthString = imageXml.getValue("width", null); String imageHeightString = imageXml.getValue("height", null); if ((imageId == null) || (imageCreationTimeString == null) || (imageKey == null) || (imageTitle == null) || (imageWidthString == null) || (imageHeightString == null)) { - logger.log(Level.WARNING, "Downloaded Sone %s contains invalid images!", new Object[] { sone }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s contains invalid images!", sone)); return null; } long creationTime = Numbers.safeParseLong(imageCreationTimeString, 0L); int imageWidth = Numbers.safeParseInteger(imageWidthString, 0); int imageHeight = Numbers.safeParseInteger(imageHeightString, 0); if ((imageWidth < 1) || (imageHeight < 1)) { - logger.log(Level.WARNING, "Downloaded Sone %s contains image %s with invalid dimensions (%s, %s)!", new Object[] { sone, imageId, imageWidthString, imageHeightString }); + logger.log(Level.WARNING, String.format("Downloaded Sone %s contains image %s with invalid dimensions (%s, %s)!", sone, imageId, imageWidthString, imageHeightString)); return null; } Image image = core.getImage(imageId).setSone(sone).setKey(imageKey).setCreationTime(creationTime); diff --combined src/main/java/net/pterodactylus/sone/core/SoneInserter.java index 3dad6f6,9f45e2e..534985a --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - SoneInserter.java - Copyright Â© 2010 David Roden + * Sone - SoneInserter.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -214,11 -214,11 +214,11 @@@ public class SoneInserter extends Abstr if (fingerprint.equals(lastInsertedFingerprint)) { modified = false; lastModificationTime = 0; - logger.log(Level.FINE, "Sone %s has been reverted to last insert state.", sone); + logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone)); } else { lastModificationTime = System.currentTimeMillis(); modified = true; - logger.log(Level.FINE, "Sone %s has been modified, waiting %d seconds before inserting.", new Object[] { sone.getName(), insertionDelay }); + logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay)); } lastFingerprint = fingerprint; } @@@ -229,7 -229,7 +229,7 @@@ } if (insertInformation != null) { - logger.log(Level.INFO, "Inserting Sone â%sââ¦", new Object[] { sone.getName() }); + logger.log(Level.INFO, String.format("Inserting Sone â%sââ¦", sone.getName())); boolean success = false; try { @@@ -248,10 -248,10 +248,10 @@@ sone.setLatestEdition(finalUri.getEdition()); core.touchConfiguration(); success = true; - logger.log(Level.INFO, "Inserted Sone â%sâ at %s.", new Object[] { sone.getName(), finalUri }); + logger.log(Level.INFO, String.format("Inserted Sone â%sâ at %s.", sone.getName(), finalUri)); } catch (SoneException se1) { soneInsertListenerManager.fireInsertAborted(se1); - logger.log(Level.WARNING, "Could not insert Sone â" + sone.getName() + "â!", se1); + logger.log(Level.WARNING, String.format("Could not insert Sone â%sâ!", sone.getName()), se1); } finally { sone.setStatus(SoneStatus.idle); } @@@ -263,7 -263,7 +263,7 @@@ if (success) { synchronized (sone) { if (lastInsertedFingerprint.equals(sone.getFingerprint())) { - logger.log(Level.FINE, "Sone â%sâ was not modified further, resetting counterâ¦", new Object[] { sone }); + logger.log(Level.FINE, String.format("Sone â%sâ was not modified further, resetting counterâ¦", sone)); lastModificationTime = 0; lastInsertFingerprint = lastInsertedFingerprint; core.touchConfiguration(); @@@ -376,7 -376,7 +376,7 @@@ templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset); template = TemplateParser.parse(templateInputStreamReader); } catch (TemplateException te1) { - logger.log(Level.SEVERE, "Could not parse template â" + templateName + "â!", te1); + logger.log(Level.SEVERE, String.format("Could not parse template â%sâ!", templateName), te1); return null; } finally { Closer.close(templateInputStreamReader); @@@ -394,7 -394,7 +394,7 @@@ bucket = new StringBucket(writer.toString(), utf8Charset); return new ManifestElement(name, bucket, contentType, bucket.size()); } catch (TemplateException te1) { - logger.log(Level.SEVERE, "Could not render template â" + templateName + "â!", te1); + logger.log(Level.SEVERE, String.format("Could not render template â%sâ!", templateName), te1); return null; } finally { Closer.close(writer); diff --combined src/main/java/net/pterodactylus/sone/core/UpdateChecker.java index 05bb652,511f4e1..003e276 --- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java +++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - UpdateChecker.java - Copyright Â© 2011 David Roden + * Sone - UpdateChecker.java - Copyright Â© 2011â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -166,11 -166,11 +166,11 @@@ public class UpdateChecker @Override @SuppressWarnings("synthetic-access") public void editionFound(FreenetURI uri, long edition, boolean newKnownGood, boolean newSlot) { - logger.log(Level.FINEST, "Found update for %s: %d, %s, %s", new Object[] { uri, edition, newKnownGood, newSlot }); + logger.log(Level.FINEST, String.format("Found update for %s: %d, %s, %s", uri, edition, newKnownGood, newSlot)); if (newKnownGood || newSlot) { Pair uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" })); if (uriResult == null) { - logger.log(Level.WARNING, "Could not fetch properties of latest homepage: %s", uri); + logger.log(Level.WARNING, String.format("Could not fetch properties of latest homepage: %s", uri)); return; } Bucket resultBucket = uriResult.getRight().asBucket(); @@@ -178,7 -178,7 +178,7 @@@ parseProperties(resultBucket.getInputStream(), edition); latestEdition = edition; } catch (IOException ioe1) { - logger.log(Level.WARNING, "Could not parse sone.properties of " + uri, ioe1); + logger.log(Level.WARNING, String.format("Could not parse sone.properties of %s!", uri), ioe1); } finally { resultBucket.free(); } @@@ -240,7 -240,7 +240,7 @@@ if (version.compareTo(currentLatestVersion) > 0) { currentLatestVersion = version; latestVersionDate = releaseTime; - logger.log(Level.INFO, "Found new version: %s (%tc)", new Object[] { version, new Date(releaseTime) }); + logger.log(Level.INFO, String.format("Found new version: %s (%tc)", version, new Date(releaseTime))); updateListenerManager.fireUpdateFound(version, releaseTime, edition); } } diff --combined src/main/java/net/pterodactylus/sone/data/Sone.java index c2c091f,e5ebcf1..ac6e41a --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - Sone.java - Copyright Â© 2010 David Roden + * Sone - Sone.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -33,7 -33,7 +33,7 @@@ import net.pterodactylus.sone.core.Opti import net.pterodactylus.sone.freenet.wot.Identity; import net.pterodactylus.sone.freenet.wot.OwnIdentity; import net.pterodactylus.sone.template.SoneAccessor; -import net.pterodactylus.util.filter.Filter; +import net.pterodactylus.util.collection.filter.Filter; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.validation.Validation; import freenet.keys.FreenetURI; @@@ -305,7 -305,7 +305,7 @@@ public class Sone implements Fingerprin return this; } if (!this.requestUri.equalsKeypair(requestUri)) { - logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri }); + logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", requestUri, this.requestUri)); return this; } return this; @@@ -333,7 -333,7 +333,7 @@@ return this; } if (!this.insertUri.equalsKeypair(insertUri)) { - logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri }); + logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", insertUri, this.insertUri)); return this; } return this; @@@ -358,7 -358,7 +358,7 @@@ */ public void setLatestEdition(long latestEdition) { if (!(latestEdition > this.latestEdition)) { - logger.log(Level.FINE, "New latest edition %d is not greater than current latest edition %d!", new Object[] { latestEdition, this.latestEdition }); + logger.log(Level.FINE, String.format("New latest edition %d is not greater than current latest edition %d!", latestEdition, this.latestEdition)); return; } this.latestEdition = latestEdition; @@@ -560,7 -560,7 +560,7 @@@ */ public void addPost(Post post) { if (post.getSone().equals(this) && posts.add(post)) { - logger.log(Level.FINEST, "Adding %s to â%sâ.", new Object[] { post, getName() }); + logger.log(Level.FINEST, String.format("Adding %s to â%sâ.", post, getName())); } } diff --combined src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java index e155d7c,6a16cc5..6fe4101 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - DefaultIdentity.java - Copyright Â© 2010 David Roden + * Sone - DefaultIdentity.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -254,7 -254,7 +254,7 @@@ public class DefaultIdentity implement return trustCache.get(ownIdentity); } } catch (CacheException ce1) { - logger.log(Level.WARNING, "Could not get trust for OwnIdentity: " + ownIdentity, ce1); + logger.log(Level.WARNING, String.format("Could not get trust for OwnIdentity: %s", ownIdentity), ce1); return null; } } diff --combined src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java index 4085b1a,5cacb68..a7c6524 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - WebOfTrustConnector.java - Copyright Â© 2010 David Roden + * Sone - WebOfTrustConnector.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -134,7 -134,7 +134,7 @@@ public class WebOfTrustConnector implem * if an error occured talking to the Web of Trust plugin */ public Set loadTrustedIdentities(OwnIdentity ownIdentity, String context) throws PluginException { - Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("TreeOwner", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).get()); + Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("Truster", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).get()); SimpleFieldSet fields = reply.getFields(); Set identities = new HashSet(); int identityCounter = -1; @@@ -382,16 -382,16 +382,16 @@@ */ private synchronized Reply performRequest(SimpleFieldSet fields, Bucket data) throws PluginException { reply = new Reply(); - logger.log(Level.FINE, "Sending FCP Request: " + fields.get("Message")); + logger.log(Level.FINE, String.format("Sending FCP Request: %s", fields.get("Message"))); synchronized (reply) { pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data); try { reply.wait(); } catch (InterruptedException ie1) { - logger.log(Level.WARNING, "Got interrupted while waiting for reply on " + fields.get("Message") + ".", ie1); + logger.log(Level.WARNING, String.format("Got interrupted while waiting for reply on %s.", fields.get("Message")), ie1); } } - logger.log(Level.FINEST, "Received FCP Response for %s: %s", new Object[] { fields.get("Message"), (reply.getFields() != null) ? reply.getFields().get("Message") : null }); + logger.log(Level.FINEST, String.format("Received FCP Response for %s: %s", fields.get("Message"), (reply.getFields() != null) ? reply.getFields().get("Message") : null)); if ((reply.getFields() == null) || "Error".equals(reply.getFields().get("Message"))) { throw new PluginException("Could not perform request for " + fields.get("Message")); } @@@ -408,7 -408,7 +408,7 @@@ @Override public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) { String messageName = fields.get("Message"); - logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName); + logger.log(Level.FINEST, String.format("Received Reply from Plugin: %s", messageName)); synchronized (reply) { reply.setFields(fields); reply.setData(data); diff --combined src/main/java/net/pterodactylus/sone/main/SonePlugin.java index e05a311,573ed73..6e6ff91 --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - SonePlugin.java - Copyright Â© 2010 David Roden + * Sone - SonePlugin.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -68,22 -68,22 +68,22 @@@ public class SonePlugin implements Fred Class loggerClass = Logging.getLoggerClass(logRecord.getLoggerName()); int recordLevel = logRecord.getLevel().intValue(); if (recordLevel < Level.FINE.intValue()) { - freenet.support.Logger.debug(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown()); + freenet.support.Logger.debug(loggerClass, logRecord.getMessage(), logRecord.getThrown()); } else if (recordLevel < Level.INFO.intValue()) { - freenet.support.Logger.minor(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown()); + freenet.support.Logger.minor(loggerClass, logRecord.getMessage(), logRecord.getThrown()); } else if (recordLevel < Level.WARNING.intValue()) { - freenet.support.Logger.normal(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown()); + freenet.support.Logger.normal(loggerClass, logRecord.getMessage(), logRecord.getThrown()); } else if (recordLevel < Level.SEVERE.intValue()) { - freenet.support.Logger.warning(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown()); + freenet.support.Logger.warning(loggerClass, logRecord.getMessage(), logRecord.getThrown()); } else { - freenet.support.Logger.error(loggerClass, String.format(logRecord.getMessage(), logRecord.getParameters()), logRecord.getThrown()); + freenet.support.Logger.error(loggerClass, logRecord.getMessage(), logRecord.getThrown()); } } }); } /** The version. */ - public static final Version VERSION = new Version(0, 8); + public static final Version VERSION = new Version(0, 8, 1); /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class); diff --combined src/main/java/net/pterodactylus/sone/template/SoneAccessor.java index 50c1f54,f6d3d2d..eac8a93 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - SoneAccessor.java - Copyright Â© 2010 David Roden + * Sone - SoneAccessor.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -107,7 -107,7 +107,7 @@@ public class SoneAccessor extends Refle return null; } Trust trust = core.getTrust(currentSone, sone); - logger.log(Level.FINEST, "Trust for %s by %s: %s", new Object[] { sone, currentSone, trust }); + logger.log(Level.FINEST, String.format("Trust for %s by %s: %s", sone, currentSone, trust)); if (trust == null) { return new Trust(null, null, null); } diff --combined src/main/java/net/pterodactylus/sone/text/SoneTextParser.java index 507523a,3362132..dd0da28 --- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java +++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - FreenetLinkParser.java - Copyright Â© 2010 David Roden + * Sone - FreenetLinkParser.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -237,8 -237,8 +237,8 @@@ public class SoneTextParser implements int nextSpace = matcher.find(0) ? matcher.start() : line.length(); String link = line.substring(0, nextSpace); String name = link; - logger.log(Level.FINER, "Found link: %s", link); - logger.log(Level.FINEST, "CHK: %d, SSK: %d, USK: %d", new Object[] { nextChk, nextSsk, nextUsk }); + logger.log(Level.FINER, String.format("Found link: %s", link)); + logger.log(Level.FINEST, String.format("CHK: %d, SSK: %d, USK: %d", nextChk, nextSsk, nextUsk)); if ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) { FreenetURI uri; diff --combined src/main/java/net/pterodactylus/sone/web/CreateSonePage.java index 2cdcfdf,fc9f0d1..a4c6379 --- a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - CreateSonePage.java - Copyright Â© 2010 David Roden + * Sone - CreateSonePage.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -115,7 -115,7 +115,7 @@@ public class CreateSonePage extends Son /* create Sone. */ Sone sone = webInterface.getCore().createSone(selectedIdentity); if (sone == null) { - logger.log(Level.SEVERE, "Could not create Sone for OwnIdentity: %s", selectedIdentity); + logger.log(Level.SEVERE, String.format("Could not create Sone for OwnIdentity: %s", selectedIdentity)); /* TODO - go somewhere else */ } diff --combined src/main/java/net/pterodactylus/sone/web/SearchPage.java index 0b3ad69,54b6f49..a4da9f4 --- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java +++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - SearchPage.java - Copyright Â© 2010 David Roden + * Sone - SearchPage.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -40,12 -40,12 +40,12 @@@ import net.pterodactylus.util.cache.Cac import net.pterodactylus.util.cache.DefaultCacheItem; import net.pterodactylus.util.cache.MemoryCache; import net.pterodactylus.util.cache.ValueRetriever; -import net.pterodactylus.util.collection.Mapper; -import net.pterodactylus.util.collection.Mappers; import net.pterodactylus.util.collection.Pagination; import net.pterodactylus.util.collection.TimedMap; -import net.pterodactylus.util.filter.Filter; -import net.pterodactylus.util.filter.Filters; +import net.pterodactylus.util.collection.filter.Filter; +import net.pterodactylus.util.collection.filter.Filters; +import net.pterodactylus.util.collection.mapper.Mapper; +import net.pterodactylus.util.collection.mapper.Mappers; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.template.Template; @@@ -230,7 -230,7 +230,7 @@@ public class SearchPage extends SoneTem * @return The score of the expression */ private double calculateScore(List phrases, String expression) { - logger.log(Level.FINEST, "Calculating Score for â%sââ¦", expression); + logger.log(Level.FINEST, String.format("Calculating Score for â%sââ¦", expression)); double optionalHits = 0; double requiredHits = 0; int forbiddenHits = 0; @@@ -250,10 -250,10 +250,10 @@@ } score += Math.pow(1 - position / (double) expression.length(), 2); index = position + phraseString.length(); - logger.log(Level.FINEST, "Got hit at position %d.", position); + logger.log(Level.FINEST, String.format("Got hit at position %d.", position)); ++matches; } - logger.log(Level.FINEST, "Score: %f", score); + logger.log(Level.FINEST, String.format("Score: %f", score)); if (matches == 0) { continue; } diff --combined src/main/java/net/pterodactylus/sone/web/WebInterface.java index daa20e8,f8b9c5a..74fdfc2 --- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java +++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - WebInterface.java - Copyright Â© 2010 David Roden + * Sone - WebInterface.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -110,7 -110,7 +110,7 @@@ import net.pterodactylus.util.cache.Def import net.pterodactylus.util.cache.MemoryCache; import net.pterodactylus.util.cache.ValueRetriever; import net.pterodactylus.util.collection.SetBuilder; -import net.pterodactylus.util.filter.Filters; +import net.pterodactylus.util.collection.filter.Filters; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.notify.Notification; import net.pterodactylus.util.notify.NotificationManager; @@@ -749,7 -749,7 +749,7 @@@ public class WebInterface implements Co } } } catch (IOException ioe1) { - logger.log(Level.WARNING, "Could not parse post text: " + text, ioe1); + logger.log(Level.WARNING, String.format("Could not parse post text: %s", text), ioe1); } return Filters.filteredSet(mentionedSones, Sone.LOCAL_SONE_FILTER); } @@@ -1043,7 -1043,7 +1043,7 @@@ try { return templateCache.get(templateName); } catch (CacheException ce1) { - logger.log(Level.WARNING, "Could not get template for " + templateName + "!", ce1); + logger.log(Level.WARNING, String.format("Could not get template for %s!", templateName), ce1); return null; } } @@@ -1066,7 -1066,7 +1066,7 @@@ try { template = TemplateParser.parse(templateReader); } catch (TemplateException te1) { - logger.log(Level.WARNING, "Could not parse template â" + templateName + "â for inclusion!", te1); + logger.log(Level.WARNING, String.format("Could not parse template â%sâ for inclusion!", templateName), te1); } return template; } diff --combined src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java index 45758af,cd15cbf..30071f5 --- a/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java @@@ -1,5 -1,5 +1,5 @@@ /* - * Sone - FreenetTemplatePage.java - Copyright Â© 2010 David Roden + * Sone - FreenetTemplatePage.java - Copyright Â© 2010â2012 David Roden * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@@ -155,7 -155,7 +155,7 @@@ public class FreenetTemplatePage implem long start = System.nanoTime(); processTemplate(request, templateContext); long finish = System.nanoTime(); - logger.log(Level.FINEST, "Template was rendered in " + ((finish - start) / 1000) / 1000.0 + "ms."); + logger.log(Level.FINEST, "Template was rendered in %dms.", ((finish - start) / 1000) / 1000.0); } catch (RedirectException re1) { return new RedirectResponse(re1.getTarget()); }