some db code rewriting

[mir.git] / source / mircoders / abuse / FilterEngine.java

diff --git a/source/mircoders/abuse/FilterEngine.java b/source/mircoders/abuse/FilterEngine.java
index 56c7216..e36e95f 100755 (executable)
--- a/source/mircoders/abuse/FilterEngine.java
+++ b/source/mircoders/abuse/FilterEngine.java
@@ -30,16 +30,6 @@
 
 package mircoders.abuse;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
-
 import mir.config.MirPropertiesConfiguration;
 import mir.entity.Entity;
 import mir.entity.adapter.EntityAdapter;
@@ -47,11 +37,14 @@ import mir.entity.adapter.EntityAdapterModel;
 import mir.entity.adapter.EntityIteratorAdapter;
 import mir.log.LoggerWrapper;
 import mir.session.Request;
-import mir.storage.StorageObjectExc;
+import mir.storage.DatabaseExc;
 import mircoders.global.MirGlobal;
 import mircoders.storage.DatabaseFilter;
 import mircoders.storage.DatabaseFilterGroup;
 
+import java.text.SimpleDateFormat;
+import java.util.*;
+
 public class FilterEngine {
   private Map filterTypes;
   private List filterTypeIds;
@@ -241,7 +234,7 @@ public class FilterEngine {
 
     public String createFilter(String aType, String anExpression,
                              String aComments, String aTag, String anArticleAction,
-                             String aCommentAction) throws StorageObjectExc {
+                             String aCommentAction) throws DatabaseExc {
       FilterInstance instance;
 
       try {
@@ -382,7 +375,7 @@ public class FilterEngine {
     filterGroup.getEntity().update();
   }
 
-  public synchronized void addFilterGroup(String aName) throws StorageObjectExc {
+  public synchronized void addFilterGroup(String aName) throws DatabaseExc {
     Entity entity = DatabaseFilterGroup.getInstance().createNewEntity();
     entity.setFieldValue("name", aName);
     entity.setFieldValue("priority", "1");
@@ -420,7 +413,7 @@ public class FilterEngine {
                                        String aComments,
                                        String aTag,
                                        String anArticleAction,
-                                       String aCommentAction) throws StorageObjectExc {
+                                       String aCommentAction) throws DatabaseExc {
     return getFilterGroupForId(aGroupId).createFilter(aType, anExpression,
         aComments, aTag, anArticleAction, aCommentAction);
   }