=== added file 'src/rmlimage/module/multi/io/ZipConstants.java' --- src/rmlimage/module/multi/io/ZipConstants.java 1970-01-01 00:00:00 +0000 +++ src/rmlimage/module/multi/io/ZipConstants.java 2011-03-24 10:44:49 +0000 @@ -0,0 +1,14 @@ +package rmlimage.module.multi.io; + +/** + * Constants used in the ZipLoader and ZipSaver + * classes. + * + * @author Philippe T. Pinard + * + */ +public class ZipConstants { + + /** Filename of the property file inside the ZIP file (no extension). */ + public static final String PROP_FILENAME= "properties"; +} === modified file 'src/rmlimage/module/multi/io/ZipLoader.java' --- src/rmlimage/module/multi/io/ZipLoader.java 2011-03-13 16:33:58 +0000 +++ src/rmlimage/module/multi/io/ZipLoader.java 2011-03-24 10:45:31 +0000 @@ -244,7 +244,7 @@ //Set the MultiMap properties if the general properties file exists - File propFile = new File(zipDir, FileUtil.getBaseName(file) + ".prop"); + File propFile = new File(zipDir, ZipConstants.PROP_FILENAME + ".prop"); loadProperties(propFile, multiMap); //Load other files from the ZIP === modified file 'src/rmlimage/module/multi/io/ZipSaver.java' --- src/rmlimage/module/multi/io/ZipSaver.java 2011-03-13 16:33:58 +0000 +++ src/rmlimage/module/multi/io/ZipSaver.java 2011-03-24 10:44:53 +0000 @@ -146,7 +146,7 @@ aliasList.store(new File(zipDir, "alias.prop")); //Build the general properties file - saveProperties(multiMap, new File(zipDir, FileUtil.getBaseName(file) + saveProperties(multiMap, new File(zipDir, ZipConstants.PROP_FILENAME + ".prop")); //Add the version number to the header