@@ -11,7 +11,7 @@
<excludeFolder url="file://$MODULE_DIR$/doc/izpack" />
<excludeFolder url="file://$MODULE_DIR$/doc/izpack/javadoc" />
</content>
- <orderEntry type="jdk" jdkName="1.5" jdkType="JavaSDK" />
+ <orderEntry type="jdk" jdkName="1.5 (1)" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
IzPack.iml
@@ -42,6 +42,9 @@
<entry name="?*.xsl" />
</wildcardResourcePatterns>
</component>
+ <component name="CopyrightManager" default="">
+ <module2copyright />
+ </component>
<component name="DependenciesAnalyzeManager">
<option name="myForwardDirection" value="false" />
</component>
@@ -257,6 +260,9 @@
<option name="projectName" value="IzPack" />
</component>
<component name="ProjectFileVersion" converted="true" />
+ <component name="ProjectKey">
+ <option name="state" value="project:///Users/julien/Code/izpack.git/IzPack.ipr" />
+ </component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/IzPack.iml" filepath="$PROJECT_DIR$/IzPack.iml" />
@@ -296,6 +302,7 @@
</map>
</option>
<option name="myVersion" value="124" />
+ <option name="mySupportsUserInfoFilter" value="true" />
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="svn" />
IzPack.ipr
@@ -23,6 +23,7 @@ package com.izforge.izpack.installer;
import java.io.FileReader;
import java.io.InputStream;
import java.io.PrintWriter;
+import java.io.FileInputStream;
import java.util.Iterator;
import java.util.Properties;
@@ -242,12 +243,11 @@ public class ConsoleInstaller extends InstallerBase
protected void doInstallFromPropertiesFile(String strFile) throws Exception
{
- FileReader fileReader = null;
+ FileInputStream in = new FileInputStream(strFile);
try
{
- fileReader = new FileReader(strFile);
- this.properties = new Properties();
- properties.load(fileReader);
+ properties = new Properties();
+ properties.load(in);
iterateAndPerformAction("doInstallFromPropertiesFile");
}
catch (Exception e)
@@ -256,10 +256,7 @@ public class ConsoleInstaller extends InstallerBase
}
finally
{
- if (fileReader != null)
- {
- fileReader.close();
- }
+ in.close();
Housekeeper.getInstance().shutDown(this.result ? 0 : 1);
}
}
src/lib/com/izforge/izpack/installer/ConsoleInstaller.java
d9c64f22292f713b9da996d3b8eb10ad820c0acc
jponge
jponge@7d736ef5-cfd4-0310-9c9a-b52d5c14b761
http://github.com/jponge/izpack/commit/09e28f0025f55014a00c9347f0e0f9a1f024877a
09e28f0025f55014a00c9347f0e0f9a1f024877a
2009-03-22T07:58:31-07:00
2009-03-22T07:58:31-07:00
IZPACK-230: fix a JDK6-only invocation.
git-svn-id: https://svn.codehaus.org/izpack/izpack-src/trunk@2672 7d736ef5-cfd4-0310-9c9a-b52d5c14b761
8e95cf76b5a1432124659f4be95a9a05b6356831
jponge
jponge@7d736ef5-cfd4-0310-9c9a-b52d5c14b761