Fixed bug that was sometimes preventing files to be saved.

src/dibugger/debuglogic/debugger/DebugControl.java

@@ -289,6 +289,7 @@ public class DebugControl {
      * @throws DIbuggerLogicException
      */
     public void createWatchExpression(int id, String expr) throws DIbuggerLogicException {
+        System.out.println("Add watch expression: "+id+" "+expr);
     	while (list_watchExpressions.size() - 1 < id) {
             list_watchExpressions.add(null);
         }
@@ -307,6 +308,7 @@ public class DebugControl {
      * @throws DIbuggerLogicException
      */
     public void changeWatchExpression(int id, String expr, List<ScopeTuple> scopes) throws DIbuggerLogicException {
+    	//System.out.println("Change watch expression: "+id+" to "+expr);
     	if (id < list_watchExpressions.size()) {
             WatchExpression e = list_watchExpressions.get(id);
             if (e != null) {
@@ -326,6 +328,7 @@ public class DebugControl {
      *            the id of the watch expression
      */
     public void deleteWatchExpression(int id) {
+    	System.out.println("Remove watch expression: "+id);
         if (id == list_watchExpressions.size() - 1) {
             list_watchExpressions.remove(id);
         } else {
@@ -581,9 +584,13 @@ public class DebugControl {
      */
     public List<Integer> getWEScopeBegin(int expressionID) {
         List<Integer> l = new ArrayList<Integer>();
+        System.out.println("Get Expression: "+expressionID);
+        System.out.println("From: "+list_watchExpressions);
+        if(list_watchExpressions.get(expressionID)!=null) {
         	for (ScopeTuple it : list_watchExpressions.get(expressionID).getScopes()) {
                 l.add(it.getStartLine());
             }
+        }        
         if (l.size() == 0) {
             for (int i = 0; i < numPrograms; ++i) {
                 l.add(1);
@@ -601,9 +608,11 @@ public class DebugControl {
      */
     public List<Integer> getWEScopeEnd(int expressionID) {
         List<Integer> l = new ArrayList<Integer>();
+        if(list_watchExpressions.get(expressionID)!=null) {
         	for (ScopeTuple it : list_watchExpressions.get(expressionID).getScopes()) {
                 l.add(it.getEndLine());
             }
+        }        
         if (l.size() == 0) {
             for (int i = 0; i < numPrograms; ++i) {
                 l.add(list_programInput.get(i).getText().split("\n").length);
@@ -664,9 +673,11 @@ public class DebugControl {
      */
     public List<Integer> getCBScopeBegin(int expressionID) {
         List<Integer> l = new ArrayList<Integer>();
+        if(list_condBreakpoints.get(expressionID)!=null) {
         	for (ScopeTuple it : list_condBreakpoints.get(expressionID).getScopes()) {
                 l.add(it.getStartLine());
             }
+        }        
         if (l.size() == 0) {
             for (int i = 0; i < numPrograms; ++i) {
                 l.add(1);
@@ -685,9 +696,11 @@ public class DebugControl {
      */
     public List<Integer> getCBScopeEnd(int expressionID) {
         List<Integer> l = new ArrayList<Integer>();
+        if(list_condBreakpoints.get(expressionID)!=null) {
         	for (ScopeTuple it : list_condBreakpoints.get(expressionID).getScopes()) {
                 l.add(it.getEndLine());
             }
+        }        
         if (l.size() == 0) {
             for (int i = 0; i < numPrograms; ++i) {
                 l.add(list_programInput.get(i).getText().split("\n").length);