[armedbear-cvs] r12740 - trunk/abcl/src/org/armedbear/lisp/scripting

[Alessio Stalla]

Author: astalla
Date: Sun Jun  6 18:01:48 2010
New Revision: 12740

Log:
Removed @Override annotations that break compilation on 1.5.


Modified:
   trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java
   trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngineFactory.java

Modified: trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngine.java	Sun Jun  6 18:01:48 2010
@@ -278,7 +278,6 @@
 		return new AbclScriptEngineFactory();
 	}
 	
-	@Override
 	public <T> T getInterface(Class<T> clasz) {
 		try {
 			return getInterface(eval("(cl:find-package '#:ABCL-SCRIPT-USER)"), clasz);
@@ -288,14 +287,12 @@
 	}
 
 	@SuppressWarnings("unchecked")
-	@Override
 	public <T> T getInterface(Object thiz, Class<T> clasz) {
 	    Symbol s = findSymbol("jmake-proxy", "JAVA");
 	    JavaObject iface = new JavaObject(clasz);
 	    return (T) ((JavaObject) s.execute(iface, (LispObject) thiz)).javaInstance();
 	}
 	
-    @Override
     public Object invokeFunction(String name, Object... args) throws ScriptException, NoSuchMethodException {
 	Symbol s;
 	if(name.indexOf(':') >= 0) {
@@ -320,7 +317,6 @@
 	}
     }
 
-    @Override
     public Object invokeMethod(Object thiz, String name, Object... args) throws ScriptException, NoSuchMethodException {
 	throw new UnsupportedOperationException("Common Lisp does not have methods in the Java sense. Use invokeFunction instead.");
     }

Modified: trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngineFactory.java
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngineFactory.java	(original)
+++ trunk/abcl/src/org/armedbear/lisp/scripting/AbclScriptEngineFactory.java	Sun Jun  6 18:01:48 2010
@@ -31,104 +31,92 @@
 
     private static final AbclScriptEngine THE_ONLY_ONE_ENGINE = new AbclScriptEngine();
 	
-	@Override
-	public String getEngineName() {
-		return "ABCL Script";
-	}
-
-	@Override
-	public String getEngineVersion() {
-		return "0.1";
-	}
-
-	@Override
-	public List<String> getExtensions() {
-		List<String> extensions = new ArrayList<String>(1);
-		extensions.add("lisp");
-		return Collections.unmodifiableList(extensions);
-	}
-
-	@Override
-	public String getLanguageName() {
-		return "ANSI Common Lisp";
-	}
-
-	@Override
-	public String getLanguageVersion() {
-		return "ANSI X3.226:1994";
-	}
-
-	public static String escape(String raw) {
-		StringBuilder sb = new StringBuilder();
-		int len = raw.length();
-		char c;
-		for(int i = 0; i < len; ++i) {
-			c = raw.charAt(i);
-			if(c != '"') {
-				sb.append(c);
-			} else {
-				sb.append("\\\"");
-			}
-		}
-		return sb.toString();
+    public String getEngineName() {
+	return "ABCL Script";
+    }
+
+    public String getEngineVersion() {
+	return "0.1";
+    }
+
+    public List<String> getExtensions() {
+	List<String> extensions = new ArrayList<String>(1);
+	extensions.add("lisp");
+	return Collections.unmodifiableList(extensions);
+    }
+
+    public String getLanguageName() {
+	return "ANSI Common Lisp";
+    }
+
+    public String getLanguageVersion() {
+	return "ANSI X3.226:1994";
+    }
+
+    public static String escape(String raw) {
+	StringBuilder sb = new StringBuilder();
+	int len = raw.length();
+	char c;
+	for(int i = 0; i < len; ++i) {
+	    c = raw.charAt(i);
+	    if(c != '"') {
+		sb.append(c);
+	    } else {
+		sb.append("\\\"");
+	    }
 	}
+	return sb.toString();
+    }
 	
-	@Override
-	public String getMethodCallSyntax(String obj, String method, String... args) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("(jcall \"");
-		sb.append(method);
-		sb.append("\" ");
-		sb.append(obj);
-		for(String arg : args) {
-			sb.append(" ");
-			sb.append(arg);
-		}
-		sb.append(")");
-		return sb.toString();
-	}
-
-	@Override
-	public List<String> getMimeTypes() {
-	    return Collections.unmodifiableList(new ArrayList<String>());
-	}
-
-	@Override
-	public List<String> getNames() {
-		List<String> names = new ArrayList<String>(1);
-		names.add("ABCL");
-		names.add("cl");
-		names.add("Lisp");
-		names.add("Common Lisp");
-		return Collections.unmodifiableList(names);
-	}
-
-	@Override
-	public String getOutputStatement(String str) {
-		return "(cl:print \"" + str + "\")";
-	}
-
-	@Override
-	public Object getParameter(String key) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public String getProgram(String... statements) {
-		StringBuilder sb = new StringBuilder();
-		sb.append("(cl:progn");
-		for(String stmt : statements) {
-			sb.append("\n\t");
-			sb.append(stmt);
-		}
-		sb.append(")");
-		return sb.toString();
-	}
-
-	@Override
-	public ScriptEngine getScriptEngine() {
-		return THE_ONLY_ONE_ENGINE;
-	}
+    public String getMethodCallSyntax(String obj, String method, String... args) {
+	StringBuilder sb = new StringBuilder();
+	sb.append("(jcall \"");
+	sb.append(method);
+	sb.append("\" ");
+	sb.append(obj);
+	for(String arg : args) {
+	    sb.append(" ");
+	    sb.append(arg);
+	}
+	sb.append(")");
+	return sb.toString();
+    }
+    
+    public List<String> getMimeTypes() {
+	return Collections.unmodifiableList(new ArrayList<String>());
+    }
+
+    public List<String> getNames() {
+	List<String> names = new ArrayList<String>(1);
+	names.add("ABCL");
+	names.add("cl");
+	names.add("Lisp");
+	names.add("Common Lisp");
+	return Collections.unmodifiableList(names);
+    }
+
+    public String getOutputStatement(String str) {
+	return "(cl:print \"" + str + "\")";
+    }
+
+    public Object getParameter(String key) {
+	// TODO Auto-generated method stub
+	return null;
+    }
+
+    public String getProgram(String... statements) {
+	StringBuilder sb = new StringBuilder();
+	sb.append("(cl:progn");
+	for(String stmt : statements) {
+	    sb.append("\n\t");
+	    sb.append(stmt);
+	}
+	sb.append(")");
+	return sb.toString();
+    }
+    
+    public ScriptEngine getScriptEngine() {
+	return THE_ONLY_ONE_ENGINE;
+    }
 
 }