rusefi
/
RomRaider
mirror of https://github.com/rusefi/RomRaider.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved exception reporting in XML parser 

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@178 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
Jared Gould 2006-07-25 16:11:45 +00:00
parent 8fec7c2126
commit 9f766b4f3a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/enginuity/ECUEditor.java
View File

@ -357,7 +357,7 @@ public class ECUEditor extends JFrame implements WindowListener, PropertyChangeL
progress.update("Parsing ECU definitions...", 0);
byte[] input = readFile(inputFile);
DOMRomUnmarshaller domUms = new DOMRomUnmarshaller(settings);
DOMRomUnmarshaller domUms = new DOMRomUnmarshaller(settings, this);
DOMParser parser = new DOMParser();
progress.update("Finding ECU definition...", 10);
Rom rom;

17
src/enginuity/xml/DOMRomUnmarshaller.java
View File

@ -2,6 +2,7 @@
package enginuity.xml;
import enginuity.ECUEditor;
import enginuity.Settings;
import javax.management.modelmbean.XMLParseException;
@ -17,17 +18,21 @@ import enginuity.maps.Table1D;
import enginuity.maps.Table2D;
import enginuity.maps.Table3D;
import enginuity.maps.TableSwitch;
import enginuity.swing.DebugPanel;
import enginuity.swing.JProgressPane;
import java.util.Vector;
import javax.swing.JOptionPane;
public class DOMRomUnmarshaller {
private JProgressPane progress = null;
private Vector<Scale> scales = new Vector<Scale>();
private Settings settings;
private Settings settings;
private ECUEditor parent;
public DOMRomUnmarshaller(Settings settings) {
public DOMRomUnmarshaller(Settings settings, ECUEditor parent) {
this.settings = settings;
this.parent = parent;
}
public Rom unmarshallXMLDefinition (Node rootNode, byte[] input, JProgressPane progress) throws RomNotFoundException, XMLParseException, StackOverflowError, Exception {
@ -219,7 +224,9 @@ public class DOMRomUnmarshaller {
table = (Table)ObjectCloner.deepCopy((Object)rom.getTable(unmarshallAttribute(tableNode, "base", "none")));
} catch (TableNotFoundException ex) { /* table not found */ } catch (NullPointerException ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(parent, new DebugPanel(ex,
parent.getSettings().getSupportURL()), "Exception", JOptionPane.ERROR_MESSAGE);
}
}
@ -370,8 +377,10 @@ public class DOMRomUnmarshaller {
if (scales.get(i).getName().equalsIgnoreCase(base)) {
try {
scale = (Scale)ObjectCloner.deepCopy((Object)scales.get(i));
} catch (Exception ex) {
ex.printStackTrace();
JOptionPane.showMessageDialog(parent, new DebugPanel(ex,
parent.getSettings().getSupportURL()), "Exception", JOptionPane.ERROR_MESSAGE);
}
}
}