refactor package

source/net/yacy/contentcontrol/ContentControlFilterUpdateThread.java

@@ -1,4 +1,4 @@
-package net.yacy.interaction.contentcontrol;
+package net.yacy.contentcontrol;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -30,7 +30,7 @@ public class ContentControlFilterUpdateThread {
 
 			if (this.sb.getConfigBool("contentcontrol.enabled", false) == true) {
 
-				if (this.sb.tables.bookmarks.dirty) {
+				if (SMWListSyncThread.dirty) {
 
 					networkfilter = updateFilter();
 

source/net/yacy/contentcontrol/SMWListImporter.java

@@ -1,4 +1,4 @@
-package net.yacy.interaction.contentcontrol;
+package net.yacy.contentcontrol;
 
 import java.io.IOException;
 import java.io.Reader;

source/net/yacy/contentcontrol/SMWListRow.java

@@ -1,4 +1,4 @@
-package net.yacy.interaction.contentcontrol;
+package net.yacy.contentcontrol;
 
 import net.yacy.kelondro.blob.Tables;
 

source/net/yacy/contentcontrol/SMWListSyncThread.java

@@ -1,4 +1,4 @@
-package net.yacy.interaction.contentcontrol;
+package net.yacy.contentcontrol;
 
 import java.io.IOException;
 import java.io.InputStreamReader;

source/net/yacy/crawler/CrawlStacker.java

@@ -39,6 +39,7 @@ import java.util.Properties;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import net.yacy.contentcontrol.ContentControlFilterUpdateThread;
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.Classification.ContentDomain;
 import net.yacy.cora.document.MultiProtocolURI;
@@ -58,7 +59,6 @@ import net.yacy.crawler.retrieval.HTTPLoader;
 import net.yacy.crawler.retrieval.Request;
 import net.yacy.crawler.retrieval.SMBLoader;
 import net.yacy.crawler.robots.RobotsTxt;
-import net.yacy.interaction.contentcontrol.ContentControlFilterUpdateThread;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadataNode;
 import net.yacy.kelondro.logging.Log;

source/net/yacy/search/Switchboard.java

@@ -79,6 +79,8 @@ import java.util.zip.ZipInputStream;
 
 import org.apache.solr.common.SolrInputDocument;
 
+import net.yacy.contentcontrol.ContentControlFilterUpdateThread;
+import net.yacy.contentcontrol.SMWListSyncThread;
 import net.yacy.cora.date.GenericFormatter;
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.Classification;
@@ -148,8 +150,6 @@ import net.yacy.document.importer.OAIListFriendsLoader;
 import net.yacy.document.parser.audioTagParser;
 import net.yacy.document.parser.html.Evaluation;
 import net.yacy.gui.Tray;
-import net.yacy.interaction.contentcontrol.ContentControlFilterUpdateThread;
-import net.yacy.interaction.contentcontrol.SMWListSyncThread;
 import net.yacy.kelondro.blob.Tables;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadataNode;

source/net/yacy/search/query/SearchEvent.java

@@ -39,6 +39,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.rdf.model.Resource;
 
+import net.yacy.contentcontrol.ContentControlFilterUpdateThread;
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.Classification;
 import net.yacy.cora.document.Classification.ContentDomain;
@@ -61,7 +62,6 @@ import net.yacy.cora.util.SpaceExceededException;
 import net.yacy.data.WorkTables;
 import net.yacy.document.Condenser;
 import net.yacy.document.LargeNumberCache;
-import net.yacy.interaction.contentcontrol.ContentControlFilterUpdateThread;
 import net.yacy.kelondro.data.meta.URIMetadataNode;
 import net.yacy.kelondro.data.word.Word;
 import net.yacy.kelondro.data.word.WordReference;