LauncherGenerator — do not use Guava

This commit is contained in:
Vladimir Krivosheev
2016-07-27 11:09:58 +02:00
parent 7eac00ba6e
commit d747b64215
6 changed files with 9 additions and 23 deletions

Binary file not shown.

View File

@@ -9,7 +9,6 @@
<element id="module-output" name="launcher-generator" />
</element>
<element id="library" level="project" name="sanselan-0.98-snapshot" />
<element id="library" level="project" name="guava" />
<element id="library" level="project" name="jdom" />
</root>
</artifact>

View File

@@ -1,9 +0,0 @@
<component name="libraryTable">
<library name="guava">
<CLASSES>
<root url="jar://$PROJECT_DIR$/../../lib/guava-19.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View File

@@ -3,8 +3,7 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
</project>

View File

@@ -11,7 +11,5 @@
<orderEntry type="library" name="jdom" level="project" />
<orderEntry type="library" name="sanselan-0.98-snapshot" level="project" />
<orderEntry type="module" module-name="icons" />
<orderEntry type="library" name="guava" level="project" />
</component>
</module>
</module>

View File

@@ -17,8 +17,6 @@
package com.pme.launcher;
import com.google.common.io.Files;
import com.google.common.io.InputSupplier;
import com.pme.exe.ExeFormat;
import com.pme.exe.ExeReader;
import com.pme.exe.SectionReader;
@@ -32,6 +30,9 @@ import com.pme.exe.res.vi.VersionInfo;
import com.pme.util.OffsetTrackingInputStream;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardCopyOption;
/**
* Date: May 6, 2006
@@ -134,16 +135,14 @@ public class LauncherGenerator {
}
public void injectIcon(int id, final InputStream iconStream) throws IOException {
File f = File.createTempFile("launcher", "ico");
Path f = Files.createTempFile("launcher", "ico");
try {
Files.asByteSink(f).writeFrom(iconStream);
Files.copy(iconStream, f, StandardCopyOption.REPLACE_EXISTING);
}
finally {
iconStream.close();
}
IconResourceInjector iconInjector = new IconResourceInjector();
iconInjector.injectIcon(f, myRoot, "IRD" + id);
new IconResourceInjector().injectIcon(f.toFile(), myRoot, "IRD" + id);
}
public void setVersionNumber(int majorVersion, int minorVersion, int bugfixVersion) {