Update of /var/cvs/src/org/mmbase/util/magicfile
In directory james.mmbase.org:/tmp/cvs-serv13271
Modified Files:
MagicFile.java MagicParser.java
Log Message:
some details, to make code better to udnerstands
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/magicfile
Index: MagicFile.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/magicfile/MagicFile.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- MagicFile.java 2 Mar 2007 21:04:16 -0000 1.4
+++ MagicFile.java 31 Oct 2008 10:26:49 -0000 1.5
@@ -21,7 +21,7 @@
*
* @author [EMAIL PROTECTED]
* @author Michiel Meeuwissen
- * @version $Id: MagicFile.java,v 1.4 2007/03/02 21:04:16 nklasens Exp $
+ * @version $Id: MagicFile.java,v 1.5 2008/10/31 10:26:49 michiel Exp $
*/
public class MagicFile {
private static final Logger log =
Logging.getLoggerInstance(MagicFile.class);
@@ -35,7 +35,7 @@
private static MagicFile instance;
- protected DetectorProvider detectors;
+ protected final DetectorProvider detectors;
/**
* Return the current instance of MagicFile. If no instance exists,
Index: MagicParser.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/magicfile/MagicParser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- MagicParser.java 25 Mar 2008 21:00:25 -0000 1.13
+++ MagicParser.java 31 Oct 2008 10:26:49 -0000 1.14
@@ -10,13 +10,8 @@
package org.mmbase.util.magicfile;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.List;
-import java.util.Vector;
+import java.io.*;
+import java.util.*;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -25,7 +20,7 @@
* This Parser translates the configuration file of UNIX's file to a
* list of Detectors (and to a magic.xml)
*
- * @version $Id: MagicParser.java,v 1.13 2008/03/25 21:00:25 nklasens Exp $
+ * @version $Id: MagicParser.java,v 1.14 2008/10/31 10:26:49 michiel Exp $
*/
public class MagicParser implements DetectorProvider {
/**
@@ -35,7 +30,7 @@
public final static String DEFAULT_MAGIC_FILE = "/etc/mime-magic";
private static final Logger log =
Logging.getLoggerInstance(MagicParser.class);
- private List<Detector> detectors;
+ private final List<Detector> detectors = new ArrayList<Detector>();
private int offset;
private String type;
@@ -58,8 +53,6 @@
try {
BufferedReader br = new BufferedReader(new FileReader(new
File(fileName)));
String line;
- detectors = new Vector<Detector>();
-
while ((line = br.readLine()) != null) {
Detector d = createDetector(line);
if (d != null) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
