diff options
Diffstat (limited to 'sources/simulator')
| -rw-r--r-- | sources/simulator/VSMain.java | 4 | ||||
| -rw-r--r-- | sources/simulator/VSSimulator.java | 76 | ||||
| -rw-r--r-- | sources/simulator/VSSimulatorFrame.java | 74 | ||||
| -rw-r--r-- | sources/simulator/VSSimulatorVisualization.java | 40 |
4 files changed, 99 insertions, 95 deletions
diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java index 661084c..70b112e 100644 --- a/sources/simulator/VSMain.java +++ b/sources/simulator/VSMain.java @@ -41,6 +41,9 @@ public class VSMain { /** The serial version uid */ private static final long serialVersionUID = 1L; + /** The global preferences */ + public static VSPrefs prefs; + /** * Instantiates a new VSMain object. * @@ -68,6 +71,7 @@ public class VSMain { */ private void init(VSPrefs prefs, Component relativeTo) { //VSSimulatorFrame simulatorFrame = + VSMain.prefs = prefs; new VSSimulatorFrame(prefs, relativeTo); } diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java index 02a8741..779de07 100644 --- a/sources/simulator/VSSimulator.java +++ b/sources/simulator/VSSimulator.java @@ -217,9 +217,9 @@ public class VSSimulator extends JPanel implements VSSerializable { tasks = new ArrayList<VSTask>(); set(process, localTask, ONE_PROCESS); columnNames = new String[3]; - columnNames[0]= prefs.getString("lang.time") + " (ms)"; - columnNames[1] = prefs.getString("lang.process.id"); - columnNames[2] = prefs.getString("lang.event"); + columnNames[0]= prefs.getString("lang.en.time") + " (ms)"; + columnNames[1] = prefs.getString("lang.en.process.id"); + columnNames[2] = prefs.getString("lang.en.event"); numColumns = 3; } @@ -420,23 +420,23 @@ public class VSSimulator extends JPanel implements VSSerializable { String command = ae.getActionCommand(); int rows[] = source.getSelectedRows(); - if (command.equals(prefs.getString("lang.remove"))) { + if (command.equals(prefs.getString("lang.en.remove"))) { for (int i = rows.length - 1; i >= 0; --i) removeTaskAtRow(rows[i]); } else if (command.equals( - prefs.getString("lang.copy"))) { + prefs.getString("lang.en.copy"))) { copyTasksAtRows(rows); } } }; JPopupMenu popup = new JPopupMenu(); - JMenuItem item = new JMenuItem(prefs.getString("lang.remove")); + JMenuItem item = new JMenuItem(prefs.getString("lang.en.remove")); item.addActionListener(actionListener); popup.add(item); - item = new JMenuItem(prefs.getString("lang.copy")); + item = new JMenuItem(prefs.getString("lang.en.copy")); item.addActionListener(actionListener); popup.add(item); @@ -617,7 +617,7 @@ public class VSSimulator extends JPanel implements VSSerializable { if (this.loging == null) this.loging = new VSLogging(); - loging.log(prefs.getString("lang.simulator.new")); + loging.log(prefs.getString("lang.en.simulator.new")); fillContentPane(); updateFromPrefs(); @@ -698,7 +698,7 @@ public class VSSimulator extends JPanel implements VSSerializable { toolsPanel.setLayout(new BoxLayout(toolsPanel, BoxLayout.X_AXIS)); JCheckBox expertActiveCheckBox = - new JCheckBox(prefs.getString("lang.mode.expert")); + new JCheckBox(prefs.getString("lang.en.mode.expert")); expertActiveCheckBox.setSelected(expertMode); expertActiveCheckBox.addChangeListener(new ChangeListener() { @@ -718,7 +718,7 @@ public class VSSimulator extends JPanel implements VSSerializable { if (expertMode) { lamportActiveCheckBox = new JCheckBox( - prefs.getString("lang.time.lamport")); + prefs.getString("lang.en.time.lamport")); lamportActiveCheckBox.setSelected(false); lamportActiveCheckBox.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent ce) { @@ -734,7 +734,7 @@ public class VSSimulator extends JPanel implements VSSerializable { toolsPanel.add(lamportActiveCheckBox); vectorTimeActiveCheckBox = new JCheckBox( - prefs.getString("lang.time.vector")); + prefs.getString("lang.en.time.vector")); vectorTimeActiveCheckBox.setSelected(false); vectorTimeActiveCheckBox.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent ce) { @@ -750,7 +750,7 @@ public class VSSimulator extends JPanel implements VSSerializable { toolsPanel.add(vectorTimeActiveCheckBox); JCheckBox antiAliasing = new JCheckBox( - prefs.getString("lang.antialiasing")); + prefs.getString("lang.en.antialiasing")); antiAliasing.setSelected(false); antiAliasing.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent ce) { @@ -765,7 +765,7 @@ public class VSSimulator extends JPanel implements VSSerializable { } JCheckBox logingActiveCheckBox = new JCheckBox( - prefs.getString("lang.loging.active")); + prefs.getString("lang.en.loging.active")); logingActiveCheckBox.setSelected(true); logingActiveCheckBox.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent ce) { @@ -779,7 +779,7 @@ public class VSSimulator extends JPanel implements VSSerializable { if (expertMode) { filterActiveCheckBox = new JCheckBox( - prefs.getString("lang.filter")); + prefs.getString("lang.en.filter")); filterActiveCheckBox.setSelected(false); filterActiveCheckBox.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent ce) { @@ -809,12 +809,12 @@ public class VSSimulator extends JPanel implements VSSerializable { toolsPanel.add(filterTextField); JButton clearButton = new JButton( - prefs.getString("lang.loging.clear")); + prefs.getString("lang.en.loging.clear")); clearButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) { String command = ae.getActionCommand(); if (command.equals( - prefs.getString("lang.loging.clear"))) { + prefs.getString("lang.en.loging.clear"))) { loging.clear(); } } @@ -841,7 +841,7 @@ public class VSSimulator extends JPanel implements VSSerializable { lastSelectedProcessNum = 0; int numProcesses = simulatorVisualization.getNumProcesses(); - String processString = prefs.getString("lang.process"); + String processString = prefs.getString("lang.en.process"); for (int i = 0; i < numProcesses; ++i) { int pid = simulatorVisualization.getProcess(i).getProcessID(); @@ -850,9 +850,9 @@ public class VSSimulator extends JPanel implements VSSerializable { globalPIDComboBox.addItem("PID: " + pid); } - processesComboBox.addItem(prefs.getString("lang.processes.all")); - localPIDComboBox.addItem(prefs.getString("lang.all")); - globalPIDComboBox.addItem(prefs.getString("lang.all")); + processesComboBox.addItem(prefs.getString("lang.en.processes.all")); + localPIDComboBox.addItem(prefs.getString("lang.en.all")); + globalPIDComboBox.addItem(prefs.getString("lang.en.all")); tabbedPane = new JTabbedPane(JTabbedPane.TOP, JTabbedPane.WRAP_TAB_LAYOUT); @@ -866,10 +866,10 @@ public class VSSimulator extends JPanel implements VSSerializable { splitPane1.setOneTouchExpandable(true); if (expertMode) - tabbedPane.addTab(prefs.getString("lang.events"), splitPane1); + tabbedPane.addTab(prefs.getString("lang.en.events"), splitPane1); else - tabbedPane.addTab(prefs.getString("lang.events"), localPanel); + tabbedPane.addTab(prefs.getString("lang.en.events"), localPanel); processesComboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) { @@ -908,7 +908,7 @@ public class VSSimulator extends JPanel implements VSSerializable { } }); - tabbedPane.add(prefs.getString("lang.variables"), null); + tabbedPane.add(prefs.getString("lang.en.variables"), null); editPanel.add(processesComboBox); editPanel.add(tabbedPane); @@ -944,9 +944,9 @@ public class VSSimulator extends JPanel implements VSSerializable { panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS)); if (localTasks) - panel.add(createLabelPanel(prefs.getString("lang.timed.local"))); + panel.add(createLabelPanel(prefs.getString("lang.en.timed.local"))); else - panel.add(createLabelPanel(prefs.getString("lang.timed.global"))); + panel.add(createLabelPanel(prefs.getString("lang.en.timed.global"))); JScrollPane scrollPane = new JScrollPane(createTaskTable(localTasks)); panel.add(scrollPane); @@ -1037,7 +1037,7 @@ public class VSSimulator extends JPanel implements VSSerializable { } final JComboBox comboBox = new JComboBox(); - JButton takeoverButton = new JButton(prefs.getString("lang.takeover")); + JButton takeoverButton = new JButton(prefs.getString("lang.en.takeover")); takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover")); takeoverButton.addActionListener(new ActionListener() { private boolean isRed; @@ -1121,7 +1121,7 @@ public class VSSimulator extends JPanel implements VSSerializable { VSRegisteredEvents.getNonProtocolClassnames(); comboBox.setMaximumRowCount(20); - String menuText = prefs.getString("lang.events.process"); + String menuText = prefs.getString("lang.en.events.process"); comboBox.addItem("----- " + menuText + " -----"); if (createTaskFlag) @@ -1136,13 +1136,13 @@ public class VSSimulator extends JPanel implements VSSerializable { createTasks.add(new VSCreateTask(menuText, eventClassname)); } - String activate = prefs.getString("lang.activate"); - String client = prefs.getString("lang.client"); - String clientRequest = prefs.getString("lang.clientrequest.start"); - String deactivate = prefs.getString("lang.deactivate"); - String server = prefs.getString("lang.server"); - String serverRequest = prefs.getString("lang.serverrequest.start"); - String protocol = prefs.getString("lang.protocol"); + String activate = prefs.getString("lang.en.activate"); + String client = prefs.getString("lang.en.client"); + String clientRequest = prefs.getString("lang.en.clientrequest.start"); + String deactivate = prefs.getString("lang.en.deactivate"); + String server = prefs.getString("lang.en.server"); + String serverRequest = prefs.getString("lang.en.serverrequest.start"); + String protocol = prefs.getString("lang.en.protocol"); String protocolEventClassname = "events.internal.VSProtocolEvent"; eventClassnames = VSRegisteredEvents.getProtocolClassnames(); @@ -1326,7 +1326,7 @@ public class VSSimulator extends JPanel implements VSSerializable { */ private void updateProcessesComboBox() { int numProcesses = simulatorVisualization.getNumProcesses(); - String processString = prefs.getString("lang.process"); + String processString = prefs.getString("lang.en.process"); for (int i = 0; i < numProcesses; ++i) { int processID = simulatorVisualization.getProcess(i).getProcessID(); @@ -1424,7 +1424,7 @@ public class VSSimulator extends JPanel implements VSSerializable { */ public synchronized void addProcessAtIndex(int index) { int processID = simulatorVisualization.getProcess(index).getProcessID(); - String processString = prefs.getString("lang.process"); + String processString = prefs.getString("lang.en.process"); localTextFields.add(index, "0000"); globalTextFields.add(index, "0000"); @@ -1447,7 +1447,7 @@ public class VSSimulator extends JPanel implements VSSerializable { if (expertMode) { tabbedPane.remove(localPanel); - tabbedPane.insertTab(prefs.getString("lang.events"), null, + tabbedPane.insertTab(prefs.getString("lang.en.events"), null, splitPane1, null, 0); splitPane1.setTopComponent(localPanel); //splitPane1.setDividerLocation((int) (getPaintSize()/2) - 20); @@ -1457,7 +1457,7 @@ public class VSSimulator extends JPanel implements VSSerializable { } else { tabbedPane.remove(splitPane1); - tabbedPane.insertTab(prefs.getString("lang.events"), null, + tabbedPane.insertTab(prefs.getString("lang.en.events"), null, localPanel, null, 0); /* addPanel */ diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java index ed319d5..f8396eb 100644 --- a/sources/simulator/VSSimulatorFrame.java +++ b/sources/simulator/VSSimulatorFrame.java @@ -113,7 +113,7 @@ public class VSSimulatorFrame extends VSFrame { * @param relativeTo the component to open the window relative to */ public VSSimulatorFrame(VSPrefs prefs, Component relativeTo) { - super(prefs.getString("lang.name"), relativeTo); + super(prefs.getString("lang.en.name"), relativeTo); this.prefs = prefs; this.simulators = new Vector<VSSimulator>(); @@ -130,11 +130,11 @@ public class VSSimulatorFrame extends VSFrame { getDescription(); if (sourceText.equals( - finalPrefs.getString("lang.simulator.close"))) { + finalPrefs.getString("lang.en.simulator.close"))) { removeCurrentSimulator(); } else if (sourceText.equals( - finalPrefs.getString("lang.simulator.new"))) { + finalPrefs.getString("lang.en.simulator.new"))) { VSPrefs newPrefs = VSDefaultPrefs.init(); VSSimulatorEditor simulatorEditor = new VSSimulatorEditor(newPrefs, VSSimulatorFrame.this, @@ -143,21 +143,21 @@ public class VSSimulatorFrame extends VSFrame { simulatorEditor); } else if (sourceText.equals( - finalPrefs.getString("lang.window.new"))) { + finalPrefs.getString("lang.en.window.new"))) { new VSMain(VSDefaultPrefs.init(), VSSimulatorFrame.this); } else if (sourceText.equals( - finalPrefs.getString("lang.window.close"))) { + finalPrefs.getString("lang.en.window.close"))) { dispose(); } else if (sourceText.equals( - finalPrefs.getString("lang.open"))) { + finalPrefs.getString("lang.en.open"))) { VSSerialize serialize = new VSSerialize(); serialize.openSimulator(VSSimulatorFrame.this); } else if (sourceText.equals( - finalPrefs.getString("lang.save"))) { + finalPrefs.getString("lang.en.save"))) { VSSimulatorVisualization simulatorVisualization = currentSimulator.getSimulatorCanvas(); boolean flag = !simulatorVisualization.isPaused() @@ -174,7 +174,7 @@ public class VSSimulatorFrame extends VSFrame { startCurrentSimulator(); } else if (sourceText.equals( - finalPrefs.getString("lang.saveas"))) { + finalPrefs.getString("lang.en.saveas"))) { VSSimulatorVisualization simulatorVisualization = currentSimulator.getSimulatorCanvas(); boolean flag = !simulatorVisualization.isPaused() @@ -190,27 +190,27 @@ public class VSSimulatorFrame extends VSFrame { startCurrentSimulator(); } else if (sourceText.equals( - finalPrefs.getString("lang.about"))) { + finalPrefs.getString("lang.en.about"))) { new VSAboutFrame(finalPrefs, VSSimulatorFrame.this); } else if (sourceText.equals( - finalPrefs.getString("lang.quit"))) { + finalPrefs.getString("lang.en.quit"))) { System.exit(0); } else if (sourceText.equals( - finalPrefs.getString("lang.start"))) { + finalPrefs.getString("lang.en.start"))) { startCurrentSimulator(); } else if (sourceText.equals( - finalPrefs.getString("lang.pause"))) { + finalPrefs.getString("lang.en.pause"))) { pauseCurrentSimulator(); } else if (sourceText.equals( - finalPrefs.getString("lang.reset"))) { + finalPrefs.getString("lang.en.reset"))) { resetCurrentSimulator(); } else if (sourceText.equals( - finalPrefs.getString("lang.replay"))) { + finalPrefs.getString("lang.en.replay"))) { VSMenuItemStates menuItemState = currentSimulator.getMenuItemStates(); menuItemState.setStart(false); @@ -253,11 +253,11 @@ public class VSSimulatorFrame extends VSFrame { */ private JMenuBar createMenuBar() { /* File menu */ - menuFile = new JMenu(prefs.getString("lang.file")); + menuFile = new JMenu(prefs.getString("lang.en.file")); menuFile.setMnemonic(prefs.getInteger("keyevent.file")); JMenuItem menuItem; - menuItem = new JMenuItem(prefs.getString("lang.simulator.new")); + menuItem = new JMenuItem(prefs.getString("lang.en.simulator.new")); menuItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.new"), ActionEvent.ALT_MASK)); @@ -265,7 +265,7 @@ public class VSSimulatorFrame extends VSFrame { menuFile.add(menuItem); closeItem = new JMenuItem( - prefs.getString("lang.simulator.close")); + prefs.getString("lang.en.simulator.close")); closeItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.close"), ActionEvent.ALT_MASK)); @@ -274,31 +274,31 @@ public class VSSimulatorFrame extends VSFrame { menuFile.addSeparator(); - menuItem = new JMenuItem(prefs.getString("lang.window.new")); + menuItem = new JMenuItem(prefs.getString("lang.en.window.new")); menuItem.addActionListener(actionListener); menuFile.add(menuItem); - menuItem = new JMenuItem(prefs.getString("lang.window.close")); + menuItem = new JMenuItem(prefs.getString("lang.en.window.close")); menuItem.addActionListener(actionListener); menuFile.add(menuItem); menuFile.addSeparator(); - menuItem = new JMenuItem(prefs.getString("lang.open")); + menuItem = new JMenuItem(prefs.getString("lang.en.open")); menuItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.open"), ActionEvent.ALT_MASK)); menuItem.addActionListener(actionListener); menuFile.add(menuItem); - saveItem = new JMenuItem(prefs.getString("lang.save")); + saveItem = new JMenuItem(prefs.getString("lang.en.save")); saveItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.save"), ActionEvent.ALT_MASK)); saveItem.addActionListener(actionListener); menuFile.add(saveItem); - saveAsItem = new JMenuItem(prefs.getString("lang.saveas")); + saveAsItem = new JMenuItem(prefs.getString("lang.en.saveas")); saveAsItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.saveas"), ActionEvent.ALT_MASK)); @@ -307,27 +307,27 @@ public class VSSimulatorFrame extends VSFrame { menuFile.addSeparator(); - menuItem = new JMenuItem(prefs.getString("lang.about")); + menuItem = new JMenuItem(prefs.getString("lang.en.about")); menuItem.addActionListener(actionListener); menuFile.add(menuItem); - menuItem = new JMenuItem(prefs.getString("lang.quit")); + menuItem = new JMenuItem(prefs.getString("lang.en.quit")); menuItem.addActionListener(actionListener); menuFile.add(menuItem); /* Edit menu */ menuEdit = new JMenu( - prefs.getString("lang.edit")); + prefs.getString("lang.en.edit")); menuEdit.setMnemonic(prefs.getInteger("keyevent.edit")); updateEditMenu(); /* Simulator menu */ toolBar = new JToolBar(); menuSimulator = new JMenu( - prefs.getString("lang.simulator")); + prefs.getString("lang.en.simulator")); menuSimulator.setMnemonic(prefs.getInteger("keyevent.simulator")); - resetItem = new JMenuItem(prefs.getString("lang.reset")); + resetItem = new JMenuItem(prefs.getString("lang.en.reset")); resetItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.reset"), ActionEvent.ALT_MASK)); @@ -335,12 +335,12 @@ public class VSSimulatorFrame extends VSFrame { resetItem.setEnabled(false); menuSimulator.add(resetItem); resetButton = new JButton(getImageIcon("reset.png", - prefs.getString("lang.reset"))); + prefs.getString("lang.en.reset"))); resetButton.addActionListener(actionListener); toolBar.add(resetButton); replayItem = new JMenuItem( - prefs.getString("lang.replay")); + prefs.getString("lang.en.replay")); replayItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.replay"), ActionEvent.ALT_MASK)); @@ -348,11 +348,11 @@ public class VSSimulatorFrame extends VSFrame { replayItem.setEnabled(false); menuSimulator.add(replayItem); replayButton = new JButton( - getImageIcon("replay.png", prefs.getString("lang.replay"))); + getImageIcon("replay.png", prefs.getString("lang.en.replay"))); replayButton.addActionListener(actionListener); toolBar.add(replayButton); - pauseItem = new JMenuItem(prefs.getString("lang.pause")); + pauseItem = new JMenuItem(prefs.getString("lang.en.pause")); pauseItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.pause"), ActionEvent.ALT_MASK)); @@ -360,18 +360,18 @@ public class VSSimulatorFrame extends VSFrame { menuSimulator.add(pauseItem); pauseItem.setEnabled(false); pauseButton = new JButton(getImageIcon("pause.png", - prefs.getString("lang.pause"))); + prefs.getString("lang.en.pause"))); pauseButton.addActionListener(actionListener); toolBar.add(pauseButton); - startItem = new JMenuItem(prefs.getString("lang.start")); + startItem = new JMenuItem(prefs.getString("lang.en.start")); startItem.setAccelerator(KeyStroke.getKeyStroke( prefs.getInteger("keyevent.start"), ActionEvent.ALT_MASK)); startItem.addActionListener(actionListener); menuSimulator.add(startItem); startButton = new JButton(getImageIcon("start.png", - prefs.getString("lang.start"))); + prefs.getString("lang.en.start"))); startButton.addActionListener(actionListener); toolBar.add(startButton); @@ -420,7 +420,7 @@ public class VSSimulatorFrame extends VSFrame { menuEdit.removeAll(); JMenuItem globalPrefsItem = new JMenuItem( - prefs.getString("lang.prefs")); + prefs.getString("lang.en.prefs")); globalPrefsItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent ae) { @@ -439,7 +439,7 @@ public class VSSimulatorFrame extends VSFrame { if (currentSimulator == null) return; - String processString = prefs.getString("lang.process"); + String processString = prefs.getString("lang.en.process"); ArrayList<VSInternalProcess> arr = currentSimulator.getSimulatorCanvas().getProcessesArray(); @@ -505,7 +505,7 @@ public class VSSimulatorFrame extends VSFrame { simulator.setMaximumSize(new Dimension(0, 0)); simulators.add(simulator); - tabbedPane.addTab(prefs.getString("lang.simulator") + tabbedPane.addTab(prefs.getString("lang.en.simulator") + " " + simulator.getSimulatorNum(), simulator); tabbedPane.setSelectedComponent(simulator); diff --git a/sources/simulator/VSSimulatorVisualization.java b/sources/simulator/VSSimulatorVisualization.java index ab39e65..f15d478 100644 --- a/sources/simulator/VSSimulatorVisualization.java +++ b/sources/simulator/VSSimulatorVisualization.java @@ -522,11 +522,11 @@ public class VSSimulatorVisualization extends Canvas public void actionPerformed(ActionEvent ae) { String command = ae.getActionCommand(); if (command.equals( - finalPrefs.getString("lang.process.edit"))) { + finalPrefs.getString("lang.en.process.edit"))) { editProcess(process); } else if (command.equals( - finalPrefs.getString("lang.process.crash"))) { + finalPrefs.getString("lang.en.process.crash"))) { VSAbstractEvent event = new VSProcessCrashEvent(); @@ -536,7 +536,7 @@ public class VSSimulatorVisualization extends Canvas VSTask.GLOBAL)); } else if (command.equals( - finalPrefs.getString("lang.process.recover"))) { + finalPrefs.getString("lang.en.process.recover"))) { VSAbstractEvent event = new VSProcessRecoverEvent(); @@ -546,11 +546,11 @@ public class VSSimulatorVisualization extends Canvas VSTask.GLOBAL)); } else if (command.equals( - finalPrefs.getString("lang.process.remove"))) { + finalPrefs.getString("lang.en.process.remove"))) { removeProcess(process); } else if (command.equals( - finalPrefs.getString("lang.process.add.new"))) { + finalPrefs.getString("lang.en.process.add.new"))) { addProcess(); } } @@ -561,18 +561,18 @@ public class VSSimulatorVisualization extends Canvas if (process != null) item = new JMenuItem( - finalPrefs.getString("lang.process.selected") + + finalPrefs.getString("lang.en.process.selected") + ": " + process.getProcessID()); else item = new JMenuItem( - finalPrefs.getString("lang.process.not.selected")); + finalPrefs.getString("lang.en.process.not.selected")); item.setEnabled(false); popup.add(item); popup.addSeparator(); item = new JMenuItem( - finalPrefs.getString("lang.process.edit")); + finalPrefs.getString("lang.en.process.edit")); if (process == null) item.setEnabled(false); else @@ -580,7 +580,7 @@ public class VSSimulatorVisualization extends Canvas popup.add(item); item = new JMenuItem( - finalPrefs.getString("lang.process.crash")); + finalPrefs.getString("lang.en.process.crash")); if (process == null || process.isCrashed() || isPaused || time == 0 || hasFinished) @@ -590,7 +590,7 @@ public class VSSimulatorVisualization extends Canvas popup.add(item); item = new JMenuItem( - finalPrefs.getString("lang.process.recover")); + finalPrefs.getString("lang.en.process.recover")); if (process == null || !process.isCrashed() || isPaused || time == 0 || hasFinished) @@ -600,7 +600,7 @@ public class VSSimulatorVisualization extends Canvas popup.add(item); item = new JMenuItem( - finalPrefs.getString("lang.process.remove")); + finalPrefs.getString("lang.en.process.remove")); if (process == null) item.setEnabled(false); @@ -612,11 +612,11 @@ public class VSSimulatorVisualization extends Canvas final long xPosTime = getXPositionTime(me.getX()); String timeString = finalPrefs.getString( - "lang.event.add.time") + + "lang.en.event.add.time") + " " + xPosTime + "ms"; JMenu subMenu = new JMenu( - finalPrefs.getString("lang.event.add.local") + finalPrefs.getString("lang.en.event.add.local") + " " + timeString); ArrayList<VSCreateTask> createTasks = @@ -653,7 +653,7 @@ public class VSSimulatorVisualization extends Canvas popup.add(subMenu); subMenu = new JMenu( - finalPrefs.getString("lang.event.add.global") + finalPrefs.getString("lang.en.event.add.global") + " " + timeString); if (process == null) { subMenu.setEnabled(false); @@ -689,7 +689,7 @@ public class VSSimulatorVisualization extends Canvas popup.addSeparator(); item = new JMenuItem( - finalPrefs.getString("lang.process.add.new")); + finalPrefs.getString("lang.en.process.add.new")); item.addActionListener(actionListener); popup.add(item); @@ -1300,7 +1300,7 @@ public class VSSimulatorVisualization extends Canvas * Starts/plays the simulator. */ public void play() { - loging.log(prefs.getString("lang.simulator.started")); + loging.log(prefs.getString("lang.en.simulator.started")); final long currentTime = System.currentTimeMillis(); synchronized (processes) { @@ -1338,7 +1338,7 @@ public class VSSimulatorVisualization extends Canvas simulator.finish(); hasFinished = true; - loging.log(prefs.getString("lang.simulator.finished")); + loging.log(prefs.getString("lang.en.simulator.finished")); paint(); if (prefs.getBoolean("sim.periodic")) { @@ -1359,7 +1359,7 @@ public class VSSimulatorVisualization extends Canvas } pauseTime = System.currentTimeMillis(); - loging.log(prefs.getString("lang.simulator.paused")); + loging.log(prefs.getString("lang.en.simulator.paused")); paint(); } @@ -1368,7 +1368,7 @@ public class VSSimulatorVisualization extends Canvas */ public void reset() { if (!isResetted) { - loging.log(prefs.getString("lang.simulator.resetted")); + loging.log(prefs.getString("lang.en.simulator.resetted")); isResetted = true; isPaused = false; @@ -1678,7 +1678,7 @@ public class VSSimulatorVisualization extends Canvas private VSInternalProcess createProcess(int processNum) { VSInternalProcess process = new VSInternalProcess(prefs, processNum, this, loging); - loging.log(prefs.getString("lang.process.new") + "; " + process); + loging.log(prefs.getString("lang.en.process.new") + "; " + process); return process; } |