X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fwatchers%2FDefaultWatcher.java;h=9dc293011479eeca8237e1b12b956f99b07f731a;hb=00e49489dcbb093895a9a7bfb252b7392b341138;hp=fb6b21889b52e75959b8e355c041ff029141f041;hpb=b304bea61c03505fea7c288164ead3233ef36655;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/watchers/DefaultWatcher.java b/src/main/java/net/pterodactylus/rhynodge/watchers/DefaultWatcher.java
index fb6b218..9dc2930 100644
--- a/src/main/java/net/pterodactylus/rhynodge/watchers/DefaultWatcher.java
+++ b/src/main/java/net/pterodactylus/rhynodge/watchers/DefaultWatcher.java
@@ -22,8 +22,8 @@ import java.util.List;
 
 import net.pterodactylus.rhynodge.Filter;
 import net.pterodactylus.rhynodge.Query;
-import net.pterodactylus.rhynodge.Trigger;
 import net.pterodactylus.rhynodge.Watcher;
+import net.pterodactylus.rhynodge.Merger;
 
 /**
  * Abstract base implementation of a {@link Watcher}.
@@ -38,8 +38,8 @@ public class DefaultWatcher implements Watcher {
 	/** The filters of the watcher. */
 	private final List<Filter> filters = new ArrayList<Filter>();
 
-	/** The trigger of the watcher. */
-	private final Trigger trigger;
+	/** The merger of the watcher. */
+	private final Merger merger;
 
 	/**
 	 * Creates a new default watcher.
@@ -48,13 +48,13 @@ public class DefaultWatcher implements Watcher {
 	 *            The query of the watcher
 	 * @param filters
 	 *            The filters of the watcher
-	 * @param trigger
-	 *            The trigger of the watcher
+	 * @param merger
+	 *            The merger of the watcher
 	 */
-	protected DefaultWatcher(Query query, List<Filter> filters, Trigger trigger) {
+	protected DefaultWatcher(Query query, List<Filter> filters, Merger merger) {
 		this.query = query;
 		this.filters.addAll(filters);
-		this.trigger = trigger;
+		this.merger = merger;
 	}
 
 	//
@@ -77,12 +77,8 @@ public class DefaultWatcher implements Watcher {
 		return filters;
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public Trigger trigger() {
-		return trigger;
+	public Merger merger() {
+		return merger;
 	}
 
 }