summaryrefslogtreecommitdiff
path: root/sources/prefs/editors
diff options
context:
space:
mode:
Diffstat (limited to 'sources/prefs/editors')
-rw-r--r--sources/prefs/editors/VSAbstractEditor.java28
-rw-r--r--sources/prefs/editors/VSColorChooser.java2
-rw-r--r--sources/prefs/editors/VSEditorFrame.java8
-rw-r--r--sources/prefs/editors/VSEditorTable.java4
-rw-r--r--sources/prefs/editors/VSProcessEditor.java16
-rw-r--r--sources/prefs/editors/VSSimulatorEditor.java16
6 files changed, 37 insertions, 37 deletions
diff --git a/sources/prefs/editors/VSAbstractEditor.java b/sources/prefs/editors/VSAbstractEditor.java
index e849a50..266b62c 100644
--- a/sources/prefs/editors/VSAbstractEditor.java
+++ b/sources/prefs/editors/VSAbstractEditor.java
@@ -244,7 +244,7 @@ public abstract class VSAbstractEditor implements ActionListener {
boolean expertMode = prefs.getBoolean("sim.mode.expert");
for (String elem : set) {
- if (!elem.startsWith("lang.en.") && !elem.startsWith("keyevent.")) {
+ if (!elem.startsWith("lang.") && !elem.startsWith("keyevent.")) {
if (expertMode)
filtered.add(elem);
else if (!elem.startsWith("col.") && (!elem.startsWith("div.")))
@@ -266,7 +266,7 @@ public abstract class VSAbstractEditor implements ActionListener {
addToButtonPanelFront(buttonPanel);
JButton resetButton = new JButton(
- prefs.getString("lang.en.reset"));
+ prefs.getString("lang.reset"));
resetButton.setMnemonic(prefs.getInteger("keyevent.reset"));
resetButton.addActionListener(this);
buttonPanel.add(resetButton);
@@ -401,7 +401,7 @@ public abstract class VSAbstractEditor implements ActionListener {
*/
protected VS3Tupel<String,Component,JCheckBox> createBooleanComponent(
String fullKey, String key, VSPrefs prefsToEdit) {
- final String activated = prefs.getString("lang.en.activated");
+ final String activated = prefs.getString("lang.activated");
String descr = prefs.getDescription(fullKey);
if (descr == null)
descr = prefsToEdit.getDescription(fullKey);
@@ -499,9 +499,9 @@ public abstract class VSAbstractEditor implements ActionListener {
public void mouseClicked(MouseEvent e) {
JFrame parentFrame = getFrame();
JFrame frame = new VSFrame(
- prefs.getString("lang.en.name") + " - " +
+ prefs.getString("lang.name") + " - " +
prefs.getString(
- "lang.en.colorchooser"),parentFrame);
+ "lang.colorchooser"),parentFrame);
frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
JComponent colorChooserPane = new VSColorChooser(prefs,
@@ -639,7 +639,7 @@ public abstract class VSAbstractEditor implements ActionListener {
if (key.startsWith("sim.")) {
if (!flag) {
flag = true;
- addSeparator(prefs.getString("lang.en.prefs.simulator"));
+ addSeparator(prefs.getString("lang.prefs.simulator"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -653,10 +653,10 @@ public abstract class VSAbstractEditor implements ActionListener {
if (!flag) {
flag = true;
if (this instanceof VSProcessEditor)
- addSeparator(prefs.getString("lang.en.prefs.process"));
+ addSeparator(prefs.getString("lang.prefs.process"));
else
addSeparator(prefs.getString(
- "lang.en.prefs.process.defaults"));
+ "lang.prefs.process.defaults"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -671,10 +671,10 @@ public abstract class VSAbstractEditor implements ActionListener {
flag = true;
if (this instanceof VSProcessEditor)
addSeparator(prefs.getString(
- "lang.en.prefs.message"));
+ "lang.prefs.message"));
else
addSeparator(prefs.getString(
- "lang.en.prefs.message.defaults"));
+ "lang.prefs.message.defaults"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -687,7 +687,7 @@ public abstract class VSAbstractEditor implements ActionListener {
if (key.startsWith("col.")) {
if (!flag) {
flag = true;
- addSeparator(prefs.getString("lang.en.prefs.color"));
+ addSeparator(prefs.getString("lang.prefs.color"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -700,7 +700,7 @@ public abstract class VSAbstractEditor implements ActionListener {
if (key.startsWith("div.")) {
if (!flag) {
flag = true;
- addSeparator(prefs.getString("lang.en.prefs.diverse"));
+ addSeparator(prefs.getString("lang.prefs.diverse"));
}
addVariable(labels.get(fullKey), components.get(fullKey),
prefsToEdit);
@@ -1019,10 +1019,10 @@ public abstract class VSAbstractEditor implements ActionListener {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+ if (actionCommand.equals(prefs.getString("lang.takeover"))) {
savePrefs();
- } else if (actionCommand.equals(prefs.getString("lang.en.reset"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.reset"))) {
resetPrefs();
}
}
diff --git a/sources/prefs/editors/VSColorChooser.java b/sources/prefs/editors/VSColorChooser.java
index 4f53fb4..ac67ace 100644
--- a/sources/prefs/editors/VSColorChooser.java
+++ b/sources/prefs/editors/VSColorChooser.java
@@ -45,7 +45,7 @@ public class VSColorChooser extends JPanel implements ChangeListener {
colorChooser.setColor(color);
colorChooser.getSelectionModel().addChangeListener(this);
colorChooser.setBorder(BorderFactory.createTitledBorder(
- prefs.getString("lang.en.colorchooser2")));
+ prefs.getString("lang.colorchooser2")));
add(colorChooser, BorderLayout.CENTER);
}
diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java
index 650a619..e418801 100644
--- a/sources/prefs/editors/VSEditorFrame.java
+++ b/sources/prefs/editors/VSEditorFrame.java
@@ -63,13 +63,13 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
*/
private void fillButtonPanel(JPanel buttonPanel) {
JButton okButton = new JButton(
- prefs.getString("lang.en.ok"));
+ prefs.getString("lang.ok"));
okButton.setMnemonic(prefs.getInteger("keyevent.ok"));
okButton.addActionListener(this);
buttonPanel.add(okButton, 0);
JButton cancelButton = new JButton(
- prefs.getString("lang.en.cancel"));
+ prefs.getString("lang.cancel"));
cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel"));
cancelButton.addActionListener(this);
buttonPanel.add(cancelButton, 1);
@@ -83,11 +83,11 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+ if (actionCommand.equals(prefs.getString("lang.ok"))) {
editor.actionPerformed(e);
dispose();
- } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
editor.actionPerformed(e);
dispose();
diff --git a/sources/prefs/editors/VSEditorTable.java b/sources/prefs/editors/VSEditorTable.java
index 30ae30c..7be0dbf 100644
--- a/sources/prefs/editors/VSEditorTable.java
+++ b/sources/prefs/editors/VSEditorTable.java
@@ -105,7 +105,7 @@ public class VSEditorTable extends JTable {
* The class VSEditorTableModel, it is the model of a VSEditorTable.
*/
private class VSEditorTableModel extends AbstractTableModel
- implements TableCellRenderer {
+ implements TableCellRenderer {
/** The serial version uid */
private static final long serialVersionUID = 1L;
@@ -213,7 +213,7 @@ public class VSEditorTable extends JTable {
* The class VSTableCellEditor, is the editor of the VSEditorTable
*/
private class VSTableCellEditor extends AbstractCellEditor
- implements TableCellEditor {
+ implements TableCellEditor {
/** The serial version uid */
private static final long serialVersionUID = 1L;
diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java
index 8035085..105152e 100644
--- a/sources/prefs/editors/VSProcessEditor.java
+++ b/sources/prefs/editors/VSProcessEditor.java
@@ -30,8 +30,8 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
* @param process the process
*/
public VSProcessEditor(VSPrefs prefs, VSInternalProcess process) {
- super(prefs, process, prefs.getString("lang.en.name") + " - " +
- prefs.getString("lang.en.prefs.process"));;
+ super(prefs, process, prefs.getString("lang.name") + " - " +
+ prefs.getString("lang.prefs.process"));;
this.process = process;
disposeFrameWithParentIfExists();
makeProtocolVariablesEditable();
@@ -43,7 +43,7 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
*/
protected void addToButtonPanelFront(JPanel buttonPanel) {
JButton takeoverButton = new JButton(
- prefs.getString("lang.en.takeover"));
+ prefs.getString("lang.takeover"));
takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
takeoverButton.addActionListener(this);
buttonPanel.add(takeoverButton);
@@ -56,9 +56,9 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
ArrayList<String> editableProtocolsClassnames =
VSRegisteredEvents.getEditableProtocolsClassnames();
- //String protocolString = " " + prefs.getString("lang.en.protocol");
- String clientString = " " + prefs.getString("lang.en.client");
- String serverString = " " + prefs.getString("lang.en.server");
+ //String protocolString = " " + prefs.getString("lang.protocol");
+ String clientString = " " + prefs.getString("lang.client");
+ String serverString = " " + prefs.getString("lang.server");
for (String protocolClassname : editableProtocolsClassnames) {
String protocolShortname =
@@ -92,11 +92,11 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+ if (actionCommand.equals(prefs.getString("lang.ok"))) {
savePrefs();
process.updateFromPrefs();
- } else if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.takeover"))) {
savePrefs();
process.updateFromPrefs();
diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java
index 53eea0a..9ee0e58 100644
--- a/sources/prefs/editors/VSSimulatorEditor.java
+++ b/sources/prefs/editors/VSSimulatorEditor.java
@@ -45,8 +45,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
*/
public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
VSSimulator simulator) {
- super(prefs, prefs, prefs.getString("lang.en.name")
- + " - " + prefs.getString("lang.en.prefs"));
+ super(prefs, prefs, prefs.getString("lang.name")
+ + " - " + prefs.getString("lang.prefs"));
this.dontStartNewSimulator = true;//simulator != null;
this.simulatorFrame = simulatorFrame;
this.simulator = simulator;
@@ -60,8 +60,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
*/
public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
boolean openedNewWindow) {
- super(prefs, prefs, prefs.getString("lang.en.name")
- + " - " + prefs.getString("lang.en.prefs"));
+ super(prefs, prefs, prefs.getString("lang.name")
+ + " - " + prefs.getString("lang.prefs"));
this.simulatorFrame = simulatorFrame;
this.openedNewWindow = openedNewWindow;
}
@@ -74,7 +74,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
if (TAKEOVER_BUTTON) {
TAKEOVER_BUTTON = false;
JButton takeoverButton = new JButton(
- prefs.getString("lang.en.takeover"));
+ prefs.getString("lang.takeover"));
takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
takeoverButton.addActionListener(this);
buttonPanel.add(takeoverButton);
@@ -88,7 +88,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
public void actionPerformed(ActionEvent e) {
String actionCommand = e.getActionCommand();
- if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+ if (actionCommand.equals(prefs.getString("lang.takeover"))) {
savePrefs();
if (simulator != null) {
@@ -97,11 +97,11 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
simulator.updateFromPrefs();
}
- } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
if (!dontStartNewSimulator && openedNewWindow)
simulatorFrame.dispose();
- } else if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+ } else if (actionCommand.equals(prefs.getString("lang.ok"))) {
savePrefs();
if (expertModeChanged()) {
if (simulator != null)