diff options
Diffstat (limited to 'sources/editors')
| -rw-r--r-- | sources/editors/VSEditor.java | 6 | ||||
| -rw-r--r-- | sources/editors/VSEditorFrame.java | 8 | ||||
| -rw-r--r-- | sources/editors/VSProcessEditor.java | 10 | ||||
| -rw-r--r-- | sources/editors/VSProtocolEditor.java | 12 | ||||
| -rw-r--r-- | sources/editors/VSSimulationEditor.java | 6 |
5 files changed, 20 insertions, 22 deletions
diff --git a/sources/editors/VSEditor.java b/sources/editors/VSEditor.java index 074bfd4..a81300d 100644 --- a/sources/editors/VSEditor.java +++ b/sources/editors/VSEditor.java @@ -38,14 +38,14 @@ abstract class VSEditor implements ActionListener { protected Insets insets = new Insets(0, 0, 0, 0); public VSEditor(VSPrefs prefs, VSPrefs prefsToEdit) { - initialize(prefs, prefsToEdit, SIMULATION_PREFERENCES); + init(prefs, prefsToEdit, SIMULATION_PREFERENCES); } public VSEditor(VSPrefs prefs, VSPrefs prefsToEdit, int prefsCategory) { - initialize(prefs, prefsToEdit, prefsCategory); + init(prefs, prefsToEdit, prefsCategory); } - private void initialize(VSPrefs prefs, VSPrefs prefsToEdit, int prefsCategory) { + private void init(VSPrefs prefs, VSPrefs prefsToEdit, int prefsCategory) { this.prefs = prefs; this.prefsToEdit = prefsToEdit; this.prefsCategory = prefsCategory; diff --git a/sources/editors/VSEditorFrame.java b/sources/editors/VSEditorFrame.java index b9c14c6..1276e5b 100644 --- a/sources/editors/VSEditorFrame.java +++ b/sources/editors/VSEditorFrame.java @@ -19,16 +19,16 @@ public abstract class VSEditorFrame extends VSEditor { public VSEditorFrame(VSPrefs prefs, Component relativeTo, VSPrefs prefsToEdit, String title) { super(prefs, prefsToEdit); frame = new VSFrame(title, relativeTo); - initialize(); + init(); } public VSEditorFrame(VSPrefs prefs, Component relativeTo, VSPrefs prefsToEdit, String title, int prefsCategory) { super(prefs, prefsToEdit, prefsCategory); frame = new VSFrame(title, relativeTo); - initialize(); + init(); } - private void initialize() { + private void init() { frame.setJMenuBar(createJMenuBar()); frame.setContentPane(createContentPane()); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); @@ -198,7 +198,7 @@ public abstract class VSEditorFrame extends VSEditor { if (ret == JFileChooser.APPROVE_OPTION) { File file = fileChooser.getSelectedFile(); - prefsToEdit = prefs = VSDefaultPrefs.initialize(file.getName()); + prefsToEdit = prefs = VSDefaultPrefs.init(file.getName()); resetEditPanel(); } diff --git a/sources/editors/VSProcessEditor.java b/sources/editors/VSProcessEditor.java index ecd495d..158295a 100644 --- a/sources/editors/VSProcessEditor.java +++ b/sources/editors/VSProcessEditor.java @@ -24,7 +24,7 @@ public class VSProcessEditor extends VSEditorFrame { this.process = process; - initialize(); + init(); } public VSProcessEditor(VSPrefs prefs, Component relativeTo, VSProcess process, int prefsCategory) { @@ -35,10 +35,10 @@ public class VSProcessEditor extends VSEditorFrame { this.process = process; - initialize(); + init(); } - private void initialize() { + private void init() { super.infoArea.setText(prefs.getString("lang.prefs.process.info!")); getFrame().disposeWithParent(); createButtonPanel(); @@ -92,10 +92,8 @@ public class VSProcessEditor extends VSEditorFrame { else return; } else { - protocol = RegisteredProtocols.getProtocolInstanceByName(protocolName); + protocol = RegisteredProtocols.getProtocolInstanceByName(protocolName, process); process.setObject(protocolClassname, protocol); - protocol.setProcess(process); - protocol.setVSPrefs(prefs); } new VSProtocolEditor(prefs, frame, protocol); } diff --git a/sources/editors/VSProtocolEditor.java b/sources/editors/VSProtocolEditor.java index b347498..7a0961c 100644 --- a/sources/editors/VSProtocolEditor.java +++ b/sources/editors/VSProtocolEditor.java @@ -32,14 +32,14 @@ public class VSProtocolEditor extends VSEditorFrame { this.protocol = protocol; this.taskManager = protocol.getProcess().getSimulationPanel().getTaskManager(); - initialize(); + init(); } - private void initialize() { + private void init() { super.getFrame().disposeWithParent(); super.infoArea.setText(prefs.getString("lang.prefs.protocol.info!")); - initializeTaskManagerEditor(clientTaskManagerEditorPanel); - initlializeClientServerCheckboxes(); + initTaskManagerEditor(clientTaskManagerEditorPanel); + initClientServerCheckboxes(); createButtonPanel(); } @@ -129,7 +129,7 @@ public class VSProtocolEditor extends VSEditorFrame { return panel; } - private void initlializeClientServerCheckboxes() { + private void initClientServerCheckboxes() { final String protocolName = protocol.getProtocolName(); final VSProcess process = protocol.getProcess(); @@ -140,7 +140,7 @@ public class VSProtocolEditor extends VSEditorFrame { } - private void initializeTaskManagerEditor(JPanel panel) { + private void initTaskManagerEditor(JPanel panel) { clientComboBox = new JComboBox(); deleteButton = new JButton(prefs.getString("lang.remove")); takeOverButton = new JButton(prefs.getString("lang.takeover")); diff --git a/sources/editors/VSSimulationEditor.java b/sources/editors/VSSimulationEditor.java index c455d64..31d40d8 100644 --- a/sources/editors/VSSimulationEditor.java +++ b/sources/editors/VSSimulationEditor.java @@ -20,7 +20,7 @@ public class VSSimulationEditor extends VSEditorFrame { + " - " + prefs.getString("lang.prefs")); startNewVSSimulation = true; - initialize(); + init(); } public VSSimulationEditor(VSPrefs prefs, Component relativeTo, int prefsCategory) { @@ -30,10 +30,10 @@ public class VSSimulationEditor extends VSEditorFrame { prefsCategory); startNewVSSimulation = false; - initialize(); + init(); } - private void initialize() { + private void init() { super.infoArea.setText(prefs.getString("lang.prefs.info!")); } |