Update of /cvsroot/openantivirus/java/src/org/openantivirus/virushammer
In directory sc8-pr-cvs1:/tmp/cvs-serv13887/virushammer
Modified Files:
AddTargetAction.java ExitAction.java ExplorerPanel.java
L10N.java PatternFindAction.java PerformableAction.java
PreferencesAction.java RemoveTargetAction.java ScanTarget.java
ScanTargetList.java ScannerOutputPanel.java ScannerThread.java
StartScanAction.java StatusModel.java StopScanAction.java
VirusHammer.java VirusHammer.properties
VirusHammer_de.properties VirusHammer_es.properties
VirusHammer_fr.properties VirusHammer_it.properties
Log Message:
Let VirusHammer use the new engine
Index: AddTargetAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/AddTargetAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AddTargetAction.java 10 Apr 2002 16:29:27 -0000 1.2
+++ AddTargetAction.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,32 +1,35 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
-import java.awt.*;
import java.awt.event.*;
-import java.beans.*;
import java.io.*;
-import java.util.*;
+
import javax.swing.*;
/**
@@ -34,7 +37,7 @@
* (if any) is fired via a PropertyChangeEvent.
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class AddTargetAction extends PerformableAction {
Index: ExitAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/ExitAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ExitAction.java 10 Apr 2002 16:29:27 -0000 1.2
+++ ExitAction.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -25,13 +30,12 @@
import java.awt.event.*;
import java.io.*;
import java.util.*;
-import javax.swing.*;
/**
* ExitAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class ExitAction extends PerformableAction {
Index: ExplorerPanel.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/ExplorerPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ExplorerPanel.java 10 Apr 2002 16:29:27 -0000 1.2
+++ ExplorerPanel.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,39 +1,43 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
-import javax.swing.*;
-import javax.swing.table.*;
-import java.io.*;
-import java.beans.*;
import java.awt.*;
+
+import javax.swing.*;
import javax.swing.event.*;
+import javax.swing.table.*;
/**
* ExplorerPanel
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class ExplorerPanel extends JPanel {
Index: L10N.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/L10N.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- L10N.java 10 Apr 2002 16:29:27 -0000 1.2
+++ L10N.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -28,7 +33,7 @@
* L10N support
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class L10N {
Index: PatternFindAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/PatternFindAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PatternFindAction.java 10 Apr 2002 16:29:27 -0000 1.2
+++ PatternFindAction.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,35 +1,39 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
import java.awt.event.*;
-import javax.swing.*;
/**
* PatternFindAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class PatternFindAction extends PerformableAction {
Index: PerformableAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/PerformableAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PerformableAction.java 10 Apr 2002 16:29:27 -0000 1.2
+++ PerformableAction.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,32 +1,38 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
package org.openantivirus.virushammer;
import javax.swing.*;
-import java.beans.*;
/**
* PropertyChangeAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Id$
- *
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
public abstract class PerformableAction extends AbstractAction {
public static final String VERSION =
Index: PreferencesAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/PreferencesAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PreferencesAction.java 10 Apr 2002 16:29:27 -0000 1.2
+++ PreferencesAction.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -29,7 +34,7 @@
* PreferencesAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class PreferencesAction extends AbstractAction {
Index: RemoveTargetAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/RemoveTargetAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- RemoveTargetAction.java 10 Apr 2002 16:29:27 -0000 1.2
+++ RemoveTargetAction.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,3 +1,30 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
+ */
+
package org.openantivirus.virushammer;
import java.awt.event.ActionEvent;
@@ -6,26 +33,8 @@
* RemoveTargetAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Id$
- *
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
public class RemoveTargetAction extends PerformableAction {
public static final String VERSION =
Index: ScanTarget.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/ScanTarget.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ScanTarget.java 10 Apr 2002 16:29:27 -0000 1.2
+++ ScanTarget.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -28,7 +33,7 @@
* A target to scan regulary
*
* Pattern-Roles: Container
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class ScanTarget {
Index: ScanTargetList.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/ScanTargetList.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ScanTargetList.java 10 Apr 2002 16:29:27 -0000 1.2
+++ ScanTargetList.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -28,7 +33,7 @@
* ScanTargetList
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class ScanTargetList extends javax.swing.AbstractListModel {
Index: ScannerOutputPanel.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/ScannerOutputPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ScannerOutputPanel.java 31 Aug 2003 16:56:36 -0000 1.5
+++ ScannerOutputPanel.java 14 Dec 2003 20:24:58 -0000 1.6
@@ -1,37 +1,45 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
import java.awt.*;
-import java.io.*;
+
import javax.swing.*;
import javax.swing.table.*;
+import org.openantivirus.engine.censor.*;
+import org.openantivirus.engine.vfs.*;
+
/**
* ScannerOutputPanel
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class ScannerOutputPanel extends JPanel {
@@ -40,7 +48,7 @@
private final DefaultTableModel outputModel = new DefaultTableModel(
new String[] {
- L10N.getString("Filename"), L10N.getString("Path"),
+ L10N.getString("Filename"),
L10N.getString("Contains")
}, 0);
@@ -53,13 +61,13 @@
outputTable.setShowGrid(false);
}
- public void addFoundVirus(File file, String virusname) {
- outputModel.addRow(new String[] {file.getName(), file.getParent(),
- virusname});
+ public void addFoundVirus(MalwareFoundException mfe) {
+ outputModel.addRow(new String[] {mfe.getEntry().getName(),
+ mfe.getName()});
}
- public void addException(File file, Exception exception) {
- outputModel.addRow(new String[] {file.getName(), file.getParent(),
+ public void addException(VfsEntry entry, Exception exception) {
+ outputModel.addRow(new String[] {entry.getName(),
exception.getClass().getName() + ": "
+ exception.getMessage()});
}
Index: ScannerThread.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/ScannerThread.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ScannerThread.java 31 Aug 2003 16:56:36 -0000 1.5
+++ ScannerThread.java 14 Dec 2003 20:24:58 -0000 1.6
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -25,69 +30,63 @@
import java.io.*;
import java.util.*;
-import org.openantivirus.scanner.*;
-import org.openantivirus.scanner.scanobject.*;
+import org.openantivirus.engine.*;
+import org.openantivirus.engine.censor.*;
+import org.openantivirus.engine.credo.*;
+import org.openantivirus.engine.vfs.*;
/**
* Thread that scans the files, so that the GUI does not block
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class ScannerThread implements Runnable {
- public static final String VERSION =
- "$Id$";
/** Utility field holding list of ScannerListeners. */
- private transient ArrayList scannerListenerList;
- private transient ArrayList recursiveFileFilterListenerList;
+ private transient ArrayList scanListenerList;
/** Holds value of property scanTargetList. */
private ScanTargetList scanTargetList;
- /** Holds value of property trie. */
- private Trie trie;
-
/** Holds value of property scanning. */
private volatile boolean scanning;
/** If the Thread should abort scanning */
private volatile boolean abortRequested;
- private RecursiveFileFilter recursiveFileFilter;
-
/** Listeners */
- private final RecursiveFileFilterListener recursiveFileFilterListener =
- new RecursiveFileFilterListener() {
- public void startingScan() {
- fireStartingScan();
- }
+ private final ScanListener scanListener =
+ new ScanListener() {
+ public void startingScan() {}
- public void scanning(File file) throws ScanningAbortedException {
+ public void scanning(VfsEntry vfsEntry) throws ScanAbortedException {
if (abortRequested) {
- throw new ScanningAbortedException("Aborted");
+ throw new ScanAbortedException("Aborted");
}
- fireScanning(file);
+ fireScanning(vfsEntry);
}
- public void virusFound(VirusFoundException virusFoundException) {
- fireVirusFound(virusFoundException);
+ public void malwareFound(MalwareFoundException malwareFoundException) {
+ fireMalwareFound(malwareFoundException);
}
- public void finishedScan() {
- fireFinishedScan();
+ public void finishedScan() {}
+
+ public void exceptionThrown(Exception exception) {
+ fireExceptionThrown(exception);
}
-
- public void exceptionThrown(Exception exception) {}
};
- private final ScannerConfiguration scannerConfiguration;
- private final Scanner scanner;
+ private final ScanConfiguration scanConf;
+ private final ScanEngine engine;
- public ScannerThread(ScannerConfiguration scannerConfiguration) {
- this.scannerConfiguration = scannerConfiguration;
- scanner = new Scanner(scannerConfiguration);
+ public ScannerThread(ScanConfiguration scanConf)
+ throws CredoException, IOException {
+ this.scanConf = scanConf;
+ engine = new ScanEngine(scanConf);
+ engine.addScanListener(scanListener);
}
public void run() {
@@ -108,14 +107,9 @@
(ScanTarget) scanTargetList.getElementAt(i);
final File scanFile = scanTarget.getPath();
try {
- scanner.scan(new FileScanObject(scanFile));
-// recursiveFileFilter.filter(scanTarget.getPath());
- } catch (ScanningAbortedException sae) {
- abortRequested = false;
- break;
- } catch (VirusFoundException vfe) {
- vfe.setFile(scanFile);
- fireVirusFound(vfe);
+ engine.scan(scanFile);
+ } catch (MalwareFoundException mfe) {
+ fireMalwareFound(mfe);
} catch (Exception e) {
fireExceptionThrown(e);
}
@@ -140,41 +134,19 @@
/** Registers ScannerListener to receive events.
* @param listener The listener to register.
*/
- public synchronized void addScannerListener(ScannerListener listener) {
- if (scannerListenerList == null ) {
- scannerListenerList = new ArrayList();
- }
- scannerListenerList.add(listener);
- }
-
- /** Registers ScannerListener to receive events.
- * @param listener The listener to register.
- */
- public synchronized void addRecursiveFileFilterListener(
- RecursiveFileFilterListener listener) {
- if (recursiveFileFilterListenerList == null ) {
- recursiveFileFilterListenerList = new ArrayList();
- }
- recursiveFileFilterListenerList.add(listener);
- addScannerListener(listener);
- }
-
- /** Removes ScannerListener from the list of listeners.
- * @param listener The listener to remove.
- */
- public synchronized void removeScannerListener(ScannerListener listener) {
- if (scannerListenerList != null ) {
- scannerListenerList.remove(listener);
+ public synchronized void addScanListener(ScanListener listener) {
+ if (scanListenerList == null ) {
+ scanListenerList = new ArrayList();
}
+ scanListenerList.add(listener);
}
/** Removes ScannerListener from the list of listeners.
* @param listener The listener to remove.
*/
- public synchronized void removeRecursiveFileFilterListener(
- RecursiveFileFilterListener listener) {
- if (recursiveFileFilterListenerList != null ) {
- recursiveFileFilterListenerList.remove(listener);
+ public synchronized void removeScanListener(ScanListener listener) {
+ if (scanListenerList != null ) {
+ scanListenerList.remove(listener);
}
}
@@ -185,21 +157,6 @@
this.scanTargetList = scanTargetList;
}
- /** Setter for property trie.
- * @param trie New value of property trie.
- */
- public void setTrie(Trie trie) {
- this.trie = trie;
- if (recursiveFileFilter != null) {
- recursiveFileFilter.removeRecursiveFileFilterListener(
- recursiveFileFilterListener);
- }
- recursiveFileFilter = new RecursiveFileFilter(
- scannerConfiguration,new StreamFileFilter(trie));
- recursiveFileFilter.addRecursiveFileFilterListener(
- recursiveFileFilterListener);
- }
-
/** Getter for property scanning.
* @return Value of property scanning.
*/
@@ -209,51 +166,51 @@
/** notifies the listeners, that scanning has started */
protected synchronized void fireStartingScan() {
- if (scannerListenerList != null) {
- for (Iterator it = scannerListenerList.iterator();
+ if (scanListenerList != null) {
+ for (Iterator it = scanListenerList.iterator();
it.hasNext(); ) {
- ((ScannerListener) it.next()).startingScan();
+ ((ScanListener) it.next()).startingScan();
}
}
}
/** notifies the listeners, that scanning has finished */
protected synchronized void fireFinishedScan() {
- if (scannerListenerList != null) {
- for (Iterator it = scannerListenerList.iterator();
+ if (scanListenerList != null) {
+ for (Iterator it = scanListenerList.iterator();
it.hasNext(); ) {
- ((ScannerListener) it.next()).finishedScan();
+ ((ScanListener) it.next()).finishedScan();
}
}
}
/** notifies the listeners, that a virus has been found */
- protected synchronized void fireVirusFound(VirusFoundException vfe) {
- if (scannerListenerList != null) {
- for (Iterator it = scannerListenerList.iterator();
+ protected synchronized void fireMalwareFound(MalwareFoundException mfe) {
+ if (scanListenerList != null) {
+ for (Iterator it = scanListenerList.iterator();
it.hasNext(); ) {
- ((ScannerListener) it.next()).virusFound(vfe);
+ ((ScanListener) it.next()).malwareFound(mfe);
}
}
}
/** notifies the listeners, that a file is about to be scanned */
- protected synchronized void fireScanning(File file)
- throws ScanningAbortedException {
- if (recursiveFileFilterListenerList != null) {
- for (Iterator it = recursiveFileFilterListenerList.iterator();
+ protected synchronized void fireScanning(VfsEntry entry)
+ throws ScanAbortedException {
+ if (scanListenerList != null) {
+ for (Iterator it = scanListenerList.iterator();
it.hasNext(); ) {
- ((RecursiveFileFilterListener) it.next()).scanning(file);
+ ((ScanListener) it.next()).scanning(entry);
}
}
}
/** notifies the listeners, that an exception has been thrown */
protected synchronized void fireExceptionThrown(Exception exception) {
- if (recursiveFileFilterListenerList != null) {
- for (Iterator it = recursiveFileFilterListenerList.iterator();
+ if (scanListenerList != null) {
+ for (Iterator it = scanListenerList.iterator();
it.hasNext(); ) {
- ((ScannerListener) it.next()).exceptionThrown(exception);
+ ((ScanListener) it.next()).exceptionThrown(exception);
}
}
}
Index: StartScanAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/StartScanAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StartScanAction.java 20 May 2002 13:10:00 -0000 1.3
+++ StartScanAction.java 14 Dec 2003 20:24:58 -0000 1.4
@@ -1,38 +1,45 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
import java.awt.event.*;
-import java.io.*;
+
import javax.swing.event.*;
-import org.openantivirus.scanner.*;
+import org.openantivirus.engine.*;
+import org.openantivirus.engine.censor.*;
+import org.openantivirus.engine.vfs.*;
/**
* StartScanAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class StartScanAction extends PerformableAction {
@@ -57,7 +64,7 @@
}
};
- private ScannerListener scannerListener = new ScannerListener() {
+ private ScanListener scanListener = new ScanListener() {
public void startingScan() {
updateEnabled();
}
@@ -67,7 +74,10 @@
}
public void exceptionThrown(Exception exception) {}
- public void virusFound(VirusFoundException virusFoundException) {}
+
+ public void scanning(VfsEntry vfsEntry) throws ScanAbortedException {}
+
+ public void malwareFound(MalwareFoundException malwareFoundException) {}
};
/** Holds value of property scannerThread. */
@@ -108,10 +118,10 @@
*/
public void setScannerThread(ScannerThread scannerThread) {
if (scannerThread != null) {
- scannerThread.removeScannerListener(scannerListener);
+ scannerThread.removeScanListener(scanListener);
}
this.scannerThread = scannerThread;
- scannerThread.addScannerListener(scannerListener);
+ scannerThread.addScanListener(scanListener);
updateEnabled();
}
}
Index: StatusModel.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/StatusModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StatusModel.java 10 Apr 2002 16:29:28 -0000 1.2
+++ StatusModel.java 14 Dec 2003 20:24:58 -0000 1.3
@@ -1,23 +1,28 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
@@ -28,7 +33,7 @@
* StatusModel
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class StatusModel {
Index: StopScanAction.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/StopScanAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- StopScanAction.java 20 May 2002 13:10:00 -0000 1.3
+++ StopScanAction.java 14 Dec 2003 20:24:58 -0000 1.4
@@ -1,36 +1,43 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2002 iKu Netzwerklösungen
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
import java.awt.event.*;
-import org.openantivirus.scanner.*;
+import org.openantivirus.engine.*;
+import org.openantivirus.engine.censor.*;
+import org.openantivirus.engine.vfs.*;
/**
* StopScanAction
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class StopScanAction extends PerformableAction {
@@ -40,7 +47,7 @@
/** Holds value of property scannerThread. */
private ScannerThread scannerThread;
- private ScannerListener scannerListener = new ScannerListener() {
+ private ScanListener scanListener = new ScanListener() {
public void startingScan() {
updateEnabled();
}
@@ -50,7 +57,10 @@
}
public void exceptionThrown(Exception exception) {}
- public void virusFound(VirusFoundException virusFoundException) {}
+
+ public void scanning(VfsEntry vfsEntry) throws ScanAbortedException {}
+
+ public void malwareFound(MalwareFoundException malwareFoundException) {}
};
public StopScanAction() {
@@ -72,10 +82,10 @@
*/
public void setScannerThread(ScannerThread scannerThread) {
if (scannerThread != null) {
- scannerThread.removeScannerListener(scannerListener);
+ scannerThread.removeScanListener(scanListener);
}
this.scannerThread = scannerThread;
- scannerThread.addScannerListener(scannerListener);
+ scannerThread.addScanListener(scanListener);
updateEnabled();
}
}
Index: VirusHammer.java
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/VirusHammer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- VirusHammer.java 31 Aug 2003 16:56:36 -0000 1.8
+++ VirusHammer.java 14 Dec 2003 20:24:58 -0000 1.9
@@ -1,49 +1,54 @@
/*
* $Id$
*
- * This file is part of the OpenAntiVirus-Project,
- * see http://www.openantivirus.org/
- * (c) 2001-02 iKu Netzwerklösungen
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is OAV.
+ *
+ * The Initial Developer of the Original Code is Kurt Huwig <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2001-2003
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * ***** END LICENSE BLOCK *****
*/
package org.openantivirus.virushammer;
import java.awt.*;
import java.awt.event.*;
+import java.beans.*;
import java.io.*;
import java.text.*;
import java.util.*;
-import javax.swing.*;
-import java.beans.*;
+import javax.swing.*;
-import org.openantivirus.scanner.*;
-import org.openantivirus.credo.*;
+import org.openantivirus.engine.*;
+import org.openantivirus.engine.censor.*;
+import org.openantivirus.engine.credo.*;
+import org.openantivirus.engine.vfs.*;
/**
* L10N
*
* Pattern-Roles:
- * @author Kurt Huwig
+ * @author Kurt Huwig <[email protected]>
* @version $Revision$
*/
public class VirusHammer {
- public static final String VERSION =
- "$Id$";
/** Actions */
private final Action
@@ -58,53 +63,45 @@
private final ScanTargetList scanTargetList = new ScanTargetList();
private final JFrame frame = new JFrame();
- private final ScannerConfiguration scannerConfiguration =
- new ScannerConfiguration();
- private final ScannerThread scannerThread =
- new ScannerThread(scannerConfiguration);
- private final Scanner scanner;
+ private final WriteableScanConfiguration scanConf;
+ private final ScannerThread scannerThread;
private final StatusModel statusModel = new StatusModel();
private final ScannerOutputPanel scannerOutputPanel =
new ScannerOutputPanel();
/** Listener */
- private final RecursiveFileFilterListener recursiveFileFilterListener =
- new RecursiveFileFilterListener() {
- private File scanFile = null;
- private File parent = null;
+ private final ScanListener scanListener = new ScanListener() {
+ private VfsEntry scanEntry = null;
public void startingScan() {
scannerOutputPanel.clearList();
}
-
- public void scanning(File file) {
- scanFile = file;
- if (file.getParentFile() != parent) {
- parent = file.getParentFile();
- statusModel.setText(MessageFormat.format(
- L10N.getString("Scanning_file"),
- new Object[] {parent.getAbsolutePath()}));
- }
+
+ public void scanning(VfsEntry vfsEntry) throws ScanAbortedException {
+ statusModel.setText(MessageFormat.format(
+ L10N.getString("Scanning_file"),
+ new Object[] {vfsEntry.getName()}));
}
- public void virusFound(VirusFoundException virusFoundException) {
- scannerOutputPanel.addFoundVirus(scanFile,
- virusFoundException.getVirusName());
+ public void malwareFound(MalwareFoundException malwareFoundException) {
+ scannerOutputPanel.addFoundVirus(malwareFoundException);
}
public void exceptionThrown(Exception exception) {
- scannerOutputPanel.addException(scanFile, exception);
+ scannerOutputPanel.addException(scanEntry, exception);
}
public void finishedScan() {
- scanFile = parent = null;
+ scanEntry = null;
statusModel.setText(L10N.getString("Idle"));
}
};
public VirusHammer() throws CredoException, IOException {
- initScanner();
- scanner = new Scanner(scannerConfiguration);
+ scanConf = new WriteableScanConfiguration(
+ new DefaultScanConfiguration());
+ scanConf.putBoolean(ScanConfiguration.HALT_ON_VIRUS_FOUND, false);
+ scannerThread = new ScannerThread(scanConf);
initScanTargetList();
frame.setTitle(L10N.getString("VirusHammer") + " "
@@ -130,12 +127,6 @@
statusModel.setText(L10N.getString("Idle"));
}
- protected void initScanner() throws CredoException, IOException {
- new CredoParser(scannerConfiguration).parse(
- this.getClass().getResourceAsStream("/VirusSignatures.credo"));
- scannerConfiguration.getTrie().prepare();
- }
-
protected JMenuBar createMenuBar() {
final JMenuBar jmb = new JMenuBar();
@@ -212,8 +203,7 @@
protected void initActions() {
new Thread(scannerThread).start();
scannerThread.setScanTargetList(scanTargetList);
- scannerThread.setTrie(scannerConfiguration.getTrie());
- scannerThread.addRecursiveFileFilterListener(recursiveFileFilterListener);
+ scannerThread.addScanListener(scanListener);
startScanAction.setScanTargetList(scanTargetList);
startScanAction.setScannerThread(scannerThread);
stopScanAction.setScannerThread(scannerThread);
Index: VirusHammer.properties
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/VirusHammer.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VirusHammer.properties 31 Aug 2003 16:56:36 -0000 1.3
+++ VirusHammer.properties 14 Dec 2003 20:24:58 -0000 1.4
@@ -40,8 +40,6 @@
Filename=Filename
-Path=Path
-
Idle=Idle
Scanning_file=Scanning {0}
Index: VirusHammer_de.properties
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/VirusHammer_de.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- VirusHammer_de.properties 31 Aug 2003 16:56:36 -0000 1.3
+++ VirusHammer_de.properties 14 Dec 2003 20:24:58 -0000 1.4
@@ -37,8 +37,6 @@
Filename=Dateiname
-Path=Pfad
-
Idle=Bereit
Scanning_file=Pr\u00FCfe {0}
Index: VirusHammer_es.properties
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/VirusHammer_es.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VirusHammer_es.properties 31 Aug 2003 16:56:36 -0000 1.2
+++ VirusHammer_es.properties 14 Dec 2003 20:24:58 -0000 1.3
@@ -38,8 +38,6 @@
Filename=Nombre fichero
-Path=Directorio
-
Idle=Inactivo
Scanning_file=Explorando {0}
Index: VirusHammer_fr.properties
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/VirusHammer_fr.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- VirusHammer_fr.properties 31 Aug 2003 16:56:36 -0000 1.4
+++ VirusHammer_fr.properties 14 Dec 2003 20:24:58 -0000 1.5
@@ -39,8 +39,6 @@
Filename=Nom de fichier
-Path=Chemin
-
Idle=Inoccupé
Scanning_file=Examine {0}
Index: VirusHammer_it.properties
===================================================================
RCS file: /cvsroot/openantivirus/java/src/org/openantivirus/virushammer/VirusHammer_it.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- VirusHammer_it.properties 31 Aug 2003 16:56:36 -0000 1.2
+++ VirusHammer_it.properties 14 Dec 2003 20:24:58 -0000 1.3
@@ -39,8 +39,6 @@
Filename=Nome File
-Path=Percorso
-
Idle=In Attesa
Scanning_file=Scansione di {0}
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.