X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.java;h=a9208dc950e034594b229c27b91e4edd1ab73bad;hb=f1a337e97c0188170e8ea8bb06b99324f3a07dee;hp=32697d8b4dfb4c5ab9a8899856c8ae5de19f8f48;hpb=006f1a6fc84028f610111cf822e0ecaee0bf0e7f;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index 32697d8..a9208dc 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneTextParser.java - Copyright © 2010–2012 David Roden
+ * Sone - SoneTextParser.java - Copyright © 2010–2013 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
@@ -26,14 +26,17 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import net.pterodactylus.sone.core.PostProvider;
-import net.pterodactylus.sone.core.SoneProvider;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.impl.DefaultSone;
+import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
+
 import freenet.keys.FreenetURI;
 
+import com.google.common.base.Optional;
+
 /**
  * {@link Parser} implementation that can recognize Freenet URIs.
  *
@@ -102,32 +105,21 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 
 	}
 
-	/** The Sone provider. */
-	private final SoneProvider soneProvider;
-
-	/** The post provider. */
-	private final PostProvider postProvider;
+	private final Database database;
 
 	/**
 	 * Creates a new freenet link parser.
 	 *
-	 * @param soneProvider
-	 *            The Sone provider
-	 * @param postProvider
-	 *            The post provider
+	 * @param database
 	 */
-	public SoneTextParser(SoneProvider soneProvider, PostProvider postProvider) {
-		this.soneProvider = soneProvider;
-		this.postProvider = postProvider;
+	public SoneTextParser(Database database) {
+		this.database = database;
 	}
 
 	//
 	// PART METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public Iterable<Part> parse(SoneTextParserContext context, Reader source) throws IOException {
 		PartContainer parts = new PartContainer();
@@ -239,15 +231,15 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 					if (linkType == LinkType.SONE) {
 						if (line.length() >= (7 + 43)) {
 							String soneId = line.substring(7, 50);
-							Sone sone = soneProvider.getSone(soneId, false);
-							if (sone == null) {
+							Optional<Sone> sone = database.getSone(soneId);
+							if (!sone.isPresent()) {
 								/*
 								 * don’t use create=true above, we don’t want
 								 * the empty shell.
 								 */
-								sone = new Sone(soneId, false);
+								sone = Optional.<Sone>of(new DefaultSone(database, soneId, false, null));
 							}
-							parts.add(new SonePart(sone));
+							parts.add(new SonePart(sone.get()));
 							line = line.substring(50);
 						} else {
 							parts.add(new PlainTextPart(line));
@@ -258,9 +250,9 @@ public class SoneTextParser implements Parser<SoneTextParserContext> {
 					if (linkType == LinkType.POST) {
 						if (line.length() >= (7 + 36)) {
 							String postId = line.substring(7, 43);
-							Post post = postProvider.getPost(postId, false);
-							if ((post != null) && (post.getSone() != null)) {
-								parts.add(new PostPart(post));
+							Optional<Post> post = database.getPost(postId);
+							if (post.isPresent()) {
+								parts.add(new PostPart(post.get()));
 							} else {
 								parts.add(new PlainTextPart(line.substring(0, 43)));
 							}