svn commit: r956050 - in /tika/trunk: tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java

[ju...@apache.org]

Author: jukka
Date: Fri Jun 18 17:01:57 2010
New Revision: 956050

URL: http://svn.apache.org/viewvc?rev=956050&view=rev
Log:
TIKA-308: Improve supertype handling in type registry

It's "supertype" rather than "super type"

Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java
    tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java?rev=956050&r1=956049&r2=956050&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MediaTypeRegistry.java Fri Jun 18 17:01:57 2010
@@ -108,13 +108,14 @@ public class MediaTypeRegistry {
      * Checks whether the given media type a is a specialization of a more
      * generic type b.
      *
+     * @since Apache Tika 0.8
      * @param a media type
      * @param b suspected supertype
      * @return <code>true</code> if b is a supertype of a,
      *         <code>false</code> otherwise
      */
     public boolean isSpecializationOf(MediaType a, MediaType b) {
-        MediaType x = getSuperType(a);
+        MediaType x = getSupertype(a);
         return x != null && (x.equals(b) || isSpecializationOf(x, b));
     }
 
@@ -128,10 +129,11 @@ public class MediaTypeRegistry {
      * supertype is known, and the return value for application/octet-stream
      * is <code>null</code>.
      *
+     * @since Apache Tika 0.8
      * @param type media type
      * @return supertype, or <code>null</code> for application/octet-stream
      */
-    public MediaType getSuperType(MediaType type) {
+    public MediaType getSupertype(MediaType type) {
         if (type.hasParameters()) {
             return type.getBaseType();
         } else if (inheritance.containsKey(type)) {

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java?rev=956050&r1=956049&r2=956050&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/parser/CompositeParser.java Fri Jun 18 17:01:57 2010
@@ -135,7 +135,7 @@ public class CompositeParser implements 
             if (parser != null) {
                 return parser;
             }
-            type = registry.getSuperType(type);
+            type = registry.getSupertype(type);
         }
         return fallback;
     }

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java?rev=956050&r1=956049&r2=956050&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/MimeTypesTest.java Fri Jun 18 17:01:57 2010
@@ -59,9 +59,9 @@ public class MimeTypesTest extends TestC
     }
 
     public void testSuperType() throws MimeTypeException {
-        assertNull(registry.getSuperType(OCTET_STREAM));
-        assertEquals(OCTET_STREAM, registry.getSuperType(TEXT_PLAIN));
-        assertEquals(TEXT_PLAIN, registry.getSuperType(html.getType()));
+        assertNull(registry.getSupertype(OCTET_STREAM));
+        assertEquals(OCTET_STREAM, registry.getSupertype(TEXT_PLAIN));
+        assertEquals(TEXT_PLAIN, registry.getSupertype(html.getType()));
    }
 
     public void testIsDescendantOf() {