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

Improved filename display method for rom tree 

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@82 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
This commit is contained in:
Jared Gould 2006-07-04 04:22:08 +00:00
parent 28d4d25b6c
commit 4c1fe98d50
4 changed files with 71 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
src/enginuity/ECUEditor.java
View File

@ -45,10 +45,10 @@ public class ECUEditor extends JFrame implements WindowListener {
private RomTree imageList = new RomTree(imageRoot); private RomTree imageList = new RomTree(imageRoot);
private Vector<Rom> images = new Vector<Rom>(); private Vector<Rom> images = new Vector<Rom>();
private Settings settings = new Settings(); private Settings settings = new Settings();
private String version = new String("0.3.0 Beta"); private String version = new String("0.3.1 Beta");
private String versionDate = new String("7/2/2006"); private String versionDate = new String("7/4/2006");
private String titleText = new String("Enginuity v" + version); private String titleText = new String("Enginuity v" + version);
private MDIDesktopPane rightPanel = new MDIDesktopPane(); private MDIDesktopPane rightPanel = new MDIDesktopPane();
private Rom lastSelectedRom = null; private Rom lastSelectedRom = null;
private JSplitPane splitPane = new JSplitPane(); private JSplitPane splitPane = new JSplitPane();
private ECUEditorToolBar toolBar; private ECUEditorToolBar toolBar;
@ -58,10 +58,10 @@ public class ECUEditor extends JFrame implements WindowListener {
// get settings from xml // get settings from xml
try { try {
InputSource src = new InputSource(new FileInputStream(new File("./settings.xml"))); InputSource src = new InputSource(new FileInputStream(new File("./settings.xml")));
DOMSettingsUnmarshaller domUms = new DOMSettingsUnmarshaller(); DOMSettingsUnmarshaller domUms = new DOMSettingsUnmarshaller();
DOMParser parser = new DOMParser(); DOMParser parser = new DOMParser();
parser.parse(src); parser.parse(src);
Document doc = parser.getDocument(); Document doc = parser.getDocument();
settings = domUms.unmarshallSettings(doc.getDocumentElement()); settings = domUms.unmarshallSettings(doc.getDocumentElement());
} catch (Exception ex) { } catch (Exception ex) {
@ -70,13 +70,13 @@ public class ECUEditor extends JFrame implements WindowListener {
} }
setSize(getSettings().getWindowSize()); setSize(getSettings().getWindowSize());
setLocation(getSettings().getWindowLocation()); setLocation(getSettings().getWindowLocation());
if (getSettings().isWindowMaximized() == true) setExtendedState(JFrame.MAXIMIZED_BOTH); if (getSettings().isWindowMaximized() == true) setExtendedState(JFrame.MAXIMIZED_BOTH);
JScrollPane rightScrollPane = new JScrollPane(rightPanel, JScrollPane rightScrollPane = new JScrollPane(rightPanel,
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
JScrollPane leftScrollPane = new JScrollPane(imageList, JScrollPane leftScrollPane = new JScrollPane(imageList,
JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane); splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, leftScrollPane, rightScrollPane);
splitPane.setDividerSize(4); splitPane.setDividerSize(4);
splitPane.setDividerLocation(getSettings().getSplitPaneLocation()); splitPane.setDividerLocation(getSettings().getSplitPaneLocation());
@ -87,10 +87,10 @@ public class ECUEditor extends JFrame implements WindowListener {
//create menubar and toolbar //create menubar and toolbar
menuBar = new ECUEditorMenuBar(this); menuBar = new ECUEditorMenuBar(this);
this.setJMenuBar(menuBar); this.setJMenuBar(menuBar);
toolBar = new ECUEditorToolBar(this); toolBar = new ECUEditorToolBar(this);
this.add(toolBar, BorderLayout.NORTH); this.add(toolBar, BorderLayout.NORTH);
//set remaining window properties //set remaining window properties
setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage()); setIconImage(new ImageIcon("./graphics/enginuity-ico.gif").getImage());
setDefaultCloseOperation(EXIT_ON_CLOSE); setDefaultCloseOperation(EXIT_ON_CLOSE);
@ -98,20 +98,20 @@ public class ECUEditor extends JFrame implements WindowListener {
setTitle(titleText); setTitle(titleText);
setVisible(true); setVisible(true);
} }
public void windowClosing(WindowEvent e) { public void windowClosing(WindowEvent e) {
getSettings().setSplitPaneLocation(splitPane.getDividerLocation()); getSettings().setSplitPaneLocation(splitPane.getDividerLocation());
if (getExtendedState() == JFrame.MAXIMIZED_BOTH) getSettings().setWindowMaximized(true); if (getExtendedState() == JFrame.MAXIMIZED_BOTH) getSettings().setWindowMaximized(true);
else { else {
getSettings().setWindowMaximized(false); getSettings().setWindowMaximized(false);
getSettings().setWindowSize(getSize()); getSettings().setWindowSize(getSize());
getSettings().setWindowLocation(getLocation()); getSettings().setWindowLocation(getLocation());
} }
DOMSettingsBuilder builder = new DOMSettingsBuilder(); DOMSettingsBuilder builder = new DOMSettingsBuilder();
try { try {
JProgressPane progress = new JProgressPane(this, "Saving settings...", "Saving settings..."); JProgressPane progress = new JProgressPane(this, "Saving settings...", "Saving settings...");
builder.buildSettings(settings, new File("./settings.xml"), progress); builder.buildSettings(settings, new File("./settings.xml"), progress);
} catch (IOException ex) { } } catch (IOException ex) { }
@ -125,12 +125,12 @@ public class ECUEditor extends JFrame implements WindowListener {
public static void main(String args[]) { public static void main(String args[]) {
new ECUEditor(); new ECUEditor();
} }
public String getVersion() { public String getVersion() {
return version; return version;
} }
public Settings getSettings() { public Settings getSettings() {
return settings; return settings;
} }
@ -139,11 +139,13 @@ public class ECUEditor extends JFrame implements WindowListener {
// add to ecu image list pane // add to ecu image list pane
RomTreeNode romNode = new RomTreeNode(input, settings.getUserLevel()); RomTreeNode romNode = new RomTreeNode(input, settings.getUserLevel());
imageRoot.add(romNode); imageRoot.add(romNode);
imageList.updateUI(); imageList.updateUI();
imageList.expandRow(imageList.getRowCount() - 1); imageList.expandRow(imageList.getRowCount() - 1);
imageList.updateUI(); imageList.updateUI();
System.out.println(romNode);
setLastSelectedRom(input); setLastSelectedRom(input);
System.out.println(romNode);
if (input.getRomID().isObsolete() && settings.isObsoleteWarning()) { if (input.getRomID().isObsolete() && settings.isObsoleteWarning()) {
JPanel infoPanel = new JPanel(); JPanel infoPanel = new JPanel();
@ -155,19 +157,19 @@ public class ECUEditor extends JFrame implements WindowListener {
JCheckBox check = new JCheckBox("Always display this message", true); JCheckBox check = new JCheckBox("Always display this message", true);
check.setHorizontalAlignment(JCheckBox.RIGHT); check.setHorizontalAlignment(JCheckBox.RIGHT);
check.addActionListener( check.addActionListener(
new ActionListener() { new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
settings.setObsoleteWarning(((JCheckBox)e.getSource()).isSelected()); settings.setObsoleteWarning(((JCheckBox)e.getSource()).isSelected());
} }
} }
); );
infoPanel.add(check); infoPanel.add(check);
JOptionPane.showMessageDialog(this, infoPanel, "ECU Revision is Obsolete", JOptionPane.INFORMATION_MESSAGE); JOptionPane.showMessageDialog(this, infoPanel, "ECU Revision is Obsolete", JOptionPane.INFORMATION_MESSAGE);
} }
input.setContainer(this); input.setContainer(this);
imageList.updateUI(); imageList.updateUI();
} }
public void displayTable(TableFrame frame) { public void displayTable(TableFrame frame) {
@ -189,16 +191,16 @@ public class ECUEditor extends JFrame implements WindowListener {
public void closeImage() { public void closeImage() {
for (int i = 0; i < imageRoot.getChildCount(); i++) { for (int i = 0; i < imageRoot.getChildCount(); i++) {
RomTreeNode romTreeNode = (RomTreeNode)imageRoot.getChildAt(i); RomTreeNode romTreeNode = (RomTreeNode)imageRoot.getChildAt(i);
Rom rom = romTreeNode.getRom(); Rom rom = romTreeNode.getRom();
if (rom == lastSelectedRom) { if (rom == lastSelectedRom) {
imageRoot.remove(romTreeNode); imageRoot.remove(romTreeNode);
Vector<Table> romTables = rom.getTables(); Vector<Table> romTables = rom.getTables();
for (Iterator j = romTables.iterator(); j.hasNext();) { for (Iterator j = romTables.iterator(); j.hasNext();) {
Table t = (Table)j.next(); Table t = (Table)j.next();
rightPanel.remove(t.getFrame()); rightPanel.remove(t.getFrame());
t.finalize(); t.finalize();
} }
rom.finalize(); rom.finalize();
romTreeNode.finalize(); romTreeNode.finalize();
break; break;
@ -206,12 +208,11 @@ public class ECUEditor extends JFrame implements WindowListener {
} }
imageList.updateUI(); imageList.updateUI();
if (imageRoot.getChildCount() > 0) { if (imageRoot.getChildCount() > 0) {
setLastSelectedRom(((RomTreeNode)imageRoot.getChildAt(0)).getRom()); setLastSelectedRom(((RomTreeNode)imageRoot.getChildAt(0)).getRom());
} } else {
else { // no other images open
// no other images open setLastSelectedRom(null);
setLastSelectedRom(null); }
}
rightPanel.repaint(); rightPanel.repaint();
} }
@ -225,17 +226,17 @@ public class ECUEditor extends JFrame implements WindowListener {
rightPanel.removeAll(); rightPanel.removeAll();
rightPanel.repaint(); rightPanel.repaint();
} }
public Rom getLastSelectedRom() { public Rom getLastSelectedRom() {
return lastSelectedRom; return lastSelectedRom;
} }
public void setLastSelectedRom(Rom lastSelectedRom) { public void setLastSelectedRom(Rom lastSelectedRom) {
this.lastSelectedRom = lastSelectedRom; this.lastSelectedRom = lastSelectedRom;
if (lastSelectedRom == null) { if (lastSelectedRom == null) {
this.setTitle(titleText); setTitle(titleText);
} else { } else {
this.setTitle(titleText + " - " + lastSelectedRom.getFileName()); setTitle(titleText + " - " + lastSelectedRom.getFileName());
} }
// update filenames // update filenames
@ -247,11 +248,11 @@ public class ECUEditor extends JFrame implements WindowListener {
menuBar.updateMenu(); menuBar.updateMenu();
imageList.updateUI(); imageList.updateUI();
} }
public ECUEditorToolBar getToolBar() { public ECUEditorToolBar getToolBar() {
return toolBar; return toolBar;
} }
public void setToolBar(ECUEditorToolBar toolBar) { public void setToolBar(ECUEditorToolBar toolBar) {
this.toolBar = toolBar; this.toolBar = toolBar;
} }
@ -259,7 +260,7 @@ public class ECUEditor extends JFrame implements WindowListener {
public void setSettings(Settings settings) { public void setSettings(Settings settings) {
this.settings = settings; this.settings = settings;
for (int i = 0; i < imageRoot.getChildCount(); i++) { for (int i = 0; i < imageRoot.getChildCount(); i++) {
RomTreeNode rtn = (RomTreeNode)imageRoot.getChildAt(i); RomTreeNode rtn = (RomTreeNode)imageRoot.getChildAt(i);
rtn.getRom().setContainer(this); rtn.getRom().setContainer(this);
} }
} }
@ -267,19 +268,19 @@ public class ECUEditor extends JFrame implements WindowListener {
public void repaintPanel() { public void repaintPanel() {
rightPanel.repaint(); rightPanel.repaint();
rightPanel.update(rightPanel.getGraphics()); rightPanel.update(rightPanel.getGraphics());
} }
public void setUserLevel(int userLevel) { public void setUserLevel(int userLevel) {
settings.setUserLevel(userLevel); settings.setUserLevel(userLevel);
imageRoot.setUserLevel(userLevel); imageRoot.setUserLevel(userLevel);
imageList.updateUI(); imageList.updateUI();
} }
public Vector<Rom> getImages() { public Vector<Rom> getImages() {
Vector<Rom> images = new Vector<Rom>(); Vector<Rom> images = new Vector<Rom>();
for (int i = 0; i < imageRoot.getChildCount(); i++) { for (int i = 0; i < imageRoot.getChildCount(); i++) {
RomTreeNode rtn = (RomTreeNode)imageRoot.getChildAt(i); RomTreeNode rtn = (RomTreeNode)imageRoot.getChildAt(i);
images.add(rtn.getRom()); images.add(rtn.getRom());
} }
return images; return images;
} }

1
src/enginuity/maps/Rom.java
View File

@ -2,7 +2,6 @@ package enginuity.maps;
import enginuity.ECUEditor; import enginuity.ECUEditor;
import enginuity.swing.JProgressPane; import enginuity.swing.JProgressPane;
import enginuity.swing.RomTreeNode;
import enginuity.xml.TableNotFoundException; import enginuity.xml.TableNotFoundException;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;

2
src/enginuity/swing/RomTree.java
View File

@ -3,6 +3,8 @@ package enginuity.swing;
import enginuity.ECUEditor; import enginuity.ECUEditor;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.awt.event.MouseListener; import java.awt.event.MouseListener;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTree; import javax.swing.JTree;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;

17
src/enginuity/swing/RomTreeNode.java
View File

@ -3,6 +3,8 @@ package enginuity.swing;
import enginuity.maps.Rom; import enginuity.maps.Rom;
import enginuity.maps.Table; import enginuity.maps.Table;
import java.util.Vector; import java.util.Vector;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
public class RomTreeNode extends DefaultMutableTreeNode { public class RomTreeNode extends DefaultMutableTreeNode {
@ -10,11 +12,11 @@ public class RomTreeNode extends DefaultMutableTreeNode {
private Rom rom = new Rom(); private Rom rom = new Rom();
public RomTreeNode(Rom rom, int userLevel) { public RomTreeNode(Rom rom, int userLevel) {
super(rom.getFileName());
setRom(rom); setRom(rom);
refresh(userLevel); refresh(userLevel);
updateFileName();
} }
public void refresh(int userLevel) { public void refresh(int userLevel) {
removeAllChildren(); removeAllChildren();
Vector<Table> tables = rom.getTables(); Vector<Table> tables = rom.getTables();
@ -49,7 +51,14 @@ public class RomTreeNode extends DefaultMutableTreeNode {
} }
public void updateFileName() { public void updateFileName() {
this.setUserObject(rom.getFileName()); /*JPanel panel = new JPanel();
JLabel fileName = new JLabel(rom.getFileName());
JLabel info = new JLabel("info");
panel.add(fileName);
panel.add(info);
setUserObject(panel);*/
setUserObject(rom.getFileName());
} }
public void add(Table table) { public void add(Table table) {
@ -68,7 +77,7 @@ public class RomTreeNode extends DefaultMutableTreeNode {
public Rom getRom() { public Rom getRom() {
return rom; return rom;
} }
public void setRom(Rom rom) { public void setRom(Rom rom) {
this.rom = rom; this.rom = rom;
} }