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

Imanol-Mikel Barba Sabariego
1 parent 75718947
Showing 7 changed files with 5 additions and 6 deletions
readline/bin/pad/prac1/Console.class
readline/bin/pad/prac1/EditableBufferedReader.class
readline/bin/pad/prac1/Line.class
readline/src/pad/prac1/Console.java
readline/src/pad/prac1/EditableBufferedReader.java
readline/src/pad/prac1/Line.java
readline/src/pad/prac1/MainClass.java
@@ -27,7 +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();
+        System.err.println("TERMSIZE:" + numCols + " " + numRows);
 	}
 	public Coordinate getCurrentPos()
@@ -40,7 +40,7 @@ public class Console implements Observer
         scanner.findWithinHorizon(pattern,0);
         int x = Integer.parseInt(scanner.match().group(2));
         int y = Integer.parseInt(scanner.match().group(1));
-        scanner.close();
+        System.err.println("POS:" + x + " " + y);
 		return new Coordinate(x,y);
 	}
@@ -108,7 +108,6 @@ public class EditableBufferedReader extends BufferedReader
 						line.toggleMode();
 					break;
 	        	}
-	        	scanner.close();
 	        	return;
     		}
 			else if(scanner.findWithinHorizon("O?", 0).length() > 0)
@@ -125,10 +124,8 @@ public class EditableBufferedReader extends BufferedReader
     					line.setCursorTo(line.length()+1);
     				break;
             	}
-            	scanner.close();
             	return;
 			}
-			scanner.close();
 		}
         else
         {
@@ -150,7 +147,6 @@ public class EditableBufferedReader extends BufferedReader
 					line.addChar((char)character);
 				break;
 	        }
-        	scanner.close();
 	        return;
         }
 	}
@@ -180,6 +176,7 @@ public class EditableBufferedReader extends BufferedReader
 		}
 		catch(Exception e)
 		{
+			e.printStackTrace();
 			System.out.println("Error reading line");
 			return "";
 		}
@@ -106,6 +106,7 @@ public class Line extends Observable
 					if(cursorPosition != line.length()+1)
 					{
 						removeCharAt(cursorPosition-1);
+						sendCommand(Command.DELETE_CHAR);
 					}
 					sendCommand(Command.INSERT_CHAR,(int)c);
 					insertCharAt(c, cursorPosition-1);
@@ -21,4 +21,5 @@ public class MainClass
  * 
  * TO-FIX
  * Cursor keys, Home and end keys when new line, reset line length
+ * SPEED
  */
 \ No newline at end of file