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

Minor fixups and method renaming.

Browse Source
This commit is contained in:
kruland2607 2012-12-21 22:16:13 -06:00
parent 618dd63b5c
commit bd1e3ce83c
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public class DecalRegistry {
private boolean isZipFile = false; private boolean isZipFile = false;
private Map<String,File> exportedDecalMap = new HashMap<String,File>(); private Map<String,File> exportedDecalMap = new HashMap<String,File>();
public void setBaseFile(FileInfo fileInfo) { public void setBaseFile(FileInfo fileInfo) {
this.fileInfo = fileInfo; this.fileInfo = fileInfo;
} }
@ -48,7 +48,7 @@ public class DecalRegistry {
return false; return false;
} }
try { try {
InputStream is = forwardToEntry(name); InputStream is = findInZipContainer(name);
if ( is != null ) { if ( is != null ) {
is.close(); is.close();
return true; return true;
@ -59,7 +59,7 @@ public class DecalRegistry {
return false; return false;
} }
} }
/** /**
* This function returns an InputStream backed by a byte[] containing the decal pixels. * This function returns an InputStream backed by a byte[] containing the decal pixels.
* If it reads in the bytes from an actual file, the underlying file is closed. * If it reads in the bytes from an actual file, the underlying file is closed.
@ -74,7 +74,7 @@ public class DecalRegistry {
// This is the InputStream to be returned. // This is the InputStream to be returned.
InputStream rawIs = null; InputStream rawIs = null;
// First check if the decal had been exported // First check if the decal had been exported
{ {
File exportedFile= exportedDecalMap.get(name); File exportedFile= exportedDecalMap.get(name);
@ -90,7 +90,7 @@ public class DecalRegistry {
} }
if ( rawIs == null && isZipFile ) { if ( rawIs == null && isZipFile ) {
rawIs = forwardToEntry(name); rawIs = findInZipContainer(name);
} }
// Check absolute file name: // Check absolute file name:
@ -120,7 +120,6 @@ public class DecalRegistry {
try { try {
byte[] bytes = FileUtils.readBytes(rawIs); byte[] bytes = FileUtils.readBytes(rawIs);
// TODO - here we would update the cache.
return new ByteArrayInputStream(bytes); return new ByteArrayInputStream(bytes);
} }
finally { finally {
@ -130,7 +129,7 @@ public class DecalRegistry {
} }
public void exportDecal( String decalName, File selectedFile ) throws IOException { public void exportDecal( String decalName, File selectedFile ) throws IOException {
try { try {
InputStream is = getDecal(decalName); InputStream is = getDecal(decalName);
OutputStream os = new BufferedOutputStream( new FileOutputStream(selectedFile)); OutputStream os = new BufferedOutputStream( new FileOutputStream(selectedFile));
@ -139,21 +138,26 @@ public class DecalRegistry {
is.close(); is.close();
os.close(); os.close();
exportedDecalMap.put(decalName, selectedFile ); exportedDecalMap.put(decalName, selectedFile );
} }
catch (IOException iex) { catch (IOException iex) {
throw new BugException(iex); throw new BugException(iex);
} }
} }
private ZipInputStream forwardToEntry( String name ) throws IOException { private ZipInputStream findInZipContainer( String name ) {
ZipInputStream zis = new ZipInputStream(fileInfo.fileURL.openStream()); ZipInputStream zis = null;
try {
zis = new ZipInputStream(fileInfo.fileURL.openStream());
} catch( IOException ex ) {
return null;
}
try { try {
ZipEntry entry = zis.getNextEntry(); ZipEntry entry = zis.getNextEntry();
while ( entry != null ) { while ( entry != null ) {
@ -162,12 +166,16 @@ public class DecalRegistry {
} }
entry = zis.getNextEntry(); entry = zis.getNextEntry();
} }
zis.close();
return null;
} }
catch ( IOException ioex ) { catch ( IOException ioex ) {
zis.close(); try {
throw ioex; zis.close();
} catch ( IOException ex ) {
// why does close throw? it's maddening
}
return null;
} }
zis.close();
return null;
} }
} }