hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If an absolute file is missing try resolving it in the directory the

Browse Source 
file was loaded from
This commit is contained in:
bkuker 2012-12-12 14:46:18 -05:00
parent a780b8da93
commit e97ae2f4b0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/net/sf/openrocket/document/DecalRegistry.java
View File

@ -15,10 +15,13 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
import net.sf.openrocket.file.FileInfo; import net.sf.openrocket.file.FileInfo;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.FileUtils; import net.sf.openrocket.util.FileUtils;
public class DecalRegistry { public class DecalRegistry {
private static LogHelper log = Application.getLogger();
private FileInfo fileInfo; private FileInfo fileInfo;
private boolean isZipFile = false; private boolean isZipFile = false;
@ -105,7 +108,12 @@ public class DecalRegistry {
if ( rawIs == null ) { if ( rawIs == null ) {
File decal = new File(name); File decal = new File(name);
if ( decal.isAbsolute() ) { if ( decal.isAbsolute() ) {
try {
rawIs = new FileInputStream(decal); rawIs = new FileInputStream(decal);
} catch ( FileNotFoundException e ){
name = decal.getName();
log.debug("Unable to find absolute file" + decal + ", falling back to " + name);
}
} }
} }