[armedbear-cvs] r11418 - branches/open-external-format/src/org/armedbear/lisp

[Erik Huelsmann]

Author: ehuelsmann
Date: Fri Dec  5 21:19:37 2008
New Revision: 11418

Log:
Add @Override modifiers before (possibly) editing these files.


Modified:
   branches/open-external-format/src/org/armedbear/lisp/StringInputStream.java
   branches/open-external-format/src/org/armedbear/lisp/StringOutputStream.java

Modified: branches/open-external-format/src/org/armedbear/lisp/StringInputStream.java
==============================================================================
--- branches/open-external-format/src/org/armedbear/lisp/StringInputStream.java	(original)
+++ branches/open-external-format/src/org/armedbear/lisp/StringInputStream.java	Fri Dec  5 21:19:37 2008
@@ -62,16 +62,19 @@
         offset = start;
     }
 
+    @Override
     public LispObject typeOf()
     {
         return Symbol.STRING_INPUT_STREAM;
     }
 
+    @Override
     public LispObject classOf()
     {
         return BuiltInClass.STRING_INPUT_STREAM;
     }
 
+    @Override
     public LispObject typep(LispObject type) throws ConditionThrowable
     {
         if (type == Symbol.STRING_INPUT_STREAM)
@@ -85,28 +88,32 @@
         return super.typep(type);
     }
 
+    @Override
     public LispObject close(LispObject abort) throws ConditionThrowable
     {
         setOpen(false);
         return T;
     }
 
+    @Override
     public LispObject listen()
     {
         return offset < end ? T : NIL;
     }
 
+    @Override
     protected int _readChar()
     {
         if (offset >= end)
             return -1;
         int n = s.charAt(offset);
         ++offset;
-        if (n == '\n')
+            if (n == '\n')
             ++lineNumber;
         return n;
     }
 
+    @Override
     protected void _unreadChar(int n)
     {
         if (offset > start) {
@@ -116,11 +123,13 @@
         }
     }
 
+    @Override
     protected boolean _charReady()
     {
         return true;
     }
 
+    @Override
     public String toString()
     {
         return unreadableString("STRING-INPUT-STREAM");
@@ -131,11 +140,13 @@
     private static final Primitive MAKE_STRING_INPUT_STREAM =
         new Primitive("make-string-input-stream", "string &optional start end")
     {
+        @Override
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             return new StringInputStream(arg.getStringValue());
         }
 
+        @Override
         public LispObject execute(LispObject first, LispObject second)
             throws ConditionThrowable
         {
@@ -144,6 +155,7 @@
             return new StringInputStream(s, start);
         }
 
+        @Override
         public LispObject execute(LispObject first, LispObject second,
                                   LispObject third)
             throws ConditionThrowable
@@ -161,6 +173,7 @@
     private static final Primitive STRING_INPUT_STREAM_CURRENT =
         new Primitive("string-input-stream-current", PACKAGE_EXT, true, "stream")
     {
+        @Override
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             if (arg instanceof StringInputStream)

Modified: branches/open-external-format/src/org/armedbear/lisp/StringOutputStream.java
==============================================================================
--- branches/open-external-format/src/org/armedbear/lisp/StringOutputStream.java	(original)
+++ branches/open-external-format/src/org/armedbear/lisp/StringOutputStream.java	Fri Dec  5 21:19:37 2008
@@ -54,16 +54,19 @@
         setWriter(stringWriter = new StringWriter());
     }
 
+    @Override
     public LispObject typeOf()
     {
         return Symbol.STRING_OUTPUT_STREAM;
     }
 
+    @Override
     public LispObject classOf()
     {
         return BuiltInClass.STRING_OUTPUT_STREAM;
     }
 
+    @Override
     public LispObject typep(LispObject type) throws ConditionThrowable
     {
         if (type == Symbol.STRING_OUTPUT_STREAM)
@@ -77,6 +80,7 @@
         return super.typep(type);
     }
 
+    @Override
     public void _writeChar(char c) throws ConditionThrowable
     {
         if (elementType == NIL)
@@ -84,6 +88,7 @@
         super._writeChar(c);
     }
 
+    @Override
     public void _writeChars(char[] chars, int start, int end)
         throws ConditionThrowable
     {
@@ -92,6 +97,7 @@
         super._writeChars(chars, start, end);
     }
 
+    @Override
     public void _writeString(String s) throws ConditionThrowable
     {
         if (elementType == NIL)
@@ -99,6 +105,7 @@
         super._writeString(s);
     }
 
+    @Override
     public void _writeLine(String s) throws ConditionThrowable
     {
         if (elementType == NIL)
@@ -111,6 +118,7 @@
         error(new TypeError("Attempt to write to a string output stream of element type NIL."));
     }
 
+    @Override
     protected long _getFilePosition() throws ConditionThrowable
     {
         if (elementType == NIL)
@@ -128,6 +136,7 @@
         return s;
     }
 
+    @Override
     public String toString()
     {
         return unreadableString("STRING-OUTPUT-STREAM");
@@ -139,6 +148,7 @@
         new Primitive("%make-string-output-stream", PACKAGE_SYS, false,
                        "element-type")
     {
+        @Override
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             return new StringOutputStream(arg);
@@ -150,6 +160,7 @@
     private static final Primitive GET_OUTPUT_STREAM_STRING =
         new Primitive("get-output-stream-string", "string-output-stream")
     {
+        @Override
         public LispObject execute(LispObject arg) throws ConditionThrowable
         {
             try {