svn commit: r819014 - in /lucene/tika/trunk/tika-core/src/main/java/org/apache/tika: config/TikaConfig.java parser/AutoDetectParser.java

[jukka]

Author: jukka
Date: Fri Sep 25 21:17:25 2009
New Revision: 819014

URL: http://svn.apache.org/viewvc?rev=819014&view=rev
Log:
TIKA-275: Parse context

Use the parsing context for the delegate parser.

Modified:
    
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
    
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java

Modified: 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java?rev=819014&r1=819013&r2=819014&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
 (original)
+++ 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/config/TikaConfig.java
 Fri Sep 25 21:17:25 2009
@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -30,7 +30,6 @@
 import org.apache.tika.exception.TikaException;
 import org.apache.tika.mime.MimeTypes;
 import org.apache.tika.mime.MimeTypesFactory;
-import org.apache.tika.parser.EmptyParser;
 import org.apache.tika.parser.Parser;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -169,15 +168,10 @@
      * @throws TikaException if the default configuration is not available
      */
     public static TikaConfig getDefaultConfig() throws TikaException {
-        return getDefaultConfig(new EmptyParser());
-    }
-
-    public static TikaConfig getDefaultConfig(Parser delegate)
-            throws TikaException {
         try {
             InputStream stream =
                 TikaConfig.class.getResourceAsStream(DEFAULT_CONFIG_LOCATION);
-            return new TikaConfig(stream, delegate);
+            return new TikaConfig(stream);
         } catch (IOException e) {
             throw new TikaException("Unable to read default configuration", e);
         } catch (SAXException e) {
@@ -185,6 +179,15 @@
         }
     }
 
+    /**
+     * @deprecated This method will be removed in Apache Tika 1.0
+     * @see <a 
href="https://issues.apache.org/jira/browse/TIKA-275";>TIKA-275</a>
+     */
+    public static TikaConfig getDefaultConfig(Parser delegate)
+            throws TikaException {
+        return getDefaultConfig();
+    }
+
     private static DocumentBuilder getBuilder() throws TikaException {
         try {
             return DocumentBuilderFactory.newInstance().newDocumentBuilder();

Modified: 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java?rev=819014&r1=819013&r2=819014&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
 (original)
+++ 
lucene/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/AutoDetectParser.java
 Fri Sep 25 21:17:25 2009
@@ -46,7 +46,7 @@
      */
     public AutoDetectParser() {
         try {
-            setConfig(TikaConfig.getDefaultConfig(this));
+            setConfig(TikaConfig.getDefaultConfig());
         } catch (TikaException e) {
             // FIXME: This should never happen
             throw new RuntimeException(e);