* anti-abuse upgrade: filters now stored in the database (experimental)

[mir.git] / source / mircoders / storage / DatabaseContentToTopics.java

diff --git a/source/mircoders/storage/DatabaseContentToTopics.java b/source/mircoders/storage/DatabaseContentToTopics.java
index 2186c5e..cddbe9e 100755 (executable)
--- a/source/mircoders/storage/DatabaseContentToTopics.java
+++ b/source/mircoders/storage/DatabaseContentToTopics.java
@@ -30,15 +30,6 @@
 
 package mircoders.storage;
 
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
 import mir.entity.EntityList;
 import mir.log.LoggerWrapper;
 import mir.storage.Database;
@@ -47,6 +38,14 @@ import mir.storage.StorageObjectFailure;
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityTopics;
 
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * <b>This class implements the 1-n-relation between
  * content and topic
@@ -68,10 +67,8 @@ public class DatabaseContentToTopics extends Database implements StorageObject{
     super();
 
     logger = new LoggerWrapper("Database.ContentToTopics");
-
-    hasTimestamp = false;
     mainTable="content_x_topic";
-    theEntityClass = mir.entity.GenericEntity.class;
+    entityClass = mir.entity.GenericEntity.class;
   }
 
   /**
@@ -83,7 +80,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{
 
       String id = content.getId();
       try {
-        Vector extraTables = new Vector();
+        ArrayList extraTables = new ArrayList();
         extraTables.add(mainTable+" cxt");
         returnList = DatabaseTopics.getInstance()
                       .selectByWhereClauseWithExtraTables("t",extraTables,
@@ -149,7 +146,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{
   }
 
   public void setTopics(String anArticleId, List aTopics) throws StorageObjectFailure {
-    List newTopics = new Vector();
+    List newTopics = new ArrayList();
     if (aTopics!=null) {
       Iterator i = aTopics.iterator();
 
@@ -279,7 +276,7 @@ public class DatabaseContentToTopics extends Database implements StorageObject{
     if (topic != null) {
       String id = topic.getId();
       try {
-        Vector extraTables = new Vector();
+        ArrayList extraTables = new ArrayList();
         extraTables.add(mainTable+" cxt");
         returnList = DatabaseContent.getInstance()
                       .selectByWhereClauseWithExtraTables("c",extraTables,