From 8d5c21477617e4d08bd098069c7628830675abb7 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Wed, 21 May 2008 01:06:31 +0000 Subject: Renamed VSEditorFrame into VSBetterEditor. I'll create a enw VSEditorFrame class soon. --- sources/prefs/editors/VSBetterEditor.java | 217 ++++++++++++++++++++++++++ sources/prefs/editors/VSEditorFrame.java | 217 -------------------------- sources/prefs/editors/VSProcessEditor.java | 2 +- sources/prefs/editors/VSProtocolEditor.java | 2 +- sources/prefs/editors/VSSimulationEditor.java | 2 +- 5 files changed, 220 insertions(+), 220 deletions(-) create mode 100644 sources/prefs/editors/VSBetterEditor.java delete mode 100644 sources/prefs/editors/VSEditorFrame.java (limited to 'sources') diff --git a/sources/prefs/editors/VSBetterEditor.java b/sources/prefs/editors/VSBetterEditor.java new file mode 100644 index 0000000..799436d --- /dev/null +++ b/sources/prefs/editors/VSBetterEditor.java @@ -0,0 +1,217 @@ +package prefs.editors; + +import java.awt.*; +import java.awt.event.*; +import javax.swing.*; +import javax.swing.border.*; +import javax.swing.filechooser.*; +import java.util.*; +import java.io.File; + +import prefs.*; +import simulator.*; +import utils.*; + +public abstract class VSBetterEditor extends VSEditor { + protected VSInfoArea infoArea; + protected VSFrame frame; + + public VSBetterEditor(VSPrefs prefs, Component relativeTo, VSPrefs prefsToEdit, String title) { + super(prefs, prefsToEdit); + frame = new VSFrame(title, relativeTo); + init(); + } + + public VSBetterEditor(VSPrefs prefs, Component relativeTo, VSPrefs prefsToEdit, String title, int prefsCategory) { + super(prefs, prefsToEdit, prefsCategory); + frame = new VSFrame(title, relativeTo); + init(); + } + + private void init() { + frame.setJMenuBar(createJMenuBar()); + frame.setContentPane(createContentPane()); + frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + frame.setSize(prefs.getInteger("window.prefs.xsize"), + prefs.getInteger("window.prefs.ysize")); + frame.setResizable(false); + frame.setVisible(true); + } + + private Container createContentPane() { + Container contentPane = frame.getContentPane(); + + infoArea = new VSInfoArea(); + JPanel editPanel = super.editPanel; + JPanel buttonPanel = createButtonPanel(); + + JScrollPane scrollPane = new JScrollPane(editPanel); + contentPane.add(infoArea, BorderLayout.NORTH); + contentPane.add(scrollPane, BorderLayout.CENTER); + contentPane.add(buttonPanel, BorderLayout.SOUTH); + + return contentPane; + } + + protected void addToEditPanelFront(JPanel editPanel) { } + + protected void addToEditPanelLast(JPanel editPanel) { } + + private JPanel createButtonPanel() { + JPanel buttonPanel = super.buttonPanel; + + JButton cancelButton = new JButton( + prefs.getString("lang.cancel")); + cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel")); + cancelButton.addActionListener(this); + buttonPanel.add(cancelButton); + + return buttonPanel; + } + + private JMenuBar createJMenuBar() { + /* File menu */ + JMenu menuFile = new JMenu( + prefs.getString("lang.file")); + menuFile.setMnemonic(prefs.getInteger("keyevent.file")); + JMenuItem menuItem; + + menuItem = new JMenuItem( + prefs.getString("lang.save")); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.save"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + menuFile.add(menuItem); + + if (!(this instanceof VSSimulationEditor)) + menuItem.setEnabled(false); + + menuItem = new JMenuItem( + prefs.getString("lang.saveas")); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.saveas"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + menuFile.add(menuItem); + + if (!(this instanceof VSSimulationEditor)) + menuItem.setEnabled(false); + + menuItem = new JMenuItem( + prefs.getString("lang.open")); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.open"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + menuFile.add(menuItem); + + if (!(this instanceof VSSimulationEditor)) + menuItem.setEnabled(false); + + menuFile.addSeparator(); + + menuItem = new JMenuItem( + prefs.getString("lang.close")); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.close"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + menuFile.add(menuItem); + + /* Edit menu */ + JMenu menuEdit = new JMenu( + prefs.getString("lang.edit")); + menuEdit.setMnemonic(prefs.getInteger("keyevent.edit")); + + menuItem = new JMenuItem( + prefs.getString("lang.default")); + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.default"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + menuEdit.add(menuItem); + + if (!(this instanceof VSSimulationEditor)) + menuItem.setEnabled(false); + + menuEdit.addSeparator(); + + menuItem = new JMenuItem(prefs.getString("lang.prefs")); + /* + if (super.prefsCategory == ALL_PREFERENCES) { + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.prefs"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + } + */ + menuItem.setEnabled(false); + menuEdit.add(menuItem); + + menuItem = new JMenuItem(prefs.getString("lang.prefs.ext")); + if (super.prefsCategory == SIMULATION_PREFERENCES) { + menuItem.setAccelerator(KeyStroke.getKeyStroke( + prefs.getInteger("keyevent.prefs.ext"), + ActionEvent.ALT_MASK)); + menuItem.addActionListener(this); + } else { + menuItem.setEnabled(false); + } + menuEdit.add(menuItem); + + JMenuBar mainMenuBar = new JMenuBar(); + mainMenuBar.add(menuFile); + mainMenuBar.add(menuEdit); + + return mainMenuBar; + } + + public void actionPerformed(ActionEvent e) { + String actionCommand = e.getActionCommand(); + + if (actionCommand.equals(prefs.getString("lang.close"))) { + frame.dispose(); + + } else if (actionCommand.equals(prefs.getString("lang.saveas"))) { + JFileChooser fileChooser = new JFileChooser(); + int ret = fileChooser.showSaveDialog(frame); + + if (ret == JFileChooser.APPROVE_OPTION) { + File file = fileChooser.getSelectedFile(); + savePrefs(); + prefs.saveFile(file.getName()); + } + + } else if (actionCommand.equals(prefs.getString("lang.open"))) { + JFileChooser fileChooser = new JFileChooser(); + fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); + int ret = fileChooser.showOpenDialog(frame); + + if (ret == JFileChooser.APPROVE_OPTION) { + File file = fileChooser.getSelectedFile(); + prefsToEdit = prefs = VSDefaultPrefs.init(file.getName()); + resetEditPanel(); + } + + } else if (actionCommand.equals(prefs.getString("lang.cancel"))) { + frame.dispose(); + + } else if (actionCommand.equals(prefs.getString("lang.prefs"))) { + newVSEditorInstance(prefs, prefs, VSEditor.SIMULATION_PREFERENCES); + + } else if (actionCommand.equals(prefs.getString("lang.prefs.ext"))) { + newVSEditorInstance(prefs, prefs, VSEditor.ALL_PREFERENCES); + + } else { + /* More action in the super class!!! */ + super.actionPerformed(e); + } + } + + public void newVSEditorInstance(VSPrefs prefs, VSPrefs prefsToEdit, int prefsCategory) { }; + + protected VSFrame getFrame() { + return frame; + } +} diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java deleted file mode 100644 index edaf6b0..0000000 --- a/sources/prefs/editors/VSEditorFrame.java +++ /dev/null @@ -1,217 +0,0 @@ -package prefs.editors; - -import java.awt.*; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.border.*; -import javax.swing.filechooser.*; -import java.util.*; -import java.io.File; - -import prefs.*; -import simulator.*; -import utils.*; - -public abstract class VSEditorFrame extends VSEditor { - protected VSInfoArea infoArea; - protected VSFrame frame; - - public VSEditorFrame(VSPrefs prefs, Component relativeTo, VSPrefs prefsToEdit, String title) { - super(prefs, prefsToEdit); - frame = new VSFrame(title, relativeTo); - init(); - } - - public VSEditorFrame(VSPrefs prefs, Component relativeTo, VSPrefs prefsToEdit, String title, int prefsCategory) { - super(prefs, prefsToEdit, prefsCategory); - frame = new VSFrame(title, relativeTo); - init(); - } - - private void init() { - frame.setJMenuBar(createJMenuBar()); - frame.setContentPane(createContentPane()); - frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); - frame.setSize(prefs.getInteger("window.prefs.xsize"), - prefs.getInteger("window.prefs.ysize")); - frame.setResizable(false); - frame.setVisible(true); - } - - private Container createContentPane() { - Container contentPane = frame.getContentPane(); - - infoArea = new VSInfoArea(); - JPanel editPanel = super.editPanel; - JPanel buttonPanel = createButtonPanel(); - - JScrollPane scrollPane = new JScrollPane(editPanel); - contentPane.add(infoArea, BorderLayout.NORTH); - contentPane.add(scrollPane, BorderLayout.CENTER); - contentPane.add(buttonPanel, BorderLayout.SOUTH); - - return contentPane; - } - - protected void addToEditPanelFront(JPanel editPanel) { } - - protected void addToEditPanelLast(JPanel editPanel) { } - - private JPanel createButtonPanel() { - JPanel buttonPanel = super.buttonPanel; - - JButton cancelButton = new JButton( - prefs.getString("lang.cancel")); - cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel")); - cancelButton.addActionListener(this); - buttonPanel.add(cancelButton); - - return buttonPanel; - } - - private JMenuBar createJMenuBar() { - /* File menu */ - JMenu menuFile = new JMenu( - prefs.getString("lang.file")); - menuFile.setMnemonic(prefs.getInteger("keyevent.file")); - JMenuItem menuItem; - - menuItem = new JMenuItem( - prefs.getString("lang.save")); - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.save"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - menuFile.add(menuItem); - - if (!(this instanceof VSSimulationEditor)) - menuItem.setEnabled(false); - - menuItem = new JMenuItem( - prefs.getString("lang.saveas")); - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.saveas"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - menuFile.add(menuItem); - - if (!(this instanceof VSSimulationEditor)) - menuItem.setEnabled(false); - - menuItem = new JMenuItem( - prefs.getString("lang.open")); - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.open"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - menuFile.add(menuItem); - - if (!(this instanceof VSSimulationEditor)) - menuItem.setEnabled(false); - - menuFile.addSeparator(); - - menuItem = new JMenuItem( - prefs.getString("lang.close")); - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.close"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - menuFile.add(menuItem); - - /* Edit menu */ - JMenu menuEdit = new JMenu( - prefs.getString("lang.edit")); - menuEdit.setMnemonic(prefs.getInteger("keyevent.edit")); - - menuItem = new JMenuItem( - prefs.getString("lang.default")); - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.default"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - menuEdit.add(menuItem); - - if (!(this instanceof VSSimulationEditor)) - menuItem.setEnabled(false); - - menuEdit.addSeparator(); - - menuItem = new JMenuItem(prefs.getString("lang.prefs")); - /* - if (super.prefsCategory == ALL_PREFERENCES) { - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.prefs"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - } - */ - menuItem.setEnabled(false); - menuEdit.add(menuItem); - - menuItem = new JMenuItem(prefs.getString("lang.prefs.ext")); - if (super.prefsCategory == SIMULATION_PREFERENCES) { - menuItem.setAccelerator(KeyStroke.getKeyStroke( - prefs.getInteger("keyevent.prefs.ext"), - ActionEvent.ALT_MASK)); - menuItem.addActionListener(this); - } else { - menuItem.setEnabled(false); - } - menuEdit.add(menuItem); - - JMenuBar mainMenuBar = new JMenuBar(); - mainMenuBar.add(menuFile); - mainMenuBar.add(menuEdit); - - return mainMenuBar; - } - - public void actionPerformed(ActionEvent e) { - String actionCommand = e.getActionCommand(); - - if (actionCommand.equals(prefs.getString("lang.close"))) { - frame.dispose(); - - } else if (actionCommand.equals(prefs.getString("lang.saveas"))) { - JFileChooser fileChooser = new JFileChooser(); - int ret = fileChooser.showSaveDialog(frame); - - if (ret == JFileChooser.APPROVE_OPTION) { - File file = fileChooser.getSelectedFile(); - savePrefs(); - prefs.saveFile(file.getName()); - } - - } else if (actionCommand.equals(prefs.getString("lang.open"))) { - JFileChooser fileChooser = new JFileChooser(); - fileChooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES); - int ret = fileChooser.showOpenDialog(frame); - - if (ret == JFileChooser.APPROVE_OPTION) { - File file = fileChooser.getSelectedFile(); - prefsToEdit = prefs = VSDefaultPrefs.init(file.getName()); - resetEditPanel(); - } - - } else if (actionCommand.equals(prefs.getString("lang.cancel"))) { - frame.dispose(); - - } else if (actionCommand.equals(prefs.getString("lang.prefs"))) { - newVSEditorInstance(prefs, prefs, VSEditor.SIMULATION_PREFERENCES); - - } else if (actionCommand.equals(prefs.getString("lang.prefs.ext"))) { - newVSEditorInstance(prefs, prefs, VSEditor.ALL_PREFERENCES); - - } else { - /* More action in the super class!!! */ - super.actionPerformed(e); - } - } - - public void newVSEditorInstance(VSPrefs prefs, VSPrefs prefsToEdit, int prefsCategory) { }; - - protected VSFrame getFrame() { - return frame; - } -} diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java index 4103624..c26f743 100644 --- a/sources/prefs/editors/VSProcessEditor.java +++ b/sources/prefs/editors/VSProcessEditor.java @@ -16,7 +16,7 @@ import protocols.*; import events.*; import prefs.VSPrefs; -public class VSProcessEditor extends VSEditorFrame { +public class VSProcessEditor extends VSBetterEditor { private VSProcess process; public VSProcessEditor(VSPrefs prefs, Component relativeTo, VSProcess process) { diff --git a/sources/prefs/editors/VSProtocolEditor.java b/sources/prefs/editors/VSProtocolEditor.java index 60d4d0c..f2e6a1a 100644 --- a/sources/prefs/editors/VSProtocolEditor.java +++ b/sources/prefs/editors/VSProtocolEditor.java @@ -14,7 +14,7 @@ import utils.*; import core.*; import prefs.VSPrefs; -public class VSProtocolEditor extends VSEditorFrame { +public class VSProtocolEditor extends VSBetterEditor { private VSProtocol protocol; private JTextField textField; diff --git a/sources/prefs/editors/VSSimulationEditor.java b/sources/prefs/editors/VSSimulationEditor.java index 99b53bf..dd502b2 100644 --- a/sources/prefs/editors/VSSimulationEditor.java +++ b/sources/prefs/editors/VSSimulationEditor.java @@ -12,7 +12,7 @@ import simulator.*; import utils.*; import prefs.VSPrefs; -public class VSSimulationEditor extends VSEditorFrame { +public class VSSimulationEditor extends VSBetterEditor { private boolean startNewSimulation; private VSSimulatorFrame simulatorFrame; -- cgit v1.2.3