java/src/org/openantivirus/engine DefaultScanConfiguration.java,1.1,1.2 ScanEngine.java,1.3,1.4

Update of /cvsroot/openantivirus/java/src/org/openantivirus/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1513/src/org/openantivirus/engine

Modified Files:
	DefaultScanConfiguration.java ScanEngine.java 
Log Message:
Added MatchArrayCensor
Code cleanup
Virus name without offset

Index: DefaultScanConfiguration.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/DefaultScanConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DefaultScanConfiguration.java	14 Dec 2003 11:08:26 -0000	1.1
+++ DefaultScanConfiguration.java	19 May 2004 07:33:38 -0000	1.2
@@ -26,6 +26,7 @@
 
 package org.openantivirus.engine;
 
+import org.openantivirus.engine.censor.matcharray.*;
 import org.openantivirus.engine.censor.trie.*;
 
 /**
@@ -42,6 +43,7 @@
         putString("credo.directory", "credo");
         putInt("credo.level", 3);
         putObject("trie.instance", new Trie());
+        putObject("matcharray.instance", new MatchArray());
         putString("tempdirectory", "temp");
     }
 }

Index: ScanEngine.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/ScanEngine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ScanEngine.java	1 May 2004 14:36:10 -0000	1.3
+++ ScanEngine.java	19 May 2004 07:33:38 -0000	1.4
@@ -31,6 +31,7 @@
 import java.util.*;
 
 import org.openantivirus.engine.censor.*;
+import org.openantivirus.engine.censor.matcharray.*;
 import org.openantivirus.engine.censor.trie.*;
 import org.openantivirus.engine.credo.*;
 import org.openantivirus.engine.vfs.*;
@@ -62,19 +63,22 @@
     throws IOException, CredoException {
         this.scanConfiguration = scanConfiguration;
         
-        final Trie trie = (Trie) scanConfiguration.getObject("trie.instance");
-        
-        final TrieCensor trieCensor = new TrieCensor(trie);
-        
-        censors = new Censor[] {trieCensor};
+        final StringSearch stringSearch;
+        if (false) {
+            stringSearch = (Trie) scanConfiguration.getObject("trie.instance");
+        } else {
+            stringSearch =
+                (MatchArray) scanConfiguration.getObject("matcharray.instance");
+        }
         
         final CredoParser credoParser =
-            new CredoParser(scanConfiguration, trie);
+            new CredoParser(scanConfiguration, stringSearch);
         
         credoParser.parse(new File(
                 scanConfiguration.getString("credo.directory")));
         
-        trie.prepare();
+        stringSearch.prepare();
+        censors = new Censor[] {stringSearch.getCensor()};
     }
     
     /**



-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click