summaryrefslogtreecommitdiff
path: root/sources/simulator
diff options
context:
space:
mode:
Diffstat (limited to 'sources/simulator')
-rw-r--r--sources/simulator/VSSimulator.java82
-rw-r--r--sources/simulator/VSSimulatorFrame.java74
-rw-r--r--sources/simulator/VSSimulatorVisualization.java49
3 files changed, 100 insertions, 105 deletions
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 691fb15..4965a71 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -175,7 +175,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
* the task manager's JTable.
*/
private class VSTaskManagerTableModel extends AbstractTableModel
- implements MouseListener {
+ implements MouseListener {
/** the serial version uid */
private static final long serialVersionUID = 1l;
@@ -218,9 +218,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.en.time") + " (ms)";
- columnNames[1] = prefs.getString("lang.en.process.id");
- columnNames[2] = prefs.getString("lang.en.event");
+ columnNames[0]= prefs.getString("lang.time") + " (ms)";
+ columnNames[1] = prefs.getString("lang.process.id");
+ columnNames[2] = prefs.getString("lang.event");
numColumns = 3;
}
@@ -410,23 +410,23 @@ public class VSSimulator extends JPanel implements VSSerializable {
String command = ae.getActionCommand();
int rows[] = source.getSelectedRows();
- if (command.equals(prefs.getString("lang.en.remove"))) {
+ if (command.equals(prefs.getString("lang.remove"))) {
for (int i = rows.length - 1; i >= 0; --i)
removeTaskAtRow(rows[i]);
} else if (command.equals(
- prefs.getString("lang.en.copy"))) {
+ prefs.getString("lang.copy"))) {
copyTasksAtRows(rows);
}
}
};
JPopupMenu popup = new JPopupMenu();
- JMenuItem item = new JMenuItem(prefs.getString("lang.en.remove"));
+ JMenuItem item = new JMenuItem(prefs.getString("lang.remove"));
item.addActionListener(actionListener);
popup.add(item);
- item = new JMenuItem(prefs.getString("lang.en.copy"));
+ item = new JMenuItem(prefs.getString("lang.copy"));
item.addActionListener(actionListener);
popup.add(item);
@@ -464,7 +464,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
* the task manager's JTable editor
*/
private class VSTaskManagerCellEditor extends AbstractCellEditor
- implements TableCellEditor {
+ implements TableCellEditor {
/** the serial version uid */
private static final long serialVersionUID = 1L;
@@ -607,7 +607,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
if (this.loging == null)
this.loging = new VSLogging();
- loging.log(prefs.getString("lang.en.simulator.new"));
+ loging.log(prefs.getString("lang.simulator.new"));
fillContentPane();
updateFromPrefs();
@@ -688,7 +688,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
toolsPanel.setLayout(new BoxLayout(toolsPanel, BoxLayout.X_AXIS));
JCheckBox expertActiveCheckBox =
- new JCheckBox(prefs.getString("lang.en.mode.expert"));
+ new JCheckBox(prefs.getString("lang.mode.expert"));
expertActiveCheckBox.setSelected(expertMode);
expertActiveCheckBox.addChangeListener(new ChangeListener() {
@@ -708,7 +708,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
if (expertMode) {
lamportActiveCheckBox = new JCheckBox(
- prefs.getString("lang.en.time.lamport"));
+ prefs.getString("lang.time.lamport"));
lamportActiveCheckBox.setSelected(false);
lamportActiveCheckBox.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent ce) {
@@ -724,7 +724,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
toolsPanel.add(lamportActiveCheckBox);
vectorTimeActiveCheckBox = new JCheckBox(
- prefs.getString("lang.en.time.vector"));
+ prefs.getString("lang.time.vector"));
vectorTimeActiveCheckBox.setSelected(false);
vectorTimeActiveCheckBox.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent ce) {
@@ -740,7 +740,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
toolsPanel.add(vectorTimeActiveCheckBox);
JCheckBox antiAliasing = new JCheckBox(
- prefs.getString("lang.en.antialiasing"));
+ prefs.getString("lang.antialiasing"));
antiAliasing.setSelected(false);
antiAliasing.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent ce) {
@@ -755,7 +755,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
}
JCheckBox logingActiveCheckBox = new JCheckBox(
- prefs.getString("lang.en.loging.active"));
+ prefs.getString("lang.loging.active"));
logingActiveCheckBox.setSelected(true);
logingActiveCheckBox.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent ce) {
@@ -769,7 +769,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
if (expertMode) {
filterActiveCheckBox = new JCheckBox(
- prefs.getString("lang.en.filter"));
+ prefs.getString("lang.filter"));
filterActiveCheckBox.setSelected(false);
filterActiveCheckBox.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent ce) {
@@ -799,12 +799,12 @@ public class VSSimulator extends JPanel implements VSSerializable {
toolsPanel.add(filterTextField);
JButton clearButton = new JButton(
- prefs.getString("lang.en.loging.clear"));
+ prefs.getString("lang.loging.clear"));
clearButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
String command = ae.getActionCommand();
if (command.equals(
- prefs.getString("lang.en.loging.clear"))) {
+ prefs.getString("lang.loging.clear"))) {
loging.clear();
}
}
@@ -831,7 +831,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
lastSelectedProcessNum = 0;
int numProcesses = simulatorVisualization.getNumProcesses();
- String processString = prefs.getString("lang.en.process");
+ String processString = prefs.getString("lang.process");
for (int i = 0; i < numProcesses; ++i) {
int pid = simulatorVisualization.getProcess(i).getProcessID();
@@ -840,9 +840,9 @@ public class VSSimulator extends JPanel implements VSSerializable {
globalPIDComboBox.addItem("PID: " + pid);
}
- processesComboBox.addItem(prefs.getString("lang.en.processes.all"));
- localPIDComboBox.addItem(prefs.getString("lang.en.all"));
- globalPIDComboBox.addItem(prefs.getString("lang.en.all"));
+ processesComboBox.addItem(prefs.getString("lang.processes.all"));
+ localPIDComboBox.addItem(prefs.getString("lang.all"));
+ globalPIDComboBox.addItem(prefs.getString("lang.all"));
tabbedPane = new JTabbedPane(JTabbedPane.TOP,
JTabbedPane.WRAP_TAB_LAYOUT);
@@ -856,10 +856,10 @@ public class VSSimulator extends JPanel implements VSSerializable {
splitPane1.setOneTouchExpandable(true);
if (expertMode)
- tabbedPane.addTab(prefs.getString("lang.en.events"), splitPane1);
+ tabbedPane.addTab(prefs.getString("lang.events"), splitPane1);
else
- tabbedPane.addTab(prefs.getString("lang.en.events"), localPanel);
+ tabbedPane.addTab(prefs.getString("lang.events"), localPanel);
processesComboBox.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
@@ -898,7 +898,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
}
});
- tabbedPane.add(prefs.getString("lang.en.variables"), null);
+ tabbedPane.add(prefs.getString("lang.variables"), null);
editPanel.add(processesComboBox);
editPanel.add(tabbedPane);
@@ -934,9 +934,9 @@ public class VSSimulator extends JPanel implements VSSerializable {
panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
if (localTasks)
- panel.add(createLabelPanel(prefs.getString("lang.en.timed.local")));
+ panel.add(createLabelPanel(prefs.getString("lang.timed.local")));
else
- panel.add(createLabelPanel(prefs.getString("lang.en.timed.global")));
+ panel.add(createLabelPanel(prefs.getString("lang.timed.global")));
JScrollPane scrollPane = new JScrollPane(createTaskTable(localTasks));
panel.add(scrollPane);
@@ -1027,7 +1027,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
}
final JComboBox<String> comboBox = new JComboBox<>();
- JButton takeoverButton = new JButton(prefs.getString("lang.en.takeover"));
+ JButton takeoverButton = new JButton(prefs.getString("lang.takeover"));
takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
takeoverButton.addActionListener(new ActionListener() {
private boolean isRed;
@@ -1090,7 +1090,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
taskManager.addTask(task, VSTaskManager.PROGRAMMED);
if (selectedProcess == null ||
- process.equals(selectedProcess)) {
+ process.equals(selectedProcess)) {
if (localTasks)
taskManagerLocalModel.addTask(task);
else
@@ -1111,7 +1111,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
VSRegisteredEvents.getNonProtocolClassnames();
comboBox.setMaximumRowCount(20);
- String menuText = prefs.getString("lang.en.events.process");
+ String menuText = prefs.getString("lang.events.process");
comboBox.addItem("----- " + menuText + " -----");
if (createTaskFlag)
@@ -1126,13 +1126,13 @@ public class VSSimulator extends JPanel implements VSSerializable {
createTasks.add(new VSCreateTask(menuText, eventClassname));
}
- 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 activate = prefs.getString("lang.activate");
+ String client = prefs.getString("lang.client");
+ String clientRequest = prefs.getString("lang.clientrequest.start");
+ String deactivate = prefs.getString("langactivate");
+ String server = prefs.getString("lang.server");
+ String serverRequest = prefs.getString("lang.serverrequest.start");
+ String protocol = prefs.getString("lang.protocol");
String protocolEventClassname = "events.internal.VSProtocolEvent";
eventClassnames = VSRegisteredEvents.getProtocolClassnames();
@@ -1316,7 +1316,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
*/
private void updateProcessesComboBox() {
int numProcesses = simulatorVisualization.getNumProcesses();
- String processString = prefs.getString("lang.en.process");
+ String processString = prefs.getString("lang.process");
for (int i = 0; i < numProcesses; ++i) {
int processID = simulatorVisualization.getProcess(i).getProcessID();
@@ -1414,7 +1414,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.en.process");
+ String processString = prefs.getString("lang.process");
localTextFields.add(index, "0000");
globalTextFields.add(index, "0000");
@@ -1437,7 +1437,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
if (expertMode) {
tabbedPane.remove(localPanel);
- tabbedPane.insertTab(prefs.getString("lang.en.events"), null,
+ tabbedPane.insertTab(prefs.getString("lang.events"), null,
splitPane1, null, 0);
splitPane1.setTopComponent(localPanel);
//splitPane1.setDividerLocation((int) (getPaintSize()/2) - 20);
@@ -1447,7 +1447,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
} else {
tabbedPane.remove(splitPane1);
- tabbedPane.insertTab(prefs.getString("lang.en.events"), null,
+ tabbedPane.insertTab(prefs.getString("lang.events"), null,
localPanel, null, 0);
/* addPanel */
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index 61ba324..3cf4e91 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -109,7 +109,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.en.name"), relativeTo);
+ super(prefs.getString("lang.name"), relativeTo);
this.prefs = prefs;
this.simulators = new Vector<VSSimulator>();
@@ -126,11 +126,11 @@ public class VSSimulatorFrame extends VSFrame {
getDescription();
if (sourceText.equals(
- finalPrefs.getString("lang.en.simulator.close"))) {
+ finalPrefs.getString("lang.simulator.close"))) {
removeCurrentSimulator();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.simulator.new"))) {
+ finalPrefs.getString("lang.simulator.new"))) {
VSPrefs newPrefs = VSDefaultPrefs.init();
VSSimulatorEditor simulatorEditor =
new VSSimulatorEditor(newPrefs, VSSimulatorFrame.this,
@@ -139,21 +139,21 @@ public class VSSimulatorFrame extends VSFrame {
simulatorEditor);
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.window.new"))) {
+ finalPrefs.getString("lang.window.new"))) {
new VSMain(VSDefaultPrefs.init(),
VSSimulatorFrame.this);
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.window.close"))) {
+ finalPrefs.getString("lang.window.close"))) {
dispose();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.open"))) {
+ finalPrefs.getString("lang.open"))) {
VSSerialize serialize = new VSSerialize();
serialize.openSimulator(VSSimulatorFrame.this);
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.save"))) {
+ finalPrefs.getString("lang.save"))) {
VSSimulatorVisualization simulatorVisualization =
currentSimulator.getSimulatorCanvas();
boolean flag = !simulatorVisualization.isPaused()
@@ -170,7 +170,7 @@ public class VSSimulatorFrame extends VSFrame {
startCurrentSimulator();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.saveas"))) {
+ finalPrefs.getString("lang.saveas"))) {
VSSimulatorVisualization simulatorVisualization =
currentSimulator.getSimulatorCanvas();
boolean flag = !simulatorVisualization.isPaused()
@@ -186,27 +186,27 @@ public class VSSimulatorFrame extends VSFrame {
startCurrentSimulator();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.about"))) {
+ finalPrefs.getString("lang.about"))) {
new VSAboutFrame(finalPrefs, VSSimulatorFrame.this);
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.quit"))) {
+ finalPrefs.getString("lang.quit"))) {
System.exit(0);
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.start"))) {
+ finalPrefs.getString("lang.start"))) {
startCurrentSimulator();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.pause"))) {
+ finalPrefs.getString("lang.pause"))) {
pauseCurrentSimulator();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.reset"))) {
+ finalPrefs.getString("lang.reset"))) {
resetCurrentSimulator();
} else if (sourceText.equals(
- finalPrefs.getString("lang.en.replay"))) {
+ finalPrefs.getString("lang.replay"))) {
VSMenuItemStates menuItemState =
currentSimulator.getMenuItemStates();
menuItemState.setStart(false);
@@ -249,11 +249,11 @@ public class VSSimulatorFrame extends VSFrame {
*/
private JMenuBar createMenuBar() {
/* File menu */
- menuFile = new JMenu(prefs.getString("lang.en.file"));
+ menuFile = new JMenu(prefs.getString("lang.file"));
menuFile.setMnemonic(prefs.getInteger("keyevent.file"));
JMenuItem menuItem;
- menuItem = new JMenuItem(prefs.getString("lang.en.simulator.new"));
+ menuItem = new JMenuItem(prefs.getString("lang.simulator.new"));
menuItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.new"),
ActionEvent.ALT_MASK));
@@ -261,7 +261,7 @@ public class VSSimulatorFrame extends VSFrame {
menuFile.add(menuItem);
closeItem = new JMenuItem(
- prefs.getString("lang.en.simulator.close"));
+ prefs.getString("lang.simulator.close"));
closeItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.close"),
ActionEvent.ALT_MASK));
@@ -270,31 +270,31 @@ public class VSSimulatorFrame extends VSFrame {
menuFile.addSeparator();
- menuItem = new JMenuItem(prefs.getString("lang.en.window.new"));
+ menuItem = new JMenuItem(prefs.getString("lang.window.new"));
menuItem.addActionListener(actionListener);
menuFile.add(menuItem);
- menuItem = new JMenuItem(prefs.getString("lang.en.window.close"));
+ menuItem = new JMenuItem(prefs.getString("lang.window.close"));
menuItem.addActionListener(actionListener);
menuFile.add(menuItem);
menuFile.addSeparator();
- menuItem = new JMenuItem(prefs.getString("lang.en.open"));
+ menuItem = new JMenuItem(prefs.getString("lang.open"));
menuItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.open"),
ActionEvent.ALT_MASK));
menuItem.addActionListener(actionListener);
menuFile.add(menuItem);
- saveItem = new JMenuItem(prefs.getString("lang.en.save"));
+ saveItem = new JMenuItem(prefs.getString("lang.save"));
saveItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.save"),
ActionEvent.ALT_MASK));
saveItem.addActionListener(actionListener);
menuFile.add(saveItem);
- saveAsItem = new JMenuItem(prefs.getString("lang.en.saveas"));
+ saveAsItem = new JMenuItem(prefs.getString("lang.saveas"));
saveAsItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.saveas"),
ActionEvent.ALT_MASK));
@@ -303,27 +303,27 @@ public class VSSimulatorFrame extends VSFrame {
menuFile.addSeparator();
- menuItem = new JMenuItem(prefs.getString("lang.en.about"));
+ menuItem = new JMenuItem(prefs.getString("lang.about"));
menuItem.addActionListener(actionListener);
menuFile.add(menuItem);
- menuItem = new JMenuItem(prefs.getString("lang.en.quit"));
+ menuItem = new JMenuItem(prefs.getString("lang.quit"));
menuItem.addActionListener(actionListener);
menuFile.add(menuItem);
/* Edit menu */
menuEdit = new JMenu(
- prefs.getString("lang.en.edit"));
+ prefs.getString("lang.edit"));
menuEdit.setMnemonic(prefs.getInteger("keyevent.edit"));
updateEditMenu();
/* Simulator menu */
toolBar = new JToolBar();
menuSimulator = new JMenu(
- prefs.getString("lang.en.simulator"));
+ prefs.getString("lang.simulator"));
menuSimulator.setMnemonic(prefs.getInteger("keyevent.simulator"));
- resetItem = new JMenuItem(prefs.getString("lang.en.reset"));
+ resetItem = new JMenuItem(prefs.getString("lang.reset"));
resetItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.reset"),
ActionEvent.ALT_MASK));
@@ -331,12 +331,12 @@ public class VSSimulatorFrame extends VSFrame {
resetItem.setEnabled(false);
menuSimulator.add(resetItem);
resetButton = new JButton(getImageIcon("reset.png",
- prefs.getString("lang.en.reset")));
+ prefs.getString("lang.reset")));
resetButton.addActionListener(actionListener);
toolBar.add(resetButton);
replayItem = new JMenuItem(
- prefs.getString("lang.en.replay"));
+ prefs.getString("lang.replay"));
replayItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.replay"),
ActionEvent.ALT_MASK));
@@ -344,11 +344,11 @@ public class VSSimulatorFrame extends VSFrame {
replayItem.setEnabled(false);
menuSimulator.add(replayItem);
replayButton = new JButton(
- getImageIcon("replay.png", prefs.getString("lang.en.replay")));
+ getImageIcon("replay.png", prefs.getString("lang.replay")));
replayButton.addActionListener(actionListener);
toolBar.add(replayButton);
- pauseItem = new JMenuItem(prefs.getString("lang.en.pause"));
+ pauseItem = new JMenuItem(prefs.getString("lang.pause"));
pauseItem.setAccelerator(KeyStroke.getKeyStroke(
prefs.getInteger("keyevent.pause"),
ActionEvent.ALT_MASK));
@@ -356,18 +356,18 @@ public class VSSimulatorFrame extends VSFrame {
menuSimulator.add(pauseItem);
pauseItem.setEnabled(false);
pauseButton = new JButton(getImageIcon("pause.png",
- prefs.getString("lang.en.pause")));
+ prefs.getString("lang.pause")));
pauseButton.addActionListener(actionListener);
toolBar.add(pauseButton);
- startItem = new JMenuItem(prefs.getString("lang.en.start"));
+ startItem = new JMenuItem(prefs.getString("lang.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.en.start")));
+ prefs.getString("lang.start")));
startButton.addActionListener(actionListener);
toolBar.add(startButton);
@@ -416,7 +416,7 @@ public class VSSimulatorFrame extends VSFrame {
menuEdit.removeAll();
JMenuItem globalPrefsItem = new JMenuItem(
- prefs.getString("lang.en.prefs"));
+ prefs.getString("lang.prefs"));
globalPrefsItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
@@ -435,7 +435,7 @@ public class VSSimulatorFrame extends VSFrame {
if (currentSimulator == null)
return;
- String processString = prefs.getString("lang.en.process");
+ String processString = prefs.getString("lang.process");
ArrayList<VSInternalProcess> arr =
currentSimulator.getSimulatorCanvas().getProcessesArray();
@@ -501,7 +501,7 @@ public class VSSimulatorFrame extends VSFrame {
simulator.setMaximumSize(new Dimension(0, 0));
simulators.add(simulator);
- tabbedPane.addTab(prefs.getString("lang.en.simulator")
+ tabbedPane.addTab(prefs.getString("lang.simulator")
+ " " + simulator.getSimulatorNum(), simulator);
tabbedPane.setSelectedComponent(simulator);
diff --git a/sources/simulator/VSSimulatorVisualization.java b/sources/simulator/VSSimulatorVisualization.java
index 5c28eaf..2dc4a64 100644
--- a/sources/simulator/VSSimulatorVisualization.java
+++ b/sources/simulator/VSSimulatorVisualization.java
@@ -48,7 +48,7 @@ import serialize.VSSerialize;
* @author Paul C. Buetow
*/
public class VSSimulatorVisualization extends Canvas
- implements Runnable, VSSerializable {
+ implements Runnable, VSSerializable {
/** The serial version uid */
private static final long serialVersionUID = 1L;
@@ -236,9 +236,6 @@ public class VSSimulatorVisualization extends Canvas
* @author Paul C. Buetow
*/
public class VSMessageLine {
- /** The serial version uid */
- private static final long serialVersionUID = 1L;
-
/** The receiver process. */
private VSInternalProcess receiverProcess;
@@ -311,7 +308,7 @@ public class VSSimulatorVisualization extends Canvas
* @param task the task
*/
public VSMessageLine(VSInternalProcess receiverProcess, long sendTime,
- long recvTime, long outageTime, int senderNum ,
+ long recvTime, long outageTime, int senderNum,
int receiverNum, VSTask task) {
this.receiverProcess = receiverProcess;
this.sendTime = sendTime;
@@ -501,7 +498,6 @@ public class VSSimulatorVisualization extends Canvas
this.processes = new ArrayList<VSInternalProcess>();
numProcesses = prefs.getInteger("sim.process.num");
-
for (int i = 0; i < numProcesses; ++i)
processes.add(createProcess(i));
}
@@ -520,11 +516,11 @@ public class VSSimulatorVisualization extends Canvas
public void actionPerformed(ActionEvent ae) {
String command = ae.getActionCommand();
if (command.equals(
- finalPrefs.getString("lang.en.process.edit"))) {
+ finalPrefs.getString("lang.process.edit"))) {
editProcess(process);
} else if (command.equals(
- finalPrefs.getString("lang.en.process.crash"))) {
+ finalPrefs.getString("lang.process.crash"))) {
VSAbstractEvent event =
new VSProcessCrashEvent();
@@ -534,7 +530,7 @@ public class VSSimulatorVisualization extends Canvas
VSTask.GLOBAL));
} else if (command.equals(
- finalPrefs.getString("lang.en.process.recover"))) {
+ finalPrefs.getString("lang.process.recover"))) {
VSAbstractEvent event =
new VSProcessRecoverEvent();
@@ -544,11 +540,11 @@ public class VSSimulatorVisualization extends Canvas
VSTask.GLOBAL));
} else if (command.equals(
- finalPrefs.getString("lang.en.process.remove"))) {
+ finalPrefs.getString("lang.process.remove"))) {
removeProcess(process);
} else if (command.equals(
- finalPrefs.getString("lang.en.process.add.new"))) {
+ finalPrefs.getString("lang.process.add.new"))) {
addProcess();
}
}
@@ -559,18 +555,18 @@ public class VSSimulatorVisualization extends Canvas
if (process != null)
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.selected") +
+ finalPrefs.getString("lang.process.selected") +
": " + process.getProcessID());
else
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.not.selected"));
+ finalPrefs.getString("lang.process.not.selected"));
item.setEnabled(false);
popup.add(item);
popup.addSeparator();
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.edit"));
+ finalPrefs.getString("lang.process.edit"));
if (process == null)
item.setEnabled(false);
else
@@ -578,7 +574,7 @@ public class VSSimulatorVisualization extends Canvas
popup.add(item);
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.crash"));
+ finalPrefs.getString("lang.process.crash"));
if (process == null || process.isCrashed() || isPaused ||
time == 0 || hasFinished)
@@ -588,7 +584,7 @@ public class VSSimulatorVisualization extends Canvas
popup.add(item);
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.recover"));
+ finalPrefs.getString("lang.process.recover"));
if (process == null || !process.isCrashed() || isPaused ||
time == 0 || hasFinished)
@@ -598,7 +594,7 @@ public class VSSimulatorVisualization extends Canvas
popup.add(item);
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.remove"));
+ finalPrefs.getString("lang.process.remove"));
if (process == null)
item.setEnabled(false);
@@ -610,11 +606,11 @@ public class VSSimulatorVisualization extends Canvas
final long xPosTime = getXPositionTime(me.getX());
String timeString = finalPrefs.getString(
- "lang.en.event.add.time") +
+ "lang.event.add.time") +
" " + xPosTime + "ms";
JMenu subMenu = new JMenu(
- finalPrefs.getString("lang.en.event.add.local")
+ finalPrefs.getString("lang.event.add.local")
+ " " + timeString);
ArrayList<VSCreateTask> createTasks =
@@ -651,7 +647,7 @@ public class VSSimulatorVisualization extends Canvas
popup.add(subMenu);
subMenu = new JMenu(
- finalPrefs.getString("lang.en.event.add.global")
+ finalPrefs.getString("lang.event.add.global")
+ " " + timeString);
if (process == null) {
subMenu.setEnabled(false);
@@ -687,7 +683,7 @@ public class VSSimulatorVisualization extends Canvas
popup.addSeparator();
item = new JMenuItem(
- finalPrefs.getString("lang.en.process.add.new"));
+ finalPrefs.getString("lang.process.add.new"));
item.addActionListener(actionListener);
popup.add(item);
@@ -1298,7 +1294,7 @@ public class VSSimulatorVisualization extends Canvas
* Starts/plays the simulator.
*/
public void play() {
- loging.log(prefs.getString("lang.en.simulator.started"));
+ loging.log(prefs.getString("lang.simulator.started"));
final long currentTime = System.currentTimeMillis();
synchronized (processes) {
@@ -1336,7 +1332,7 @@ public class VSSimulatorVisualization extends Canvas
simulator.finish();
hasFinished = true;
- loging.log(prefs.getString("lang.en.simulator.finished"));
+ loging.log(prefs.getString("lang.simulator.finished"));
paint();
if (prefs.getBoolean("sim.periodic")) {
@@ -1357,7 +1353,7 @@ public class VSSimulatorVisualization extends Canvas
}
pauseTime = System.currentTimeMillis();
- loging.log(prefs.getString("lang.en.simulator.paused"));
+ loging.log(prefs.getString("lang.simulator.paused"));
paint();
}
@@ -1366,7 +1362,7 @@ public class VSSimulatorVisualization extends Canvas
*/
public void reset() {
if (!isResetted) {
- loging.log(prefs.getString("lang.en.simulator.resetted"));
+ loging.log(prefs.getString("lang.simulator.resetted"));
isResetted = true;
isPaused = false;
@@ -1676,7 +1672,7 @@ public class VSSimulatorVisualization extends Canvas
private VSInternalProcess createProcess(int processNum) {
VSInternalProcess process =
new VSInternalProcess(prefs, processNum, this, loging);
- loging.log(prefs.getString("lang.en.process.new") + "; " + process);
+ loging.log(prefs.getString("lang.process.new") + "; " + process);
return process;
}
@@ -1784,7 +1780,6 @@ public class VSSimulatorVisualization extends Canvas
* @see serialize.VSSerializable#deserialize(serialize.VSSerialize,
* java.io.ObjectInputStream)
*/
- @SuppressWarnings("unchecked")
public synchronized void deserialize(VSSerialize serialize,
ObjectInputStream objectInputStream)
throws IOException, ClassNotFoundException {
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-08 06:44:06 +0000