git-svn-id: svn://imanolbarba.net/PAD@14 c2ee353e-ed0d-4329-bf56-03aec153487f

Imanol-Mikel Barba Sabariego
1 parent 68ecc41e
Showing 4 changed files with 9 additions and 2 deletions
readline/bin/pad/prac1/Console.class
readline/bin/pad/prac1/EditableBufferedReader.class
readline/src/pad/prac1/Console.java
readline/src/pad/prac1/EditableBufferedReader.java
@@ -27,6 +27,7 @@ public class Console implements Observer
         scanner.findWithinHorizon(pattern,0);
         numCols = Integer.parseInt(scanner.match().group(2));
         numRows = Integer.parseInt(scanner.match().group(1));
+        scanner.close();
 	}
 	public Coordinate getCurrentPos()
@@ -37,8 +38,10 @@ public class Console implements Observer
 		Pattern pattern = Pattern.compile("(\\d+);(\\d+)");
 		Scanner scanner = new Scanner(System.in);
         scanner.findWithinHorizon(pattern,0);
-		return new Coordinate(Integer.parseInt(scanner.match().group(2)),
-							  Integer.parseInt(scanner.match().group(1)));
+        int x = Integer.parseInt(scanner.match().group(2));
+        int y = Integer.parseInt(scanner.match().group(1));
+        scanner.close();
+		return new Coordinate(x,y);
 	}
 	public void moveCursorTo(Coordinate xy)
@@ -108,6 +108,7 @@ public class EditableBufferedReader extends BufferedReader
 						line.toggleMode();
 					break;
 	        	}
+	        	scanner.close();
 	        	return;
     		}
 			else if(scanner.findWithinHorizon("O?", 0).length() > 0)
@@ -124,8 +125,10 @@ public class EditableBufferedReader extends BufferedReader
     					line.setCursorTo(line.length()+1);
     				break;
             	}
+            	scanner.close();
             	return;
 			}
+			scanner.close();
 		}
         else
         {
@@ -147,6 +150,7 @@ public class EditableBufferedReader extends BufferedReader
 					line.addChar((char)character);
 				break;
 	        }
+        	scanner.close();
 	        return;
         }
 	}