diff options
23 files changed, 60 insertions, 55 deletions
diff --git a/sources/core/VSAbstractProcess.java b/sources/core/VSAbstractProcess.java index 2587a1b..26fb2db 100644 --- a/sources/core/VSAbstractProcess.java +++ b/sources/core/VSAbstractProcess.java @@ -28,8 +28,8 @@ import java.io.*; import java.util.*; import core.time.*; -import events.*; -import events.implementations.*; +//import events.*; +//import events.implementations.*; import prefs.*; import protocols.*; import serialize.*; diff --git a/sources/core/VSInternalProcess.java b/sources/core/VSInternalProcess.java index e672c13..2ccc494 100644 --- a/sources/core/VSInternalProcess.java +++ b/sources/core/VSInternalProcess.java @@ -24,15 +24,15 @@ package core; import java.awt.*; -import java.io.*; -import java.util.*; +//import java.io.*; +//import java.util.*; import core.time.*; import events.*; import events.implementations.*; import prefs.*; import protocols.*; -import serialize.*; +//import serialize.*; import simulator.*; import utils.*; diff --git a/sources/core/VSMessageStub.java b/sources/core/VSMessageStub.java index b320fa0..0210b74 100644 --- a/sources/core/VSMessageStub.java +++ b/sources/core/VSMessageStub.java @@ -23,9 +23,9 @@ package core; -import core.time.*; -import events.*; -import prefs.VSPrefs; +//import core.time.*; +//import events.*; +//import prefs.VSPrefs; /** * An object of this class represents a message stub. A message stub allows diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java index 6fc56d7..12a7dbb 100644 --- a/sources/core/VSTask.java +++ b/sources/core/VSTask.java @@ -32,7 +32,7 @@ import exceptions.*; import prefs.VSPrefs; import protocols.VSAbstractProtocol; import serialize.*; -import utils.*; +//import utils.*; /** * The class VSTask, an object of this class represents a task to do or done. @@ -351,9 +351,11 @@ public class VSTask implements Comparable, VSSerializable { * * @param message the message to log */ + /* private void log(String message) { process.log(message); } + */ /* (non-Javadoc) * @see java.lang.Object#toString() diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java index a944457..a9399eb 100644 --- a/sources/events/VSAbstractEvent.java +++ b/sources/events/VSAbstractEvent.java @@ -30,7 +30,7 @@ import core.VSInternalProcess; import exceptions.*; import prefs.*; import serialize.*; -import utils.*; +//import utils.*; /** * The class VSAbstractEvent. This abstract class defines the basic framework diff --git a/sources/events/VSRegisteredEvents.java b/sources/events/VSRegisteredEvents.java index edb1e31..37f11f4 100644 --- a/sources/events/VSRegisteredEvents.java +++ b/sources/events/VSRegisteredEvents.java @@ -71,7 +71,7 @@ public final class VSRegisteredEvents { new HashMap<String,Boolean>(); /** The prefs. */ - private static VSPrefs prefs; + //private static VSPrefs prefs; /** * Registers available events. @@ -79,7 +79,7 @@ public final class VSRegisteredEvents { * @param prefs_ the prefs_ */ public static void init(VSPrefs prefs_) { - prefs = prefs_; + //prefs = prefs_; registerEvent("events.implementations.VSProcessCrashEvent", "Prozessabsturz"); diff --git a/sources/events/internal/VSMessageReceiveEvent.java b/sources/events/internal/VSMessageReceiveEvent.java index 6bedc76..9aed81f 100644 --- a/sources/events/internal/VSMessageReceiveEvent.java +++ b/sources/events/internal/VSMessageReceiveEvent.java @@ -23,7 +23,7 @@ package events.internal; -import java.io.*; +//import java.io.*; import core.VSMessage; import protocols.VSAbstractProtocol; @@ -66,7 +66,7 @@ public class VSMessageReceiveEvent extends VSAbstractInternalEvent boolean onlyRelevantMessages = process.getPrefs().getBoolean( "sim.messages.relevant"); - String eventName = message.getName(); + //String eventName = message.getName(); String protocolClassname = message.getProtocolClassname(); if (onlyRelevantMessages && !isRelevantMessage()) diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java index c2a603f..39f5fdd 100644 --- a/sources/events/internal/VSProtocolEvent.java +++ b/sources/events/internal/VSProtocolEvent.java @@ -29,7 +29,7 @@ import core.VSInternalProcess; import events.*; import protocols.VSAbstractProtocol; import serialize.VSSerialize; -import simulator.VSSimulatorVisualization; +//import simulator.VSSimulatorVisualization; /** * The class VSProtocolEvent, this event is used if a protocol (server or diff --git a/sources/events/internal/VSProtocolScheduleEvent.java b/sources/events/internal/VSProtocolScheduleEvent.java index bab0a63..83b5505 100644 --- a/sources/events/internal/VSProtocolScheduleEvent.java +++ b/sources/events/internal/VSProtocolScheduleEvent.java @@ -25,7 +25,7 @@ package events.internal; import java.io.*; -import events.*; +//import events.*; import protocols.VSAbstractProtocol; import serialize.*; diff --git a/sources/exceptions/VSEventNotCopyableException.java b/sources/exceptions/VSEventNotCopyableException.java index 9437090..44d1960 100644 --- a/sources/exceptions/VSEventNotCopyableException.java +++ b/sources/exceptions/VSEventNotCopyableException.java @@ -30,6 +30,9 @@ package exceptions; * @author Paul C. Buetow */ public class VSEventNotCopyableException extends Exception { + /** 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 ea6073c..a30a385 100644 --- a/sources/exceptions/VSNegativeNumberException.java +++ b/sources/exceptions/VSNegativeNumberException.java @@ -30,4 +30,6 @@ package exceptions; * @author Paul C. Buetow */ public class VSNegativeNumberException extends Exception { + /** The serial version uid */ + private static final long serialVersionUID = 1L; } diff --git a/sources/exceptions/VSParseIntegerVectorException.java b/sources/exceptions/VSParseIntegerVectorException.java index 3aabe87..d8fe4cf 100644 --- a/sources/exceptions/VSParseIntegerVectorException.java +++ b/sources/exceptions/VSParseIntegerVectorException.java @@ -31,4 +31,6 @@ package exceptions; * @author Paul C. Buetow */ public class VSParseIntegerVectorException extends Exception { + /** The serial version uid */ + private static final long serialVersionUID = 1L; } diff --git a/sources/prefs/VSSerializablePrefs.java b/sources/prefs/VSSerializablePrefs.java index 5282e5c..ccb5aab 100644 --- a/sources/prefs/VSSerializablePrefs.java +++ b/sources/prefs/VSSerializablePrefs.java @@ -24,7 +24,7 @@ package prefs; import java.io.*; -import java.util.*; +//import java.util.*; import serialize.*; diff --git a/sources/prefs/editors/VSAbstractBetterEditor.java b/sources/prefs/editors/VSAbstractBetterEditor.java index 9092e3e..9df7f78 100644 --- a/sources/prefs/editors/VSAbstractBetterEditor.java +++ b/sources/prefs/editors/VSAbstractBetterEditor.java @@ -28,7 +28,7 @@ import java.awt.event.*; import javax.swing.*; import prefs.*; -import utils.*; +//import utils.*; /** * The class VSAbstractBetterEditor, is an improved VSAbstractEditor. @@ -94,7 +94,7 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor { JPanel editPanel = getEditPanel(); JPanel buttonPanel = getButtonPanel(); - JScrollPane scrollPane = new JScrollPane(editPanel); + //JScrollPane scrollPane = new JScrollPane(editPanel); panel.add(editPanel); //panel.add(infoArea); panel.add(buttonPanel); diff --git a/sources/prefs/editors/VSEditorTable.java b/sources/prefs/editors/VSEditorTable.java index bb171dd..246bd8e 100644 --- a/sources/prefs/editors/VSEditorTable.java +++ b/sources/prefs/editors/VSEditorTable.java @@ -26,7 +26,7 @@ package prefs.editors; import java.util.*; import java.awt.*; -import java.io.*; +//import java.io.*; import javax.swing.*; import javax.swing.table.*; import javax.swing.text.*; @@ -44,10 +44,10 @@ public class VSEditorTable extends JTable { private static final long serialVersionUID = 1L; /** The Constant MIN_ROWS. */ - private static final int MIN_ROWS = 20; + //private static final int MIN_ROWS = 20; /** The prefs. */ - private VSPrefs prefs; + //private VSPrefs prefs; /** The nodes. */ private ArrayList<VSNode> nodes; @@ -267,7 +267,7 @@ public class VSEditorTable extends JTable { * @param prefs the prefs */ public VSEditorTable(VSPrefs prefs) { - this.prefs = prefs; + //this.prefs = prefs; this.nodes = new ArrayList<VSNode>(); this.model = new VSEditorTableModel(); setModel(model); diff --git a/sources/protocols/VSAbstractProtocol.java b/sources/protocols/VSAbstractProtocol.java index b4a65c6..ead58b7 100644 --- a/sources/protocols/VSAbstractProtocol.java +++ b/sources/protocols/VSAbstractProtocol.java @@ -31,7 +31,7 @@ import events.*; import events.internal.*; import serialize.*; import simulator.VSSimulatorVisualization; -import utils.*; +//import utils.*; /** * The class VSAbstractProtocol, this class defined the basic framework of a diff --git a/sources/protocols/implementations/VSBerkelyTimeProtocol.java b/sources/protocols/implementations/VSBerkelyTimeProtocol.java index 1b8b6fc..1b69b72 100644 --- a/sources/protocols/implementations/VSBerkelyTimeProtocol.java +++ b/sources/protocols/implementations/VSBerkelyTimeProtocol.java @@ -206,7 +206,7 @@ public class VSBerkelyTimeProtocol extends VSAbstractProtocol { return; long timeDiff = recvMessage.getLong("timeDiff"); - long recvTime = process.getTime(); + //long recvTime = process.getTime(); long newTime = process.getTime() + timeDiff; log("Neue Zeit: " + newTime); diff --git a/sources/simulator/VSCreateTask.java b/sources/simulator/VSCreateTask.java index 346263d..260980a 100644 --- a/sources/simulator/VSCreateTask.java +++ b/sources/simulator/VSCreateTask.java @@ -36,7 +36,7 @@ import events.internal.*; */ public class VSCreateTask { /** the serial version uid */ - private static final long serialversionuid = 1l; + private static final long serialVersionUID = 1L; /** The event classname. */ private String eventClassname; diff --git a/sources/simulator/VSMain.java b/sources/simulator/VSMain.java index aaddea9..eab2e4a 100644 --- a/sources/simulator/VSMain.java +++ b/sources/simulator/VSMain.java @@ -29,7 +29,7 @@ import javax.swing.*; import events.*; import prefs.*; -import prefs.editors.*; +//import prefs.editors.*; /** * The class VSMain. This class contains the static main method. The simulator @@ -67,14 +67,8 @@ public class VSMain { * @param relativeTo the component to open the window relative to */ private void init(VSPrefs prefs, Component relativeTo) { - VSSimulatorFrame simulatorFrame = - new VSSimulatorFrame(prefs, relativeTo); - /* - VSSimulatorEditor editor = - new VSSimulatorEditor(prefs, simulatorFrame, - VSSimulatorEditor.OPENED_NEW_WINDOW); - new VSEditorFrame(prefs, relativeTo, editor); - */ + //VSSimulatorFrame simulatorFrame = + new VSSimulatorFrame(prefs, relativeTo); } /** diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java index d1603ff..542df3e 100644 --- a/sources/simulator/VSSimulator.java +++ b/sources/simulator/VSSimulator.java @@ -33,12 +33,12 @@ import javax.swing.table.*; import core.*; import events.*; -import events.internal.*; +//import events.internal.*; import exceptions.*; import prefs.*; import prefs.editors.*; import serialize.*; -import utils.*; +//import utils.*; /** * The class VSSimulator, an object of this class represents a whole simulator. @@ -48,8 +48,8 @@ import utils.*; * @author Paul C. Buetow */ public class VSSimulator extends JPanel implements VSSerializable { - /** the serial version uid */ - private static final long serialversionuid = 1l; + /** The serial version uid */ + private static final long serialVersionUID = 1L; /** The global text fields. */ private ArrayList<String> globalTextFields; @@ -79,7 +79,7 @@ public class VSSimulator extends JPanel implements VSSerializable { private JComboBox processesComboBox; /** The global add panel. */ - private JPanel globalAddPanel; + //private JPanel globalAddPanel; /** The local add panel. */ private JPanel localAddPanel; @@ -91,7 +91,7 @@ public class VSSimulator extends JPanel implements VSSerializable { private JPanel logingPanel; /** The tools panel. */ - private JPanel toolsPanel; + //private JPanel toolsPanel; /** The split pane1. */ private JSplitPane splitPane1; @@ -151,7 +151,7 @@ public class VSSimulator extends JPanel implements VSSerializable { private VSTaskManagerCellEditor taskManagerLocalEditor; /** The simulator has started. */ - private boolean hasStarted = false; + //private boolean hasStarted = false; /** The last selected process num. */ private int lastSelectedProcessNum; @@ -173,7 +173,7 @@ public class VSSimulator extends JPanel implements VSSerializable { private class VSTaskManagerTableModel extends AbstractTableModel implements MouseListener { /** the serial version uid */ - private static final long serialversionuid = 1l; + private static final long serialVersionUID = 1l; /** The Constant LOCAL. */ public static final boolean LOCAL = true; @@ -200,10 +200,10 @@ public class VSSimulator extends JPanel implements VSSerializable { private int numColumns; /** The table. */ - private JTable table; + //private JTable table; /** The editor. */ - private VSTaskManagerCellEditor editor; + //private VSTaskManagerCellEditor editor; /** * Instantiates a new VSTaskManagerTableModel object @@ -229,7 +229,8 @@ public class VSSimulator extends JPanel implements VSSerializable { * @param table the table */ public void setTable(JTable table) { - this.table = table; + /* Maybe needed for future usage */ + //this.table = table; } /** @@ -238,7 +239,8 @@ public class VSSimulator extends JPanel implements VSSerializable { * @param editor the editor */ public void setEditor(VSTaskManagerCellEditor editor) { - this.editor = editor; + /* Maybe needed for future usage */ + //this.editor = editor; } /** @@ -409,8 +411,8 @@ public class VSSimulator extends JPanel implements VSSerializable { */ public void mouseClicked(MouseEvent me) { final JTable source = (JTable) me.getSource(); - final int row = source.rowAtPoint(me.getPoint()); - final int col = source.columnAtPoint(me.getPoint()); + //final int row = source.rowAtPoint(me.getPoint()); + //final int col = source.columnAtPoint(me.getPoint()); if (SwingUtilities.isRightMouseButton(me)) { ActionListener actionListener = new ActionListener() { @@ -474,7 +476,7 @@ public class VSSimulator extends JPanel implements VSSerializable { private class VSTaskManagerCellEditor extends AbstractCellEditor implements TableCellEditor { /** the serial version uid */ - private static final long serialversionuid = 1l; + private static final long serialVersionUID = 1L; /** The JTable model */ private VSTaskManagerTableModel model; @@ -948,7 +950,7 @@ public class VSSimulator extends JPanel implements VSSerializable { if (localTasks) localAddPanel = initAddPanel(panel, localTasks); else - globalAddPanel = initAddPanel(panel, localTasks); + /*globalAddPanel = */ initAddPanel(panel, localTasks); return panel; } diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java index 813e04c..ed319d5 100644 --- a/sources/simulator/VSSimulatorFrame.java +++ b/sources/simulator/VSSimulatorFrame.java @@ -24,7 +24,7 @@ package simulator; import java.awt.*; import java.awt.event.*; -import java.io.*; +//import java.io.*; import java.util.*; import javax.swing.*; import javax.swing.event.*; @@ -443,7 +443,7 @@ public class VSSimulatorFrame extends VSFrame { ArrayList<VSInternalProcess> arr = currentSimulator.getSimulatorCanvas().getProcessesArray(); - int numProcesses = arr.size(); + //int numProcesses = arr.size(); int processNum = 0; for (VSInternalProcess process : arr) { diff --git a/sources/simulator/VSSimulatorVisualization.java b/sources/simulator/VSSimulatorVisualization.java index aa92c00..a9b74a4 100644 --- a/sources/simulator/VSSimulatorVisualization.java +++ b/sources/simulator/VSSimulatorVisualization.java @@ -38,7 +38,7 @@ import events.internal.*; import prefs.*; import prefs.editors.*; import serialize.*; -import utils.*; +//import utils.*; /** * The class VSSimulatorVisualization. An instance of this object represents the diff --git a/sources/utils/VSAboutFrame.java b/sources/utils/VSAboutFrame.java index 48d1515..2902de1 100644 --- a/sources/utils/VSAboutFrame.java +++ b/sources/utils/VSAboutFrame.java @@ -28,7 +28,7 @@ import java.awt.event.*; import javax.swing.*; import prefs.*; -import utils.*; +//import utils.*; /** * The class VSAboutFrame. This class is only for the about window which |