From ff0c70b54edbbe3436583d6491d4a56d96302de5 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sat, 17 Jan 2009 14:29:28 +0000 Subject: added initial multiple langua support. --- sources/prefs/editors/VSAbstractBetterEditor.java | 14 ------ sources/prefs/editors/VSAbstractEditor.java | 56 ++++++++++++++--------- sources/prefs/editors/VSColorChooser.java | 2 +- sources/prefs/editors/VSEditorFrame.java | 8 ++-- sources/prefs/editors/VSProcessEditor.java | 16 +++---- sources/prefs/editors/VSSimulatorEditor.java | 16 +++---- 6 files changed, 56 insertions(+), 56 deletions(-) (limited to 'sources/prefs/editors') diff --git a/sources/prefs/editors/VSAbstractBetterEditor.java b/sources/prefs/editors/VSAbstractBetterEditor.java index 9df7f78..556b14a 100644 --- a/sources/prefs/editors/VSAbstractBetterEditor.java +++ b/sources/prefs/editors/VSAbstractBetterEditor.java @@ -28,7 +28,6 @@ import java.awt.event.*; import javax.swing.*; import prefs.*; -//import utils.*; /** * The class VSAbstractBetterEditor, is an improved VSAbstractEditor. @@ -43,7 +42,6 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor { private Container contentPane; /** The info area. */ - //private VSInfoArea infoArea; /** The title. */ private String title; @@ -90,13 +88,10 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor { JPanel panel = new JPanel(); panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); - //infoArea = new VSInfoArea(); JPanel editPanel = getEditPanel(); JPanel buttonPanel = getButtonPanel(); - //JScrollPane scrollPane = new JScrollPane(editPanel); panel.add(editPanel); - //panel.add(infoArea); panel.add(buttonPanel); return panel; @@ -128,13 +123,4 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor { /* More action in the super class!!! */ super.actionPerformed(e); } - - /** - * Gets the info area. - * - * @return the info area - */ - //protected VSInfoArea getInfoArea() { - // return infoArea; - //} } diff --git a/sources/prefs/editors/VSAbstractEditor.java b/sources/prefs/editors/VSAbstractEditor.java index 8f03ba4..6118c7e 100644 --- a/sources/prefs/editors/VSAbstractEditor.java +++ b/sources/prefs/editors/VSAbstractEditor.java @@ -249,7 +249,7 @@ public abstract class VSAbstractEditor implements ActionListener { boolean expertMode = prefs.getBoolean("sim.mode.expert"); for (String elem : set) { - if (!elem.startsWith("lang.") && !elem.startsWith("keyevent.")) { + if (!elem.startsWith("lang.en.") && !elem.startsWith("keyevent.")) { if (expertMode) filtered.add(elem); else if (!elem.startsWith("col.") && (!elem.startsWith("div."))) @@ -271,7 +271,7 @@ public abstract class VSAbstractEditor implements ActionListener { addToButtonPanelFront(buttonPanel); JButton resetButton = new JButton( - prefs.getString("lang.reset")); + prefs.getString("lang.en.reset")); resetButton.setMnemonic(prefs.getInteger("keyevent.reset")); resetButton.addActionListener(this); buttonPanel.add(resetButton); @@ -339,7 +339,9 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createIntegerComponent( String fullKey, String key, VSPrefs prefsToEdit) { - String descr = prefsToEdit.getDescription(fullKey); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; Integer integer = prefsToEdit.getInteger(key); Integer initialSelection[] = { integer }; @@ -381,7 +383,9 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createVectorComponent( String fullKey, String key, VSPrefs prefsToEdit) { - String descr = prefsToEdit.getDescription(fullKey); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; Vector vec = prefsToEdit.getVector(key); @@ -402,8 +406,10 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createBooleanComponent( String fullKey, String key, VSPrefs prefsToEdit) { - final String activated = prefs.getString("lang.activated"); - String descr = prefsToEdit.getDescription(fullKey); + final String activated = prefs.getString("lang.en.activated"); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; JCheckBox valField = new JCheckBox(activated, prefsToEdit.getBoolean(key)); @@ -424,7 +430,9 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createLongComponent( String fullKey, String key, VSPrefs prefsToEdit) { - String descr = prefsToEdit.getDescription(fullKey); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; JTextField valField = new JTextField(VALUE_FIELD_COLS); valField.addKeyListener(new java.awt.event.KeyAdapter() { @@ -451,7 +459,9 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createFloatComponent( String fullKey, String key, VSPrefs prefsToEdit) { - String descr = prefsToEdit.getDescription(fullKey); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; JTextField valField = new JTextField(VALUE_FIELD_COLS); valField.addKeyListener(new java.awt.event.KeyAdapter() { @@ -478,7 +488,9 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createColorComponent( String fullKey, String key, final VSPrefs prefsToEdit) { - String descr = prefsToEdit.getDescription(fullKey); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; final JTextField valField = new JTextField(VALUE_FIELD_COLS); Color color = prefsToEdit.getColor(key); @@ -492,9 +504,9 @@ public abstract class VSAbstractEditor implements ActionListener { public void mouseClicked(MouseEvent e) { JFrame parentFrame = getFrame(); JFrame frame = new VSFrame( - prefs.getString("lang.name") + " - " + + prefs.getString("lang.en.name") + " - " + prefs.getString( - "lang.colorchooser"),parentFrame); + "lang.en.colorchooser"),parentFrame); frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); JComponent colorChooserPane = new VSColorChooser(prefs, @@ -522,7 +534,9 @@ public abstract class VSAbstractEditor implements ActionListener { */ protected VS3Tupel createStringComponent( String fullKey, String key, VSPrefs prefsToEdit) { - String descr = prefsToEdit.getDescription(fullKey); + String descr = prefs.getDescription(fullKey); + if (descr == null) + descr = prefsToEdit.getDescription(fullKey); String label = descr == null ? fullKey : descr; JTextField valField = new JTextField(VALUE_FIELD_COLS); valField.addKeyListener(new java.awt.event.KeyAdapter() { @@ -630,7 +644,7 @@ public abstract class VSAbstractEditor implements ActionListener { if (key.startsWith("sim.")) { if (!flag) { flag = true; - addSeparator(prefs.getString("lang.prefs.simulator")); + addSeparator(prefs.getString("lang.en.prefs.simulator")); } addVariable(labels.get(fullKey), components.get(fullKey), prefsToEdit); @@ -644,10 +658,10 @@ public abstract class VSAbstractEditor implements ActionListener { if (!flag) { flag = true; if (this instanceof VSProcessEditor) - addSeparator(prefs.getString("lang.prefs.process")); + addSeparator(prefs.getString("lang.en.prefs.process")); else addSeparator(prefs.getString( - "lang.prefs.process.defaults")); + "lang.en.prefs.process.defaults")); } addVariable(labels.get(fullKey), components.get(fullKey), prefsToEdit); @@ -662,10 +676,10 @@ public abstract class VSAbstractEditor implements ActionListener { flag = true; if (this instanceof VSProcessEditor) addSeparator(prefs.getString( - "lang.prefs.message")); + "lang.en.prefs.message")); else addSeparator(prefs.getString( - "lang.prefs.message.defaults")); + "lang.en.prefs.message.defaults")); } addVariable(labels.get(fullKey), components.get(fullKey), prefsToEdit); @@ -678,7 +692,7 @@ public abstract class VSAbstractEditor implements ActionListener { if (key.startsWith("col.")) { if (!flag) { flag = true; - addSeparator(prefs.getString("lang.prefs.color")); + addSeparator(prefs.getString("lang.en.prefs.color")); } addVariable(labels.get(fullKey), components.get(fullKey), prefsToEdit); @@ -691,7 +705,7 @@ public abstract class VSAbstractEditor implements ActionListener { if (key.startsWith("div.")) { if (!flag) { flag = true; - addSeparator(prefs.getString("lang.prefs.diverse")); + addSeparator(prefs.getString("lang.en.prefs.diverse")); } addVariable(labels.get(fullKey), components.get(fullKey), prefsToEdit); @@ -1010,10 +1024,10 @@ public abstract class VSAbstractEditor implements ActionListener { public void actionPerformed(ActionEvent e) { String actionCommand = e.getActionCommand(); - if (actionCommand.equals(prefs.getString("lang.takeover"))) { + if (actionCommand.equals(prefs.getString("lang.en.takeover"))) { savePrefs(); - } else if (actionCommand.equals(prefs.getString("lang.reset"))) { + } else if (actionCommand.equals(prefs.getString("lang.en.reset"))) { resetPrefs(); } } diff --git a/sources/prefs/editors/VSColorChooser.java b/sources/prefs/editors/VSColorChooser.java index 96aaf53..619bc17 100644 --- a/sources/prefs/editors/VSColorChooser.java +++ b/sources/prefs/editors/VSColorChooser.java @@ -62,7 +62,7 @@ public class VSColorChooser extends JPanel implements ChangeListener { colorChooser.setColor(color); colorChooser.getSelectionModel().addChangeListener(this); colorChooser.setBorder(BorderFactory.createTitledBorder( - prefs.getString("lang.colorchooser2"))); + prefs.getString("lang.en.colorchooser2"))); add(colorChooser, BorderLayout.CENTER); } diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java index 332c8a5..855bf0a 100644 --- a/sources/prefs/editors/VSEditorFrame.java +++ b/sources/prefs/editors/VSEditorFrame.java @@ -82,13 +82,13 @@ public class VSEditorFrame extends VSFrame implements ActionListener { */ private void fillButtonPanel(JPanel buttonPanel) { JButton okButton = new JButton( - prefs.getString("lang.ok")); + prefs.getString("lang.en.ok")); okButton.setMnemonic(prefs.getInteger("keyevent.ok")); okButton.addActionListener(this); buttonPanel.add(okButton, 0); JButton cancelButton = new JButton( - prefs.getString("lang.cancel")); + prefs.getString("lang.en.cancel")); cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel")); cancelButton.addActionListener(this); buttonPanel.add(cancelButton, 1); @@ -102,11 +102,11 @@ public class VSEditorFrame extends VSFrame implements ActionListener { public void actionPerformed(ActionEvent e) { String actionCommand = e.getActionCommand(); - if (actionCommand.equals(prefs.getString("lang.ok"))) { + if (actionCommand.equals(prefs.getString("lang.en.ok"))) { editor.actionPerformed(e); dispose(); - } else if (actionCommand.equals(prefs.getString("lang.cancel"))) { + } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) { editor.actionPerformed(e); dispose(); diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java index ae2a61f..eaacc7b 100644 --- a/sources/prefs/editors/VSProcessEditor.java +++ b/sources/prefs/editors/VSProcessEditor.java @@ -54,8 +54,8 @@ public class VSProcessEditor extends VSAbstractBetterEditor { * @param process the process */ public VSProcessEditor(VSPrefs prefs, VSInternalProcess process) { - super(prefs, process, prefs.getString("lang.name") + " - " + - prefs.getString("lang.prefs.process"));; + super(prefs, process, prefs.getString("lang.en.name") + " - " + + prefs.getString("lang.en.prefs.process"));; this.process = process; disposeFrameWithParentIfExists(); makeProtocolVariablesEditable(); @@ -67,7 +67,7 @@ public class VSProcessEditor extends VSAbstractBetterEditor { */ protected void addToButtonPanelFront(JPanel buttonPanel) { JButton takeoverButton = new JButton( - prefs.getString("lang.takeover")); + prefs.getString("lang.en.takeover")); takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover")); takeoverButton.addActionListener(this); buttonPanel.add(takeoverButton); @@ -80,9 +80,9 @@ public class VSProcessEditor extends VSAbstractBetterEditor { ArrayList editableProtocolsClassnames = VSRegisteredEvents.getEditableProtocolsClassnames(); - //String protocolString = " " + prefs.getString("lang.protocol"); - String clientString = " " + prefs.getString("lang.client"); - String serverString = " " + prefs.getString("lang.server"); + //String protocolString = " " + prefs.getString("lang.en.protocol"); + String clientString = " " + prefs.getString("lang.en.client"); + String serverString = " " + prefs.getString("lang.en.server"); for (String protocolClassname : editableProtocolsClassnames) { String protocolShortname = @@ -116,11 +116,11 @@ public class VSProcessEditor extends VSAbstractBetterEditor { public void actionPerformed(ActionEvent e) { String actionCommand = e.getActionCommand(); - if (actionCommand.equals(prefs.getString("lang.ok"))) { + if (actionCommand.equals(prefs.getString("lang.en.ok"))) { savePrefs(); process.updateFromPrefs(); - } else if (actionCommand.equals(prefs.getString("lang.takeover"))) { + } else if (actionCommand.equals(prefs.getString("lang.en.takeover"))) { savePrefs(); process.updateFromPrefs(); diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java index d900692..edd9cd5 100644 --- a/sources/prefs/editors/VSSimulatorEditor.java +++ b/sources/prefs/editors/VSSimulatorEditor.java @@ -68,8 +68,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor { */ public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame, VSSimulator simulator) { - super(prefs, prefs, prefs.getString("lang.name") - + " - " + prefs.getString("lang.prefs")); + super(prefs, prefs, prefs.getString("lang.en.name") + + " - " + prefs.getString("lang.en.prefs")); this.dontStartNewSimulator = true;//simulator != null; this.simulatorFrame = simulatorFrame; this.simulator = simulator; @@ -83,8 +83,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor { */ public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame, boolean openedNewWindow) { - super(prefs, prefs, prefs.getString("lang.name") - + " - " + prefs.getString("lang.prefs")); + super(prefs, prefs, prefs.getString("lang.en.name") + + " - " + prefs.getString("lang.en.prefs")); this.simulatorFrame = simulatorFrame; this.openedNewWindow = openedNewWindow; } @@ -97,7 +97,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor { if (TAKEOVER_BUTTON) { TAKEOVER_BUTTON = false; JButton takeoverButton = new JButton( - prefs.getString("lang.takeover")); + prefs.getString("lang.en.takeover")); takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover")); takeoverButton.addActionListener(this); buttonPanel.add(takeoverButton); @@ -111,7 +111,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor { public void actionPerformed(ActionEvent e) { String actionCommand = e.getActionCommand(); - if (actionCommand.equals(prefs.getString("lang.takeover"))) { + if (actionCommand.equals(prefs.getString("lang.en.takeover"))) { savePrefs(); if (simulator != null) { @@ -120,11 +120,11 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor { simulator.updateFromPrefs(); } - } else if (actionCommand.equals(prefs.getString("lang.cancel"))) { + } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) { if (!dontStartNewSimulator && openedNewWindow) simulatorFrame.dispose(); - } else if (actionCommand.equals(prefs.getString("lang.ok"))) { + } else if (actionCommand.equals(prefs.getString("lang.en.ok"))) { savePrefs(); if (expertModeChanged()) { if (simulator != null) -- cgit v1.2.3