summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
Diffstat (limited to 'sources')
-rw-r--r--sources/core/VSProcess.java24
-rw-r--r--sources/core/VSTask.java3
-rw-r--r--sources/events/VSRegisteredEvents.java8
-rw-r--r--sources/events/internal/MessageReceiveEvent.java (renamed from sources/events/implementations/MessageReceiveEvent.java)2
-rw-r--r--sources/events/internal/ProtocolEvent.java (renamed from sources/events/implementations/ProtocolEvent.java)2
-rw-r--r--sources/protocols/VSProtocol.java2
-rw-r--r--sources/simulator/VSSimulation.java45
-rw-r--r--sources/simulator/VSSimulationCanvas.java (renamed from sources/simulator/VSSimulationPanel.java)5
-rw-r--r--sources/simulator/VSSimulatorFrame.java20
9 files changed, 57 insertions, 54 deletions
diff --git a/sources/core/VSProcess.java b/sources/core/VSProcess.java
index dbb37ba..0d0f3d2 100644
--- a/sources/core/VSProcess.java
+++ b/sources/core/VSProcess.java
@@ -22,7 +22,7 @@ public final class VSProcess extends VSPrefs {
private VSLogging logging;
private VSPrefs prefs;
private VSRandom random;
- private VSSimulationPanel simulationPanel;
+ private VSSimulationCanvas simulationCanvas;
private VSTask randomCrashTask;
private VSVectorTime vectorTime;
private boolean hasCrashed;
@@ -84,10 +84,10 @@ public final class VSProcess extends VSPrefs {
private static final String DEFAULT_STRING_VALUE_KEYS[] = {
};
- public VSProcess(VSPrefs prefs, VSSimulationPanel simulationPanel, VSLogging logging) {
+ public VSProcess(VSPrefs prefs, VSSimulationCanvas simulationCanvas, VSLogging logging) {
this.protocolsToReset = new ArrayList<VSProtocol>();
this.prefs = prefs;
- this.simulationPanel = simulationPanel;
+ this.simulationCanvas = simulationCanvas;
this.logging = logging;
random = new VSRandom(processID+processCounter);
@@ -120,7 +120,7 @@ public final class VSProcess extends VSPrefs {
vectorTimeHistory = new ArrayList<VSVectorTime>();
crashHistory = new ArrayList<Long>();
- final int numProcesses = simulationPanel.getNumProcesses();
+ final int numProcesses = simulationCanvas.getNumProcesses();
for (int i = 0; i < numProcesses; ++i)
vectorTime.add(new Long(0));
}
@@ -133,7 +133,7 @@ public final class VSProcess extends VSPrefs {
vectorTimeHistory.clear();
crashHistory.clear();
- final int numProcesses = simulationPanel.getNumProcesses();
+ final int numProcesses = simulationCanvas.getNumProcesses();
for (int i = numProcesses; i > 0; --i)
vectorTime.add(new Long(0));
}
@@ -147,7 +147,7 @@ public final class VSProcess extends VSPrefs {
setProcessID(getInteger("sim.process.id"));
setLocalTime(getLong("sim.process.localtime"));
crashedColor = getColor("process.crashed");
- simulationPanel.repaint();
+ simulationCanvas.repaint();
createRandomCrashTask();
}
@@ -217,7 +217,7 @@ public final class VSProcess extends VSPrefs {
private void createRandomCrashTask() {
if (!isCrashed) {
- VSTaskManager taskManager = simulationPanel.getTaskManager();
+ VSTaskManager taskManager = simulationCanvas.getTaskManager();
long crashTime = getARandomCrashTime();
if (randomCrashTask != null)
@@ -358,7 +358,7 @@ public final class VSProcess extends VSPrefs {
/* Check if the message will have an outage or not */
if (random.nextInt(100) <= getInteger("sim.message.prob.outage")) {
/* Calculate the random outage time! */
- final long outageTime = globalTime + random.nextLong(durationTime+1) % simulationPanel.getUntilTime();
+ final long outageTime = globalTime + random.nextLong(durationTime+1) % simulationCanvas.getUntilTime();
return outageTime;
}
@@ -370,7 +370,7 @@ public final class VSProcess extends VSPrefs {
/* Check if the process will crash or not */
if (random.nextInt(100) <= getInteger("sim.process.prob.crash")) {
/* Calculate the random crash time! */
- final long crashTime = random.nextLong(simulationPanel.getUntilTime()+1) % simulationPanel.getUntilTime();
+ final long crashTime = random.nextLong(simulationCanvas.getUntilTime()+1) % simulationCanvas.getUntilTime();
return crashTime;
}
@@ -468,7 +468,7 @@ public final class VSProcess extends VSPrefs {
buffer.append("; ");
buffer.append(message.toStringFull());
logg(buffer.toString());
- simulationPanel.sendMessage(message);
+ simulationCanvas.sendMessage(message);
}
public void logg(String message) {
@@ -519,8 +519,8 @@ public final class VSProcess extends VSPrefs {
return process.getProcessID() == processID;
}
- public VSSimulationPanel getSimulationPanel() {
- return simulationPanel;
+ public VSSimulationCanvas getSimulationCanvas() {
+ return simulationCanvas;
}
public VSPrefs getPrefs() {
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index eff5daa..b8a773a 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -2,6 +2,7 @@ package core;
import events.*;
import events.implementations.*;
+import events.internal.*;
import prefs.VSPrefs;
import protocols.VSProtocol;
import simulator.*;
@@ -33,7 +34,7 @@ public class VSTask implements Comparable {
}
public boolean isMessageReceiveEvent() {
- return event instanceof events.implementations.MessageReceiveEvent;
+ return event instanceof events.internal.MessageReceiveEvent;
}
public boolean isProcessRecoverEvent() {
diff --git a/sources/events/VSRegisteredEvents.java b/sources/events/VSRegisteredEvents.java
index cd375cd..79fd31c 100644
--- a/sources/events/VSRegisteredEvents.java
+++ b/sources/events/VSRegisteredEvents.java
@@ -33,7 +33,7 @@ public final class VSRegisteredEvents {
Vector<String> vector = new Vector<String>();
for (String eventName : set)
- if (getClassname(eventName).startsWith("protocols"))
+ if (getClassname(eventName).startsWith("protocols.implementations"))
vector.add(eventName);
Collections.sort(vector);
@@ -46,7 +46,7 @@ public final class VSRegisteredEvents {
Vector<String> vector = new Vector<String>();
for (String eventClassname : set)
- if (eventClassname.startsWith("protocols"))
+ if (eventClassname.startsWith("protocols.implementations"))
vector.add(eventClassname);
Collections.sort(vector);
@@ -59,7 +59,7 @@ public final class VSRegisteredEvents {
Vector<String> vector = new Vector<String>();
for (String eventName : set)
- if (getClassname(eventName).startsWith("events"))
+ if (getClassname(eventName).startsWith("events.implementations"))
vector.add(eventName);
Collections.sort(vector);
@@ -72,7 +72,7 @@ public final class VSRegisteredEvents {
Vector<String> vector = new Vector<String>();
for (String eventClassname : set)
- if (eventClassname.startsWith("events"))
+ if (eventClassname.startsWith("events.implementations"))
vector.add(eventClassname);
Collections.sort(vector);
diff --git a/sources/events/implementations/MessageReceiveEvent.java b/sources/events/internal/MessageReceiveEvent.java
index d5c1416..d499899 100644
--- a/sources/events/implementations/MessageReceiveEvent.java
+++ b/sources/events/internal/MessageReceiveEvent.java
@@ -1,4 +1,4 @@
-package events.implementations;
+package events.internal;
import core.VSMessage;
import core.VSProcess;
diff --git a/sources/events/implementations/ProtocolEvent.java b/sources/events/internal/ProtocolEvent.java
index 6b21d8c..61b5890 100644
--- a/sources/events/implementations/ProtocolEvent.java
+++ b/sources/events/internal/ProtocolEvent.java
@@ -1,4 +1,4 @@
-package events.implementations;
+package events.internal;
import core.VSProcess;
import events.*;
diff --git a/sources/protocols/VSProtocol.java b/sources/protocols/VSProtocol.java
index df22e51..291b778 100644
--- a/sources/protocols/VSProtocol.java
+++ b/sources/protocols/VSProtocol.java
@@ -72,7 +72,7 @@ abstract public class VSProtocol extends VSEvent {
abstract protected void onServerRecv(VSMessage message);
protected int getNumProcesses() {
- return process.getSimulationPanel().getNumProcesses();
+ return process.getSimulationCanvas().getNumProcesses();
}
public String toString() {
diff --git a/sources/simulator/VSSimulation.java b/sources/simulator/VSSimulation.java
index 558eeaf..1866813 100644
--- a/sources/simulator/VSSimulation.java
+++ b/sources/simulator/VSSimulation.java
@@ -11,6 +11,7 @@ import javax.swing.table.*;
import core.*;
import events.*;
import events.implementations.*;
+import events.internal.*;
import prefs.*;
import protocols.*;
import utils.*;
@@ -37,7 +38,7 @@ public class VSSimulation extends JPanel {
private Thread thread;
private VSLogging logging;
private VSPrefs prefs;
- private VSSimulationPanel simulationPanel;
+ private VSSimulationCanvas simulationCanvas;
private boolean hasStarted = false;
private VSTaskManagerTableModel taskManagerLocalModel;
private VSTaskManagerTableModel taskManagerGlobalModel;
@@ -102,7 +103,7 @@ public class VSSimulation extends JPanel {
logging.logg(prefs.getString("lang.simulation.new"));
fillContentPane();
- int numProcesses = simulationPanel.getNumProcesses();
+ int numProcesses = simulationCanvas.getNumProcesses();
for (int i = 0; i <= numProcesses; ++i) {
localTextFields.add("0000");
@@ -113,7 +114,7 @@ public class VSSimulation extends JPanel {
localPIDComboBox.setSelectedIndex(0);
globalPIDComboBox.setSelectedIndex(0);
- thread = new Thread(simulationPanel);
+ thread = new Thread(simulationCanvas);
thread.start();
}
@@ -129,18 +130,18 @@ public class VSSimulation extends JPanel {
prefs.getInteger("window.ysize")
- prefs.getInteger("window.loggsize"));
- simulationPanel = new VSSimulationPanel(prefs, this, logging);
- taskManager = simulationPanel.getTaskManager();
- logging.setSimulationPanel(simulationPanel);
- simulationPanel.setBackground(prefs.getColor("paintarea.background"));
+ simulationCanvas = new VSSimulationCanvas(prefs, this, logging);
+ taskManager = simulationCanvas.getTaskManager();
+ logging.setSimulationCanvas(simulationCanvas);
+ simulationCanvas.setBackground(prefs.getColor("paintarea.background"));
JPanel canvasPanel = new JPanel();
canvasPanel.setLayout(new GridLayout(1, 1, 3, 3));
- canvasPanel.add(simulationPanel);
+ canvasPanel.add(simulationCanvas);
canvasPanel.setMinimumSize(new Dimension(0, 0));
canvasPanel.setMaximumSize(new Dimension(0, 0));
- //JScrollPane paintScrollPane = new JScrollPane(simulationPanel);
+ //JScrollPane paintScrollPane = new JScrollPane(simulationCanvas);
JScrollPane textScrollPane = new JScrollPane(loggingArea);
JPanel toolsPanel = createToolsPanel();
@@ -175,7 +176,7 @@ public class VSSimulation extends JPanel {
public void stateChanged(ChangeEvent ce) {
AbstractButton abstractButton = (AbstractButton) ce.getSource();
ButtonModel buttonModel = abstractButton.getModel();
- simulationPanel.showLamport(buttonModel.isSelected());
+ simulationCanvas.showLamport(buttonModel.isSelected());
if (buttonModel.isSelected())
vectorTimeActiveCheckBox.setSelected(false);
}
@@ -188,7 +189,7 @@ public class VSSimulation extends JPanel {
public void stateChanged(ChangeEvent ce) {
AbstractButton abstractButton = (AbstractButton) ce.getSource();
ButtonModel buttonModel = abstractButton.getModel();
- simulationPanel.showVectorTime(buttonModel.isSelected());
+ simulationCanvas.showVectorTime(buttonModel.isSelected());
if (buttonModel.isSelected())
lamportActiveCheckBox.setSelected(false);
}
@@ -201,7 +202,7 @@ public class VSSimulation extends JPanel {
public void stateChanged(ChangeEvent ce) {
AbstractButton abstractButton = (AbstractButton) ce.getSource();
ButtonModel buttonModel = abstractButton.getModel();
- simulationPanel.isAntiAliased(buttonModel.isSelected());
+ simulationCanvas.isAntiAliased(buttonModel.isSelected());
}
});
toolsPanel.add(antiAliasing);
@@ -269,11 +270,11 @@ public class VSSimulation extends JPanel {
globalPIDComboBox = new JComboBox();
lastSelectedProcessNum = 0;
- int numProcesses = simulationPanel.getNumProcesses();
+ int numProcesses = simulationCanvas.getNumProcesses();
String processString = prefs.getString("lang.process");
for (int i = 0; i < numProcesses; ++i) {
- int pid = simulationPanel.getProcess(i).getProcessID();
+ int pid = simulationCanvas.getProcess(i).getProcessID();
processesComboBox.addItem(processString + " " + pid);
localPIDComboBox.addItem("PID: " + pid);
globalPIDComboBox.addItem("PID: " + pid);
@@ -701,7 +702,7 @@ public class VSSimulation extends JPanel {
String deactivate = prefs.getString("lang.deactivate");
String client = prefs.getString("lang.client");
String server = prefs.getString("lang.server");
- String protocolEventClassname = "events.implementations.ProtocolEvent";
+ String protocolEventClassname = "events.internal.ProtocolEvent";
for (String eventClassname : eventClassnames) {
String eventShortname_ = VSRegisteredEvents.getShortname(eventClassname);
@@ -772,12 +773,12 @@ public class VSSimulation extends JPanel {
} catch (NumberFormatException e) {
}
- return simulationPanel.getNumProcesses();
+ return simulationCanvas.getNumProcesses();
}
private VSProcess getSelectedProcess() {
int processNum = getSelectedProcessNum();
- return simulationPanel.getProcess(processNum);
+ return simulationCanvas.getProcess(processNum);
}
private ArrayList<VSProcess> getConcernedProcesses(boolean localTasks) {
@@ -785,11 +786,11 @@ public class VSSimulation extends JPanel {
? localPIDComboBox.getSelectedIndex()
: globalPIDComboBox.getSelectedIndex();
- if (processNum == simulationPanel.getNumProcesses())
- return simulationPanel.getProcessesArray();
+ if (processNum == simulationCanvas.getNumProcesses())
+ return simulationCanvas.getProcessesArray();
ArrayList<VSProcess> arr = new ArrayList<VSProcess>();
- arr.add(simulationPanel.getProcess(processNum));
+ arr.add(simulationCanvas.getProcess(processNum));
return arr;
}
@@ -817,8 +818,8 @@ public class VSSimulation extends JPanel {
return menuItemStates;
}
- public VSSimulationPanel getSimulationPanel() {
- return simulationPanel;
+ public VSSimulationCanvas getSimulationCanvas() {
+ return simulationCanvas;
}
public VSFrame getSimulatorFrame() {
diff --git a/sources/simulator/VSSimulationPanel.java b/sources/simulator/VSSimulationCanvas.java
index d501f22..37f5f51 100644
--- a/sources/simulator/VSSimulationPanel.java
+++ b/sources/simulator/VSSimulationCanvas.java
@@ -11,11 +11,12 @@ import core.*;
import core.time.*;
import events.*;
import events.implementations.*;
+import events.internal.*;
import prefs.*;
import prefs.editors.*;
import utils.*;
-public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionListener, MouseListener, HierarchyBoundsListener {
+public class VSSimulationCanvas extends Canvas implements Runnable, MouseMotionListener, MouseListener, HierarchyBoundsListener {
private VSProcess highlightedProcess;
private VSSimulation simulation;
private VSPrefs prefs;
@@ -152,7 +153,7 @@ public class VSSimulationPanel extends Canvas implements Runnable, MouseMotionLi
}
}
- public VSSimulationPanel(VSPrefs prefs, VSSimulation simulation, VSLogging logging) {
+ public VSSimulationCanvas(VSPrefs prefs, VSSimulation simulation, VSLogging logging) {
this.prefs = prefs;
this.simulation = simulation;
this.logging = logging;
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index 41fd196..e27f896 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -145,7 +145,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
public void stateChanged(ChangeEvent ce) {
JTabbedPane pane = (JTabbedPane) ce.getSource();
currentSimulation = (VSSimulation) pane.getSelectedComponent();
- currentSimulation.getSimulationPanel().paint();
+ currentSimulation.getSimulationCanvas().paint();
updateEditMenu();
updateSimulationMenu();
}
@@ -162,7 +162,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
return;
final String processString = prefs.getString("lang.process");
- final int numProcesses = currentSimulation.getSimulationPanel().getNumProcesses();
+ final int numProcesses = currentSimulation.getSimulationCanvas().getNumProcesses();
for (int i = 0; i < numProcesses; ++i) {
JMenuItem processItem = new JMenuItem(processString + " " + (i+1));
@@ -171,7 +171,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
final int finalProcessNum = i;
processItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
- currentSimulation.getSimulationPanel().editProcess(finalProcessNum);
+ currentSimulation.getSimulationCanvas().editProcess(finalProcessNum);
}
});
menuEdit.add(processItem);
@@ -189,7 +189,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
public void dispose() {
for (VSSimulation simulation : simulations)
- simulation.getSimulationPanel().stopThread();
+ simulation.getSimulationCanvas().stopThread();
super.dispose();
}
@@ -223,7 +223,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
menuItemState.setPause(true);
menuItemState.setReset(false);
menuItemState.setReplay(true);
- currentSimulation.getSimulationPanel().play();
+ currentSimulation.getSimulationCanvas().play();
updateSimulationMenu();
} else if (source.getText().equals(prefs.getString("lang.pause"))) {
@@ -232,7 +232,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
menuItemState.setPause(false);
menuItemState.setReset(true);
menuItemState.setReplay(true);
- currentSimulation.getSimulationPanel().pause();
+ currentSimulation.getSimulationCanvas().pause();
updateSimulationMenu();
} else if (source.getText().equals(prefs.getString("lang.reset"))) {
@@ -241,7 +241,7 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
menuItemState.setPause(false);
menuItemState.setReset(false);
menuItemState.setReplay(false);
- currentSimulation.getSimulationPanel().reset();
+ currentSimulation.getSimulationCanvas().reset();
updateSimulationMenu();
} else if (source.getText().equals(prefs.getString("lang.replay"))) {
@@ -250,8 +250,8 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
menuItemState.setPause(true);
menuItemState.setReset(false);
menuItemState.setReplay(true);
- currentSimulation.getSimulationPanel().reset();
- currentSimulation.getSimulationPanel().play();
+ currentSimulation.getSimulationCanvas().reset();
+ currentSimulation.getSimulationCanvas().play();
updateSimulationMenu();
}
}
@@ -271,6 +271,6 @@ public class VSSimulatorFrame extends VSFrame implements ActionListener {
VSSimulation simulationToRemove = currentSimulation;
simulations.remove(simulationToRemove);
tabbedPane.remove(simulationToRemove);
- simulationToRemove.getSimulationPanel().stopThread();
+ simulationToRemove.getSimulationCanvas().stopThread();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-12 20:40:25 +0000