Merge pull request #20 from caspervdw/jar-update

This checks out OK - it passes both the bioformats unit tests and CellProfiler's unit tests with the updated Jar. Thanks.

Author: LeeKamentsky

bioformats/__init__.py

@@ -22,6 +22,8 @@
 
 _jars_dir = os.path.join(os.path.dirname(__file__), 'jars')
 
+JAR_VERSION = '5.0.6'
+
 JARS = javabridge.JARS + [os.path.realpath(os.path.join(_jars_dir, name + '.jar'))
                           for name in ['loci_tools']]
 """List of directories, jar files, and zip files that should be added

bioformats/formatreader.py

@@ -98,9 +98,10 @@ class IFormatReader(object):
         getDimensionOrder = jutil.make_method('getDimensionOrder',
                                               '()Ljava/lang/String;',
                                               'Return the dimension order as a five-character string, e.g. "XYCZT"')
-        getMetadata = jutil.make_method('getMetadata',
+        getGlobalMetadata = jutil.make_method('getGlobalMetadata',
                                         '()Ljava/util/Hashtable;',
-                                        'Obtains the hashtable containing the metadata field/value pairs')
+                                        'Obtains the hashtable containing the global metadata field/value pairs')
+        getMetadata = getGlobalMetadata
         getMetadataValue = jutil.make_method('getMetadataValue',
                                              '(Ljava/lang/String;)'
                                              'Ljava/lang/Object;',