bugfixes in VSTaskManagerCellEditor

and the cell for the PID has a bigger width.

3 files changed, 10 insertions, 10 deletions

diff --git a/ROADMAP b/ROADMAP
index 8531048..753e296 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -1,4 +1,3 @@
-bugfix: PID table col width
 Must do:
 	Warn if a file does not exists while trying to open!
 	Reliable Multicast
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 8795c43..24eda16 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -548,7 +548,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                 comboBox.addActionListener(new ActionListener() {
                     public void actionPerformed(ActionEvent ae) {
                         int index = comboBox.getSelectedIndex() - 1;
-                        if (model.rowExists(index)) {
+                        if (model.rowExists(row)) {
                             VSTask task = model.removeTaskAtRow(row);
                             VSProcess process =
                                 simulatorCanvas.getProcess(index);
@@ -979,7 +979,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         col.setResizable(false);
 
         col = table.getColumnModel().getColumn(1);
-        col.setMaxWidth(23);
+        col.setMaxWidth(40);
         col.setResizable(false);
 
         col = table.getColumnModel().getColumn(2);
diff --git a/sources/simulator/VSSimulatorCanvas.java b/sources/simulator/VSSimulatorCanvas.java
index e53ecbf..6c86d66 100644
--- a/sources/simulator/VSSimulatorCanvas.java
+++ b/sources/simulator/VSSimulatorCanvas.java
@@ -555,12 +555,15 @@ public class VSSimulatorCanvas extends Canvas
                     };
 
                     JPopupMenu popup = new JPopupMenu();
-                    JMenuItem item = new JMenuItem(
+                    JMenuItem item = null;
+					if (process != null) {
+                    item = new JMenuItem(
                         finalPrefs.getString("lang.process.selected") +
                         ": " + process.getProcessID());
                     item.setEnabled(false);
                     popup.add(item);
                     popup.addSeparator();
+					}
 
                     item = new JMenuItem(
                         finalPrefs.getString("lang.process.edit"));
@@ -609,6 +612,8 @@ public class VSSimulatorCanvas extends Canvas
                     JMenu subMenu = new JMenu(
                         finalPrefs.getString("lang.event.add.local")
                         + " " + timeString);
+					if (process == null)
+						subMenu.setEnabled(false);
                     //subMenu.addActionListener(actionListener);
                     popup.add(subMenu);
                     item = new JMenuItem("foo");
@@ -618,6 +623,8 @@ public class VSSimulatorCanvas extends Canvas
                         subMenu = new JMenu(
                             finalPrefs.getString("lang.event.add.global")
                             + " " + timeString);
+					if (process == null)
+						subMenu.setEnabled(false);
                         popup.add(subMenu);
                     }
 
@@ -1044,8 +1051,6 @@ public class VSSimulatorCanvas extends Canvas
     private VSProcess getProcessAtYPos(int yPos) {
         final int reachDistance = (int) (yDistance/3);
         int y = YOFFSET + YOUTER_SPACEING + YSEPLINE_SPACEING;
-        //int bla = 0;
-        //System.out.println("FOO " + bla++);
 
         int yOffset = numProcesses > 1
                       ?  (int) ((paintSize-2*
@@ -1058,17 +1063,13 @@ public class VSSimulatorCanvas extends Canvas
             if (yPos < y + reachDistance && yPos > y - reachDistance -
                     LINE_WIDTH) {
                 VSProcess process = null;
-                //System.out.println("FOO " + bla++);
                 synchronized (processes) {
-                    //System.out.println("FOO " + bla++);
                     process = processes.get(i);
                 }
-                //System.out.println("FOO " + bla++);
                 return process;
             }
             y += yOffset;
         }
-        //System.out.println("BAZ " + bla++);
 
         return null;
     }