java/src/org/openantivirus/engine/credo CredoParser.java,1.1,1.2 StringsParser.java,1.3,1.4

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

Modified Files:
	CredoParser.java StringsParser.java 
Log Message:
Added MatchArrayCensor
Code cleanup
Virus name without offset

Index: CredoParser.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/credo/CredoParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CredoParser.java	14 Dec 2003 11:08:26 -0000	1.1
+++ CredoParser.java	19 May 2004 07:33:40 -0000	1.2
@@ -30,7 +30,7 @@
 import java.util.*;
 
 import org.openantivirus.engine.*;
-import org.openantivirus.engine.censor.trie.*;
+import org.openantivirus.engine.censor.*;
 
 /**
  * Reads in Credo-files and initializes the corresponding Finders
@@ -53,10 +53,11 @@
      * @param verify if the digital signature of the Credo-files should be
      *               verified
      */
-    public CredoParser(ScanConfiguration scannerConfiguration, Trie trie) {
+    public CredoParser(ScanConfiguration scannerConfiguration,
+                       StringSearch stringSearch) {
         this.scanConfiguration = scannerConfiguration;
         
-        stringsParser = new StringsParser(new StringFinder(trie));
+        stringsParser = new StringsParser(new StringFinder(stringSearch));
     }
     
     /**

Index: StringsParser.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/engine/credo/StringsParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StringsParser.java	18 May 2004 09:03:30 -0000	1.3
+++ StringsParser.java	19 May 2004 07:33:41 -0000	1.4
@@ -29,7 +29,6 @@
 import java.io.*;
 
 import org.openantivirus.engine.censor.*;
-import org.openantivirus.engine.censor.trie.*;
 
 /**
  * Parses '.strings' credo files
@@ -72,7 +71,8 @@
                             ? Integer.parseInt(sLine.substring(
                                     offsetStart + 1, iPos - 1))
                             : 0,
-                        new StringVirusFoundListener(sVirusName));
+                        new StringVirusFoundListener(
+                                sVirusName.substring(0, offsetStart)));
             } catch (Exception e) {
                 System.err.println(sLine);
                 e.printStackTrace();



-------------------------------------------------------
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