some cleanup

5 files changed, 25 insertions, 29 deletions

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