diff -ru CVS/classpath/java/net/MimeTypeMapper.java updated/classpath/java/net/MimeTypeMapper.java --- CVS/classpath/java/net/MimeTypeMapper.java 2010-06-19 11:29:58.000000000 +0400 +++ updated/classpath/java/net/MimeTypeMapper.java 2010-06-19 11:31:50.000000000 +0400 @@ -1,5 +1,5 @@ /* MimeTypeMapper.java -- A class for mapping file names to MIME types - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2010 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,7 +43,6 @@ import java.io.IOException; import java.io.LineNumberReader; import java.util.Hashtable; -import java.util.Iterator; import java.util.Map; import java.util.NoSuchElementException; import java.util.StringTokenizer; @@ -64,184 +63,184 @@ * This array of strings is used to identify a MIME type based on a file * extension. This is list is based on the Apache mime.types file. */ - protected static final String[][] mime_strings = + private static final String[] mime_strings = { - { "ai", "application/postscript" } - , { "aif", "audio/x-aiff" } - , { "aifc", "audio/x-aiff" } - , { "aiff", "audio/x-aiff" } - , { "asc", "text/plain" } - , { "au", "audio/basic" } - , { "avi", "video/x-msvideo" } - , { "bcpio", "application/x-bcpio" } - , { "bin", "application/octet-stream" } - , { "bmp", "image/bmp" } - , { "bz2", "application/x-bzip2" } - , { "cdf", "application/x-netcdf" } - , { "chrt", "application/x-kchart" } - , { "class", "application/octet-stream" } - , { "cpio", "application/x-cpio" } - , { "cpt", "application/mac-compactpro" } - , { "csh", "application/x-csh" } - , { "css", "text/css" } - , { "dcr", "application/x-director" } - , { "dir", "application/x-director" } - , { "djv", "image/vnd.djvu" } - , { "djvu", "image/vnd.djvu" } - , { "dll", "application/octet-stream" } - , { "dms", "application/octet-stream" } - , { "doc", "application/msword" } - , { "dvi", "application/x-dvi" } - , { "dxr", "application/x-director" } - , { "eps", "application/postscript" } - , { "etx", "text/x-setext" } - , { "exe", "application/octet-stream" } - , { "ez", "application/andrew-inset" } - , { "gif", "image/gif" } - , { "gtar", "application/x-gtar" } - , { "gz", "application/x-gzip" } - , { "hdf", "application/x-hdf" } - , { "hqx", "application/mac-binhex40" } - , { "htm", "text/html" } - , { "html", "text/html" } - , { "ice", "x-conference/x-cooltalk" } - , { "ief", "image/ief" } - , { "iges", "model/iges" } - , { "igs", "model/iges" } - , { "img", "application/octet-stream" } - , { "iso", "application/octet-stream" } - , { "jpe", "image/jpeg" } - , { "jpeg", "image/jpeg" } - , { "jpg", "image/jpeg" } - , { "js", "application/x-javascript" } - , { "kar", "audio/midi" } - , { "kil", "application/x-killustrator" } - , { "kpr", "application/x-kpresenter" } - , { "kpt", "application/x-kpresenter" } - , { "ksp", "application/x-kspread" } - , { "kwd", "application/x-kword" } - , { "kwt", "application/x-kword" } - , { "latex", "application/x-latex" } - , { "lha", "application/octet-stream" } - , { "lzh", "application/octet-stream" } - , { "m3u", "audio/x-mpegurl" } - , { "man", "application/x-troff-man" } - , { "me", "application/x-troff-me" } - , { "mesh", "model/mesh" } - , { "mid", "audio/midi" } - , { "midi", "audio/midi" } - , { "mif", "application/vnd.mif" } - , { "mov", "video/quicktime" } - , { "movie", "video/x-sgi-movie" } - , { "mp2", "audio/mpeg" } - , { "mp3", "audio/mpeg" } - , { "mpe", "video/mpeg" } - , { "mpeg", "video/mpeg" } - , { "mpg", "video/mpeg" } - , { "mpga", "audio/mpeg" } - , { "ms", "application/x-troff-ms" } - , { "msh", "model/mesh" } - , { "mxu", "video/vnd.mpegurl" } - , { "nc", "application/x-netcdf" } - , { "ogg", "application/ogg" } - , { "pbm", "image/x-portable-bitmap" } - , { "pdb", "chemical/x-pdb" } - , { "pdf", "application/pdf" } - , { "pgm", "image/x-portable-graymap" } - , { "pgn", "application/x-chess-pgn" } - , { "png", "image/png" } - , { "pnm", "image/x-portable-anymap" } - , { "ppm", "image/x-portable-pixmap" } - , { "ppt", "application/vnd.ms-powerpoint" } - , { "ps", "application/postscript" } - , { "qt", "video/quicktime" } - , { "ra", "audio/x-realaudio" } - , { "ram", "audio/x-pn-realaudio" } - , { "ras", "image/x-cmu-raster" } - , { "rgb", "image/x-rgb" } - , { "rm", "audio/x-pn-realaudio" } - , { "roff", "application/x-troff" } - , { "rpm", "application/x-rpm" } - , { "rtf", "text/rtf" } - , { "rtx", "text/richtext" } - , { "sgm", "text/sgml" } - , { "sgml", "text/sgml" } - , { "sh", "application/x-sh" } - , { "shar", "application/x-shar" } - , { "silo", "model/mesh" } - , { "sit", "application/x-stuffit" } - , { "skd", "application/x-koan" } - , { "skm", "application/x-koan" } - , { "skp", "application/x-koan" } - , { "skt", "application/x-koan" } - , { "smi", "application/smil" } - , { "smil", "application/smil" } - , { "snd", "audio/basic" } - , { "so", "application/octet-stream" } - , { "spl", "application/x-futuresplash" } - , { "src", "application/x-wais-source" } - , { "stc", "application/vnd.sun.xml.calc.template" } - , { "std", "application/vnd.sun.xml.draw.template" } - , { "sti", "application/vnd.sun.xml.impress.template" } - , { "stw", "application/vnd.sun.xml.writer.template" } - , { "sv4cpio", "application/x-sv4cpio" } - , { "sv4crc", "application/x-sv4crc" } - , { "swf", "application/x-shockwave-flash" } - , { "sxc", "application/vnd.sun.xml.calc" } - , { "sxd", "application/vnd.sun.xml.draw" } - , { "sxg", "application/vnd.sun.xml.writer.global" } - , { "sxi", "application/vnd.sun.xml.impress" } - , { "sxm", "application/vnd.sun.xml.math" } - , { "sxw", "application/vnd.sun.xml.writer" } - , { "t", "application/x-troff" } - , { "tar", "application/x-tar" } - , { "tcl", "application/x-tcl" } - , { "tex", "application/x-tex" } - , { "texi", "application/x-texinfo" } - , { "texinfo", "application/x-texinfo" } - , { "tgz", "application/x-gzip" } - , { "tif", "image/tiff" } - , { "tiff", "image/tiff" } - , { "torrent", "application/x-bittorrent" } - , { "tr", "application/x-troff" } - , { "tsv", "text/tab-separated-values" } - , { "txt", "text/plain" } - , { "ustar", "application/x-ustar" } - , { "vcd", "application/x-cdlink" } - , { "vrml", "model/vrml" } - , { "wav", "audio/x-wav" } - , { "wbmp", "image/vnd.wap.wbmp" } - , { "wbxml", "application/vnd.wap.wbxml" } - , { "wml", "text/vnd.wap.wml" } - , { "wmlc", "application/vnd.wap.wmlc" } - , { "wmls", "text/vnd.wap.wmlscript" } - , { "wmlsc", "application/vnd.wap.wmlscriptc" } - , { "wrl", "model/vrml" } - , { "xbm", "image/x-xbitmap" } - , { "xht", "application/xhtml+xml" } - , { "xhtml", "application/xhtml+xml" } - , { "xls", "application/vnd.ms-excel" } - , { "xml", "text/xml" } - , { "xpm", "image/x-xpixmap" } - , { "xsl", "text/xml" } - , { "xwd", "image/x-xwindowdump" } - , { "xyz", "chemical/x-xyz" } - , { "zip", "application/zip" } + "ai", "application/postscript", + "aif", "audio/x-aiff", + "aifc", "audio/x-aiff", + "aiff", "audio/x-aiff", + "asc", "text/plain", + "au", "audio/basic", + "avi", "video/x-msvideo", + "bcpio", "application/x-bcpio", + "bin", "application/octet-stream", + "bmp", "image/bmp", + "bz2", "application/x-bzip2", + "cdf", "application/x-netcdf", + "chrt", "application/x-kchart", + "class", "application/octet-stream", + "cpio", "application/x-cpio", + "cpt", "application/mac-compactpro", + "csh", "application/x-csh", + "css", "text/css", + "dcr", "application/x-director", + "dir", "application/x-director", + "djv", "image/vnd.djvu", + "djvu", "image/vnd.djvu", + "dll", "application/octet-stream", + "dms", "application/octet-stream", + "doc", "application/msword", + "dvi", "application/x-dvi", + "dxr", "application/x-director", + "eps", "application/postscript", + "etx", "text/x-setext", + "exe", "application/octet-stream", + "ez", "application/andrew-inset", + "gif", "image/gif", + "gtar", "application/x-gtar", + "gz", "application/x-gzip", + "hdf", "application/x-hdf", + "hqx", "application/mac-binhex40", + "htm", "text/html", + "html", "text/html", + "ice", "x-conference/x-cooltalk", + "ief", "image/ief", + "iges", "model/iges", + "igs", "model/iges", + "img", "application/octet-stream", + "iso", "application/octet-stream", + "jpe", "image/jpeg", + "jpeg", "image/jpeg", + "jpg", "image/jpeg", + "js", "application/x-javascript", + "kar", "audio/midi", + "kil", "application/x-killustrator", + "kpr", "application/x-kpresenter", + "kpt", "application/x-kpresenter", + "ksp", "application/x-kspread", + "kwd", "application/x-kword", + "kwt", "application/x-kword", + "latex", "application/x-latex", + "lha", "application/octet-stream", + "lzh", "application/octet-stream", + "m3u", "audio/x-mpegurl", + "man", "application/x-troff-man", + "me", "application/x-troff-me", + "mesh", "model/mesh", + "mid", "audio/midi", + "midi", "audio/midi", + "mif", "application/vnd.mif", + "mov", "video/quicktime", + "movie", "video/x-sgi-movie", + "mp2", "audio/mpeg", + "mp3", "audio/mpeg", + "mpe", "video/mpeg", + "mpeg", "video/mpeg", + "mpg", "video/mpeg", + "mpga", "audio/mpeg", + "ms", "application/x-troff-ms", + "msh", "model/mesh", + "mxu", "video/vnd.mpegurl", + "nc", "application/x-netcdf", + "ogg", "application/ogg", + "pbm", "image/x-portable-bitmap", + "pdb", "chemical/x-pdb", + "pdf", "application/pdf", + "pgm", "image/x-portable-graymap", + "pgn", "application/x-chess-pgn", + "png", "image/png", + "pnm", "image/x-portable-anymap", + "ppm", "image/x-portable-pixmap", + "ppt", "application/vnd.ms-powerpoint", + "ps", "application/postscript", + "qt", "video/quicktime", + "ra", "audio/x-realaudio", + "ram", "audio/x-pn-realaudio", + "ras", "image/x-cmu-raster", + "rgb", "image/x-rgb", + "rm", "audio/x-pn-realaudio", + "roff", "application/x-troff", + "rpm", "application/x-rpm", + "rtf", "text/rtf", + "rtx", "text/richtext", + "sgm", "text/sgml", + "sgml", "text/sgml", + "sh", "application/x-sh", + "shar", "application/x-shar", + "silo", "model/mesh", + "sit", "application/x-stuffit", + "skd", "application/x-koan", + "skm", "application/x-koan", + "skp", "application/x-koan", + "skt", "application/x-koan", + "smi", "application/smil", + "smil", "application/smil", + "snd", "audio/basic", + "so", "application/octet-stream", + "spl", "application/x-futuresplash", + "src", "application/x-wais-source", + "stc", "application/vnd.sun.xml.calc.template", + "std", "application/vnd.sun.xml.draw.template", + "sti", "application/vnd.sun.xml.impress.template", + "stw", "application/vnd.sun.xml.writer.template", + "sv4cpio", "application/x-sv4cpio", + "sv4crc", "application/x-sv4crc", + "swf", "application/x-shockwave-flash", + "sxc", "application/vnd.sun.xml.calc", + "sxd", "application/vnd.sun.xml.draw", + "sxg", "application/vnd.sun.xml.writer.global", + "sxi", "application/vnd.sun.xml.impress", + "sxm", "application/vnd.sun.xml.math", + "sxw", "application/vnd.sun.xml.writer", + "t", "application/x-troff", + "tar", "application/x-tar", + "tcl", "application/x-tcl", + "tex", "application/x-tex", + "texi", "application/x-texinfo", + "texinfo", "application/x-texinfo", + "tgz", "application/x-gzip", + "tif", "image/tiff", + "tiff", "image/tiff", + "torrent", "application/x-bittorrent", + "tr", "application/x-troff", + "tsv", "text/tab-separated-values", + "txt", "text/plain", + "ustar", "application/x-ustar", + "vcd", "application/x-cdlink", + "vrml", "model/vrml", + "wav", "audio/x-wav", + "wbmp", "image/vnd.wap.wbmp", + "wbxml", "application/vnd.wap.wbxml", + "wml", "text/vnd.wap.wml", + "wmlc", "application/vnd.wap.wmlc", + "wmls", "text/vnd.wap.wmlscript", + "wmlsc", "application/vnd.wap.wmlscriptc", + "wrl", "model/vrml", + "xbm", "image/x-xbitmap", + "xht", "application/xhtml+xml", + "xhtml", "application/xhtml+xml", + "xls", "application/vnd.ms-excel", + "xml", "text/xml", + "xpm", "image/x-xpixmap", + "xsl", "text/xml", + "xwd", "image/x-xwindowdump", + "xyz", "chemical/x-xyz", + "zip", "application/zip", }; /** * The MIME types above are put into this Hashtable for faster lookup. */ - private Hashtable mime_types - = new Hashtable(150); + private final Hashtable mime_types + = new Hashtable(((mime_strings.length / 3) << 1) + 3); /** * Create a new MimeTypeMapper object. */ public MimeTypeMapper() { - for (int i = 0; i < mime_strings.length; i++) - mime_types.put(mime_strings[i][0], mime_strings[i][1]); + for (int i = 1; i < mime_strings.length; i += 2) + mime_types.put(mime_strings[i - 1], mime_strings[i]); // Now read from the system mime database, if it exists. Entries found // here override our internal ones. @@ -330,17 +329,11 @@ // It is fine to hard-code the name here. This is only ever // used by maintainers, who can hack it if they need to re-run // it. - fillFromFile(map, "/etc/mime.types"); - Iterator it = map.keySet().iterator(); - boolean first = true; - while (it.hasNext()) + fillFromFile(map, args.length > 0 ? args[0] : "/etc/mime.types"); + for (String key : map.keySet()) { - String key = it.next(); String value = map.get(key); - // Put the "," first since it is easier to make correct syntax this way. - System.out.println(" " + (first ? " " : ", ") - + "{ \"" + key + "\", \"" + value + "\" }"); - first = false; + System.out.println(" \"" + key + "\", \"" + value + "\","); } } }