summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sources/core/VSAbstractProcess.java9
-rw-r--r--sources/core/VSTaskManager.java24
-rw-r--r--sources/exceptions/VSEventNotCopyableException.java4
-rw-r--r--sources/exceptions/VSNegativeNumberException.java2
-rw-r--r--sources/exceptions/VSParseIntegerVectorException.java2
-rw-r--r--sources/prefs/VSPrefs.java6
-rw-r--r--sources/prefs/VSSerializablePrefs.java4
-rw-r--r--sources/protocols/implementations/VSExternalTimeSyncProtocol.java4
-rw-r--r--sources/protocols/implementations/VSInternalTimeSyncProtocol.java6
-rw-r--r--sources/protocols/implementations/VSOnePhaseCommitProtocol.java2
-rw-r--r--sources/protocols/implementations/VSReliableMulticastProtocol.java2
-rw-r--r--sources/protocols/implementations/VSTwoPhaseCommitProtocol.java6
-rw-r--r--sources/serialize/VSSerialize.java8
-rw-r--r--sources/simulator/VSLogging.java4
-rw-r--r--sources/simulator/VSMain.java2
-rw-r--r--sources/simulator/VSSimulator.java25
-rw-r--r--sources/simulator/VSSimulatorVisualization.java4
17 files changed, 64 insertions, 50 deletions
diff --git a/sources/core/VSAbstractProcess.java b/sources/core/VSAbstractProcess.java
index 26fb2db..c46194f 100644
--- a/sources/core/VSAbstractProcess.java
+++ b/sources/core/VSAbstractProcess.java
@@ -214,7 +214,8 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
* @param loging the loging object
*/
protected void init(VSPrefs prefs, int processNum,
- VSSimulatorVisualization simulatorVisualization, VSLogging loging) {
+ VSSimulatorVisualization simulatorVisualization,
+ VSLogging loging) {
/* May be not null if called from deserialization */
if (this.protocolsToReset == null)
this.protocolsToReset = new ArrayList<VSAbstractProtocol>();
@@ -430,9 +431,9 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs
/* Check if the process will crash or not */
if (getRandomPercentage() < getInteger("process.prob.crash")) {
/* Calculate the random crash time! */
- final long crashTime = random.nextLong(
- simulatorVisualization.getUntilTime()+1) %
- simulatorVisualization.getUntilTime();
+ final long crashTime =
+ random.nextLong(simulatorVisualization.getUntilTime()+1) %
+ simulatorVisualization.getUntilTime();
return crashTime;
}
diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java
index 17caba7..2dc724c 100644
--- a/sources/core/VSTaskManager.java
+++ b/sources/core/VSTaskManager.java
@@ -66,7 +66,8 @@ public class VSTaskManager implements VSSerializable {
* @param prefs the simulator's default prefs
* @param simulatorVisualization the simulator canvas
*/
- public VSTaskManager(VSPrefs prefs, VSSimulatorVisualization simulatorVisualization) {
+ public VSTaskManager(VSPrefs prefs,
+ VSSimulatorVisualization simulatorVisualization) {
init(prefs, simulatorVisualization);
}
@@ -76,7 +77,8 @@ public class VSTaskManager implements VSSerializable {
* @param prefs the simulator's default prefs
* @param simulatorVisualization the simulator canvas
*/
- private void init(VSPrefs prefs, VSSimulatorVisualization simulatorVisualization) {
+ private void init(VSPrefs prefs,
+ VSSimulatorVisualization simulatorVisualization) {
this.prefs = prefs;
this.simulatorVisualization = simulatorVisualization;
@@ -104,7 +106,8 @@ public class VSTaskManager implements VSSerializable {
long globalTime;
final long globalOffsetTime = lastGlobalTime + step;
boolean redo;
- ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
+ ArrayList<VSInternalProcess> processes =
+ simulatorVisualization.getProcesses();
do {
redo = false;
@@ -232,7 +235,8 @@ public class VSTaskManager implements VSSerializable {
* Resets the task manager.
*/
public synchronized void reset() {
- ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
+ ArrayList<VSInternalProcess> processes =
+ simulatorVisualization.getProcesses();
PriorityQueue<VSTask> tmp = null;
synchronized (processes) {
@@ -366,7 +370,8 @@ public class VSTaskManager implements VSSerializable {
*/
public synchronized ArrayList<VSTask> getLocalTasks() {
ArrayList<VSTask> localTasks = new ArrayList<VSTask>();
- ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
+ ArrayList<VSInternalProcess> processes =
+ simulatorVisualization.getProcesses();
for (VSTask task : fullfilledProgrammedTasks)
if (!task.isGlobalTimed())
@@ -476,7 +481,8 @@ public class VSTaskManager implements VSSerializable {
buffer.append(prefs.getString("lang.tasks.local"));
buffer.append(": ");
- ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
+ ArrayList<VSInternalProcess> processes =
+ simulatorVisualization.getProcesses();
synchronized (processes) {
for (VSInternalProcess process : processes) {
VSPriorityQueue<VSTask> tasks = process.getTasks();
@@ -517,7 +523,8 @@ public class VSTaskManager implements VSSerializable {
serializeThoseTasks.add(task);
}
- ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
+ ArrayList<VSInternalProcess> processes =
+ simulatorVisualization.getProcesses();
synchronized (processes) {
for (VSInternalProcess process : processes) {
@@ -554,7 +561,8 @@ public class VSTaskManager implements VSSerializable {
globalTasks.clear();
- ArrayList<VSInternalProcess> processes = simulatorVisualization.getProcesses();
+ ArrayList<VSInternalProcess> processes =
+ simulatorVisualization.getProcesses();
synchronized (processes) {
for (VSInternalProcess process : processes)
process.getTasks().clear();
diff --git a/sources/exceptions/VSEventNotCopyableException.java b/sources/exceptions/VSEventNotCopyableException.java
index 44d1960..643339c 100644
--- a/sources/exceptions/VSEventNotCopyableException.java
+++ b/sources/exceptions/VSEventNotCopyableException.java
@@ -30,9 +30,9 @@ package exceptions;
* @author Paul C. Buetow
*/
public class VSEventNotCopyableException extends Exception {
- /** The serial version uid */
+ /** The serial version uid */
private static final long serialVersionUID = 1L;
-
+
public VSEventNotCopyableException(String descr) {
super(descr);
}
diff --git a/sources/exceptions/VSNegativeNumberException.java b/sources/exceptions/VSNegativeNumberException.java
index a30a385..fdfe530 100644
--- a/sources/exceptions/VSNegativeNumberException.java
+++ b/sources/exceptions/VSNegativeNumberException.java
@@ -30,6 +30,6 @@ package exceptions;
* @author Paul C. Buetow
*/
public class VSNegativeNumberException extends Exception {
- /** The serial version uid */
+ /** The serial version uid */
private static final long serialVersionUID = 1L;
}
diff --git a/sources/exceptions/VSParseIntegerVectorException.java b/sources/exceptions/VSParseIntegerVectorException.java
index d8fe4cf..1344192 100644
--- a/sources/exceptions/VSParseIntegerVectorException.java
+++ b/sources/exceptions/VSParseIntegerVectorException.java
@@ -31,6 +31,6 @@ package exceptions;
* @author Paul C. Buetow
*/
public class VSParseIntegerVectorException extends Exception {
- /** The serial version uid */
+ /** The serial version uid */
private static final long serialVersionUID = 1L;
}
diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java
index 995f18e..f5e68f3 100644
--- a/sources/prefs/VSPrefs.java
+++ b/sources/prefs/VSPrefs.java
@@ -914,8 +914,8 @@ public class VSPrefs {
* @see serialize.VSSerializable#serialize(serialize.VSSerialize,
* java.io.ObjectOutputStream)
*/
- protected synchronized void serialize_(VSSerialize serialize,
- ObjectOutputStream objectOutputStream)
+ protected synchronized void serialize_(
+ VSSerialize serialize, ObjectOutputStream objectOutputStream)
throws IOException {
/** For later backwards compatibility, to add more stuff */
objectOutputStream.writeObject(new Boolean(false));
@@ -941,7 +941,7 @@ public class VSPrefs {
*/
@SuppressWarnings("unchecked")
protected synchronized void deserialize_(VSSerialize serialize,
- ObjectInputStream objectInputStream)
+ ObjectInputStream objectInputStream)
throws IOException, ClassNotFoundException {
objectPrefs.clear();
diff --git a/sources/prefs/VSSerializablePrefs.java b/sources/prefs/VSSerializablePrefs.java
index ccb5aab..66a2c83 100644
--- a/sources/prefs/VSSerializablePrefs.java
+++ b/sources/prefs/VSSerializablePrefs.java
@@ -44,7 +44,7 @@ public class VSSerializablePrefs extends VSPrefs implements VSSerializable {
public synchronized void serialize(VSSerialize serialize,
ObjectOutputStream objectOutputStream)
throws IOException {
- super.serialize_(serialize, objectOutputStream);
+ super.serialize_(serialize, objectOutputStream);
}
/* (non-Javadoc)
@@ -55,6 +55,6 @@ public class VSSerializablePrefs extends VSPrefs implements VSSerializable {
public synchronized void deserialize(VSSerialize serialize,
ObjectInputStream objectInputStream)
throws IOException, ClassNotFoundException {
- super.deserialize_(serialize, objectInputStream);
+ super.deserialize_(serialize, objectInputStream);
}
}
diff --git a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
index 0e73ac3..3bb5eb9 100644
--- a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
@@ -93,8 +93,8 @@ public class VSExternalTimeSyncProtocol extends VSAbstractProtocol {
long newTime = serverTime + (long) (roundTripTime / 2);
log("Server Zeit: " + serverTime + "; RTT: " + roundTripTime +
- "; Alte Zeit: " + recvTime + "; Neue Zeit: " + newTime +
- "; Offset: " + (newTime - recvTime));
+ "; Alte Zeit: " + recvTime + "; Neue Zeit: " + newTime +
+ "; Offset: " + (newTime - recvTime));
process.setTime(newTime);
}
diff --git a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
index 6f82203..c52b0ed 100644
--- a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
@@ -93,9 +93,9 @@ public class VSInternalTimeSyncProtocol extends VSAbstractProtocol {
long newTime = serverTime + (long) ((tMax + tMin) / 2 );
log("Server Zeit: " + serverTime + "; (t_min,t_max): (" + tMin +
- "," + tMax + "); Alte Zeit: " + process.getTime() +
- "; Neue Zeit: " + newTime + "; Offset: " +
- (process.getTime() - newTime));
+ "," + tMax + "); Alte Zeit: " + process.getTime() +
+ "; Neue Zeit: " + newTime + "; Offset: " +
+ (process.getTime() - newTime));
process.setTime(newTime);
}
diff --git a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
index aa1f6ed..feb4dd5 100644
--- a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
@@ -111,7 +111,7 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol {
if (pids.size() == 0) {
log("ACKs von allen beteiligten Prozessen erhalten! " +
- "Festgeschrieben!");
+ "Festgeschrieben!");
/* Remove the active schedule which has been created in the
onServerStart method */
diff --git a/sources/protocols/implementations/VSReliableMulticastProtocol.java b/sources/protocols/implementations/VSReliableMulticastProtocol.java
index 9cfb04c..23f5857 100644
--- a/sources/protocols/implementations/VSReliableMulticastProtocol.java
+++ b/sources/protocols/implementations/VSReliableMulticastProtocol.java
@@ -108,7 +108,7 @@ public class VSReliableMulticastProtocol extends VSAbstractProtocol {
if (pids.size() == 0) {
log("ACKs von allen beteiligten Prozessen " +
- "erhalten!");
+ "erhalten!");
/* Remove the active schedule which has been created in the
onClientStart method */
diff --git a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
index b783b53..2a0a4f2 100644
--- a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
@@ -129,14 +129,14 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol {
boolean vote = recvMessage.getBoolean("vote");
log("Abstimmung von Prozess " + pid +
- " erhalten! Ergebnis: " + vote);
+ " erhalten! Ergebnis: " + vote);
if (!vote)
voteResult = false;
if (votePids.size() == 0) {
log("Abstimmungen von allen beteiligten Prozessen " +
- "erhalten! Globales Ergebnis: " + voteResult);
+ "erhalten! Globales Ergebnis: " + voteResult);
/* Remove the active schedule which has been created in the
onServerStart method */
@@ -207,7 +207,7 @@ public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol {
} else if (recvMessage.getBoolean("isVoteResult")) {
boolean voteResult = recvMessage.getBoolean("voteResult");
log("Globales Abstimmungsergebnis erhalten. Ergebnis: " +
- voteResult);
+ voteResult);
VSMessage message = new VSMessage();
message.setBoolean("isAck", true);
diff --git a/sources/serialize/VSSerialize.java b/sources/serialize/VSSerialize.java
index e1e1bb3..8dfd890 100644
--- a/sources/serialize/VSSerialize.java
+++ b/sources/serialize/VSSerialize.java
@@ -173,8 +173,8 @@ public final class VSSerialize {
ObjectOutputStream objectOutputStream =
new ObjectOutputStream(fileOutputStream);
- VSSerializablePrefs prefs = (VSSerializablePrefs)
- simulator.getPrefs();
+ VSSerializablePrefs prefs = (VSSerializablePrefs)
+ simulator.getPrefs();
prefs.serialize(this, objectOutputStream);
simulator.serialize(this, objectOutputStream);
@@ -197,7 +197,7 @@ public final class VSSerialize {
String saveText = prefs.getString("lang.save");
JFileChooser fileChooser = new JFileChooser(
- new File(".").getPath());
+ new File(".").getPath());
fileChooser.setMultiSelectionEnabled(false);
fileChooser.addChoosableFileFilter(createFileFilter(prefs));
fileChooser.setApproveButtonText(saveText);
@@ -261,7 +261,7 @@ public final class VSSerialize {
String openText = prefs.getString("lang.open");
JFileChooser fileChooser = new JFileChooser(
- new File(".").getPath());
+ new File(".").getPath());
fileChooser.setMultiSelectionEnabled(false);
fileChooser.addChoosableFileFilter(createFileFilter(prefs));
fileChooser.setApproveButtonText(openText);
diff --git a/sources/simulator/VSLogging.java b/sources/simulator/VSLogging.java
index 2eb9ae7..41fe8e1 100644
--- a/sources/simulator/VSLogging.java
+++ b/sources/simulator/VSLogging.java
@@ -83,8 +83,8 @@ public class VSLogging {
*
* @param simulatorVisualization the simulator canvas
*/
- public void setSimulatorCanvas(VSSimulatorVisualization simulatorVisualization) {
- this.simulatorVisualization = simulatorVisualization;
+ public void setSimulatorCanvas(VSSimulatorVisualization sv) {
+ this.simulatorVisualization = sv;
}
/**
diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java
index eab2e4a..661084c 100644
--- a/sources/simulator/VSMain.java
+++ b/sources/simulator/VSMain.java
@@ -68,7 +68,7 @@ public class VSMain {
*/
private void init(VSPrefs prefs, Component relativeTo) {
//VSSimulatorFrame simulatorFrame =
- new VSSimulatorFrame(prefs, relativeTo);
+ new VSSimulatorFrame(prefs, relativeTo);
}
/**
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 542df3e..02a8741 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -48,7 +48,7 @@ import serialize.*;
* @author Paul C. Buetow
*/
public class VSSimulator extends JPanel implements VSSerializable {
- /** The serial version uid */
+ /** The serial version uid */
private static final long serialVersionUID = 1L;
/** The global text fields. */
@@ -203,7 +203,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
//private JTable table;
/** The editor. */
- //private VSTaskManagerCellEditor editor;
+ //private VSTaskManagerCellEditor editor;
/**
* Instantiates a new VSTaskManagerTableModel object
@@ -229,7 +229,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
* @param table the table
*/
public void setTable(JTable table) {
- /* Maybe needed for future usage */
+ /* Maybe needed for future usage */
//this.table = table;
}
@@ -239,7 +239,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
* @param editor the editor
*/
public void setEditor(VSTaskManagerCellEditor editor) {
- /* Maybe needed for future usage */
+ /* Maybe needed for future usage */
//this.editor = editor;
}
@@ -656,7 +656,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
/* Not null if init has been called from the deserialization */
if (this.simulatorVisualization == null)
- simulatorVisualization = new VSSimulatorVisualization(prefs, this, loging);
+ simulatorVisualization = new VSSimulatorVisualization(
+ prefs, this, loging);
taskManager = simulatorVisualization.getTaskManager();
loging.setSimulatorCanvas(simulatorVisualization);
@@ -724,7 +725,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
AbstractButton abstractButton =
(AbstractButton) ce.getSource();
ButtonModel buttonModel = abstractButton.getModel();
- simulatorVisualization.showLamport(buttonModel.isSelected());
+ simulatorVisualization.showLamport(
+ buttonModel.isSelected());
if (buttonModel.isSelected())
vectorTimeActiveCheckBox.setSelected(false);
}
@@ -739,7 +741,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
AbstractButton abstractButton =
(AbstractButton) ce.getSource();
ButtonModel buttonModel = abstractButton.getModel();
- simulatorVisualization.showVectorTime(buttonModel.isSelected());
+ simulatorVisualization.showVectorTime(
+ buttonModel.isSelected());
if (buttonModel.isSelected())
lamportActiveCheckBox.setSelected(false);
}
@@ -754,7 +757,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
AbstractButton abstractButton =
(AbstractButton) ce.getSource();
ButtonModel buttonModel = abstractButton.getModel();
- simulatorVisualization.isAntiAliased(buttonModel.isSelected());
+ simulatorVisualization.isAntiAliased(
+ buttonModel.isSelected());
}
});
toolsPanel.add(antiAliasing);
@@ -1034,7 +1038,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
final JComboBox comboBox = new JComboBox();
JButton takeoverButton = new JButton(prefs.getString("lang.takeover"));
- takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
+ takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
takeoverButton.addActionListener(new ActionListener() {
private boolean isRed;
public void actionPerformed(ActionEvent ae) {
@@ -1463,7 +1467,8 @@ public class VSSimulator extends JPanel implements VSSerializable {
tabbedPane.setSelectedIndex(selectedIndex);
/* Update the 'Variables tab' */
- if (getSelectedProcessNum() != simulatorVisualization.getNumProcesses()) {
+ if (getSelectedProcessNum() !=
+ simulatorVisualization.getNumProcesses()) {
VSInternalProcess process = getSelectedProcess();
VSProcessEditor editor = new VSProcessEditor(prefs, process);
tabbedPane.setComponentAt(1, editor.getContentPane());
diff --git a/sources/simulator/VSSimulatorVisualization.java b/sources/simulator/VSSimulatorVisualization.java
index a9b74a4..ab39e65 100644
--- a/sources/simulator/VSSimulatorVisualization.java
+++ b/sources/simulator/VSSimulatorVisualization.java
@@ -475,7 +475,7 @@ public class VSSimulatorVisualization extends Canvas
* @param loging the loging
*/
public VSSimulatorVisualization(VSPrefs prefs, VSSimulator simulator,
- VSLogging loging) {
+ VSLogging loging) {
init(prefs, simulator, loging);
}
@@ -1467,7 +1467,7 @@ public class VSSimulatorVisualization extends Canvas
VSTask task = null;
VSAbstractEvent receiveEvent = null;
VSInternalProcess sendingProcess = (VSInternalProcess)
- message.getSendingProcess();
+ message.getSendingProcess();
long deliverTime, outageTime, durationTime;
boolean recvOwn = prefs.getBoolean("sim.message.own.recv");
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-17 12:48:55 +0000