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

Merge pull request #110 from kruland2607/master

Browse Source 
Added some logging to help diagnose NPE bug reports
This commit is contained in:
kruland2607 2013-08-21 21:58:54 -07:00
commit a05c08ac8b
1 changed files with 47 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/net/sf/openrocket/gui/main/ExampleDesignFile.java
View File

@ -3,25 +3,24 @@ package net.sf.openrocket.gui.main;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.List;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import net.sf.openrocket.file.iterator.DirectoryIterator;
import net.sf.openrocket.file.iterator.FileIterator;
import net.sf.openrocket.gui.util.SimpleFileFilter;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.JarUtil; import net.sf.openrocket.util.JarUtil;
import net.sf.openrocket.util.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class ExampleDesignFile implements Comparable<ExampleDesignFile> { public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
private final static Logger logger = LoggerFactory.getLogger(ExampleDesignFile.class);
private final URL url; private final URL url;
private final String name; private final String name;
@ -48,6 +47,7 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
ExampleDesignFile[] designs = getJarFileNames(); ExampleDesignFile[] designs = getJarFileNames();
if (designs == null || designs.length == 0) { if (designs == null || designs.length == 0) {
logger.debug("Cannot find jar file, trying to load from directory");
designs = getDirFileNames(); designs = getDirFileNames();
} }
if (designs == null || designs.length == 0) { if (designs == null || designs.length == 0) {
@ -74,24 +74,28 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
File dir; File dir;
URL url = ClassLoader.getSystemResource(DIRECTORY); URL url = ClassLoader.getSystemResource(DIRECTORY);
logger.debug("Loading example from {} ", url);
try { try {
dir = JarUtil.urlToFile(url); dir = JarUtil.urlToFile(url);
} catch (Exception e1) { } catch (Exception e1) {
dir = new File(DIRECTORY); dir = new File(DIRECTORY);
} }
logger.debug("Directory to search is: {}", dir);
// Get the list of files // Get the list of files
File[] files = dir.listFiles(FILTER); File[] files = dir.listFiles(FILTER);
if (files == null) if (files == null) {
logger.debug("No files found in directory");
return null; return null;
}
ExampleDesignFile[] designs = new ExampleDesignFile[files.length]; ExampleDesignFile[] designs = new ExampleDesignFile[files.length];
for (int i=0; i<files.length; i++) { for (int i = 0; i < files.length; i++) {
String name = files[i].getName(); String name = files[i].getName();
try { try {
designs[i] = new ExampleDesignFile(files[i].toURI().toURL(), designs[i] = new ExampleDesignFile(files[i].toURI().toURL(),
name.substring(0, name.length()-4)); name.substring(0, name.length() - 4));
} catch (MalformedURLException e) { } catch (MalformedURLException e) {
throw new BugException(e); throw new BugException(e);
} }
@ -108,6 +112,7 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
// Find and open the jar file this class is contained in // Find and open the jar file this class is contained in
File file = JarUtil.getCurrentJarFile(); File file = JarUtil.getCurrentJarFile();
logger.debug("Current jar file is: {}", file);
if (file == null) if (file == null)
return null; return null;
@ -117,7 +122,7 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
try { try {
fileUrl = file.toURI().toURL(); fileUrl = file.toURI().toURL();
} catch (MalformedURLException e1) { } catch (MalformedURLException e1) {
e1.printStackTrace(); logger.error("Unable to transform file name {} to URL", file, e1);
throw new BugException(e1); throw new BugException(e1);
} }
@ -135,11 +140,12 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
String urlName = "jar:" + fileUrl + "!/" + name; String urlName = "jar:" + fileUrl + "!/" + name;
URL url = new URL(urlName); URL url = new URL(urlName);
list.add(new ExampleDesignFile(url, list.add(new ExampleDesignFile(url,
name.substring(dirLength, name.length()-4))); name.substring(dirLength, name.length() - 4)));
} }
} }
} catch (IOException e) { } catch (IOException e) {
logger.error("IOException when processing jarFile", e);
// Could be normal condition if not package in JAR // Could be normal condition if not package in JAR
return null; return null;
} finally { } finally {
@ -147,7 +153,6 @@ public class ExampleDesignFile implements Comparable<ExampleDesignFile> {
try { try {
jarFile.close(); jarFile.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace();
} }
} }
} }