You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2015/04/30 21:15:55 UTC

svn commit: r1677044 - in /tika/trunk: CHANGES.txt tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java

Author: mattmann
Date: Thu Apr 30 19:15:55 2015
New Revision: 1677044

URL: http://svn.apache.org/r1677044
Log:
Fix for TIKA-1535 Inheritance modification for the class MIMETypes contributed by LukeLiush <ha...@gmail.com> this closes #45.

Modified:
    tika/trunk/CHANGES.txt
    tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java

Modified: tika/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/tika/trunk/CHANGES.txt?rev=1677044&r1=1677043&r2=1677044&view=diff
==============================================================================
--- tika/trunk/CHANGES.txt (original)
+++ tika/trunk/CHANGES.txt Thu Apr 30 19:15:55 2015
@@ -1,5 +1,8 @@
 Release 1.9 - Current Development
 
+  * Update the MimeTypes code to support inheritance
+    (TIKA-1535).
+
   * Provide ability to parse and identify Global Change 
     Master Directory Interchange Format (GCMD DIF) 
     scientific data files (TIKA-1532).

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java?rev=1677044&r1=1677043&r2=1677044&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java Thu Apr 30 19:15:55 2015
@@ -172,7 +172,7 @@ public final class MimeTypes implements
      * @param data first few bytes of a document stream
      * @return matching MIME type
      */
-    private List<MimeType> getMimeType(byte[] data) {
+    List<MimeType> getMimeType(byte[] data) {
         if (data == null) {
             throw new IllegalArgumentException("Data is missing");
         } else if (data.length == 0) {
@@ -247,7 +247,7 @@ public final class MimeTypes implements
      * @return first {@link #getMinLength()} (or fewer) bytes of the stream
      * @throws IOException if the stream can not be read
      */
-    private byte[] readMagicHeader(InputStream stream) throws IOException {
+    byte[] readMagicHeader(InputStream stream) throws IOException {
         if (stream == null) {
             throw new IllegalArgumentException("InputStream is missing");
         }