Fix ALL the logging!

[Sone.git] / src / main / java / net / pterodactylus / sone / text / SoneTextParser.java

diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index 051c02a..3362132 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -202,11 +202,14 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
                                        if (line.length() >= (7 + 43)) {
                                                String soneId = line.substring(7, 50);
                                                Sone sone = soneProvider.getSone(soneId, false);
-                                               if ((sone != null) && (sone.getName() != null)) {
-                                                       parts.add(new SonePart(sone));
-                                               } else {
-                                                       parts.add(new PlainTextPart(line.substring(0, 50)));
+                                               if (sone == null) {
+                                                       /*
+                                                        * don’t use create=true above, we don’t want the
+                                                        * empty shell.
+                                                        */
+                                                       sone = new Sone(soneId);
                                                }
+                                               parts.add(new SonePart(sone));
                                                line = line.substring(50);
                                        } else {
                                                parts.add(new PlainTextPart(line));
@@ -234,8 +237,8 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
                                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;