Improved mime.types parser RE.

Previously, lines containing a comment at the end and lines starting
with whitespace were not recognized.

git-svn-id: https://develop.sub.uni-goettingen.de/repos/textgrid/trunk/services/aggregator@14095 7c539038-3410-0410-b1ec-0f2a7bf1c452

src/main/java/info/textgrid/services/aggregator/tree/FileExtensionMap.java

@@ -27,7 +27,12 @@ public class FileExtensionMap {
 	private static Logger logger = Logger.getLogger(FileExtensionMap.class);
 
 	protected FileExtensionMap() throws IOException {
-		final Pattern mapLine = Pattern.compile("^([^# \t]+)[ \t]*([^#]+)$");
+		
+		// Comments start with # and reach to the end of line.
+		// A matching line contains of a mime type and one or more extensions
+		// comments are stripped
+		// <whitespace>? <mimetype>¹ <whitespace> <extensions>² <whitespace>? <comment>? 
+		final Pattern mapLine = Pattern.compile("^[ \t]*([^# \t]+)[ \t]*([^#]+)[ \t]*(#.*)?$");
 		final Pattern space = Pattern.compile("[ \t]+");
 		final LineNumberReader reader = new LineNumberReader(
 				new InputStreamReader(getClass().getClassLoader()

src/test/java/info/textgrid/services/aggregator/tree/FileExtensionMapTest.java

@@ -25,6 +25,11 @@ public void testGetExtensions() {
 		Assert.assertEquals("Wrong extensions for XHTML",
 				ImmutableList.of("xhtml", "xht"), xhtml);
 	}
+	
+	@Test
+	public void testTextGridTypes() {
+		Assert.assertEquals("aggregation", ext.getFirstExtension("text/tg.aggregation+xml").orNull());
+	}
 
 	@Test
 	public void testGetFirstExtension() {