Commit fc548af7 authored by David Novak's avatar David Novak
Browse files

Merged disalab/messif/version2 into version2

parents e651beb2 c5978edc

pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


    <groupId>messif</groupId>

    <artifactId>messif</artifactId>

    <version>2.3.6-DEVEL</version>

    <version>2.3.7-DEVEL</version>

    <packaging>jar</packaging>

    <url>http://disa.fi.muni.cz/trac/messif/</url>

src/main/java/messif/objects/impl/MetaObjectFixedMap.java

+8 −4
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ public class MetaObjectFixedMap extends MetaObject { 
     * @throws IOException when an error appears during reading from given stream,

     *         EOFException is returned if end of the given stream is reached.

     */

    public MetaObjectFixedMap(BufferedReader stream, Set<String> restrictNames) throws IOException {

    public MetaObjectFixedMap(BufferedReader stream, Set<String> restrictNames, DistanceFunction<MetaObject> distance) throws IOException {

        this.objects = new ArrayMap(readObjects(stream, restrictNames, readObjectsHeader(stream), new HashMap<String, LocalAbstractObject>()));

        this.distance = null;

        this.distance = distance;

    }    



    /**
@@ -183,7 +183,7 @@ public class MetaObjectFixedMap extends MetaObject { 
     *         EOFException is returned if end of the given stream is reached.

     */

    public MetaObjectFixedMap(BufferedReader stream, String[] restrictNames) throws IOException {

        this(stream, (restrictNames == null)?null:new HashSet<>(Arrays.asList(restrictNames)));

        this(stream, (restrictNames == null)?null:new HashSet<>(Arrays.asList(restrictNames)), null);

    }



    /**
@@ -193,7 +193,11 @@ public class MetaObjectFixedMap extends MetaObject { 
     *         EOFException is returned if end of the given stream is reached.

     */

    public MetaObjectFixedMap(BufferedReader stream) throws IOException {

        this(stream, (Set<String>)null);

        this(stream, (Set<String>)null, null);

    }     



    public MetaObjectFixedMap(BufferedReader stream, DistanceFunction<MetaObject> distance) throws IOException {

        this(stream, (Set<String>)null, distance);

    }

    

    // ********************    Getters  & setters    ************************** //